From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Date: Wed, 14 Apr 2010 16:07:19 +0000 (+0000)
Subject: Leave CRYPTO defined by default, use "make CRYPTO=" to turn it off.
X-Git-Tag: v2.4~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a92a1e5521e44ebd633b156727c6fc8126255c7;p=rtmpdump

Leave CRYPTO defined by default, use "make CRYPTO=" to turn it off.


git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@427 400ebc74-4327-4243-bc38-086b20814532
---

diff --git a/Makefile b/Makefile
index df3ef0c..637fc44 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,11 @@ CRYPTO=OPENSSL
 LIB_GNUTLS=-lgnutls
 LIB_OPENSSL=-lssl -lcrypto
 CRYPTO_LIB=$(LIB_$(CRYPTO))
+DEF_=-DNO_CRYPTO
+CRYPTO_DEF=$(DEF_$(CRYPTO))
 
-DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\"
+
+DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF)
 OPT=-O2
 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
 LDFLAGS=-Wall $(XLDFLAGS)
diff --git a/librtmp/Makefile b/librtmp/Makefile
index a977273..776b340 100644
--- a/librtmp/Makefile
+++ b/librtmp/Makefile
@@ -7,8 +7,9 @@ LD=$(CROSS_COMPILE)ld
 
 CRYPTO=OPENSSL
 #CRYPTO=GNUTLS
-DEF_OPENSSL=-DCRYPTO -DUSE_OPENSSL
-DEF_GNUTLS=-DCRYPTO -DUSE_GNUTLS
+DEF_OPENSSL=-DUSE_OPENSSL
+DEF_GNUTLS=-DUSE_GNUTLS
+DEF_=-DNO_CRYPTO
 LIB_GNUTLS=-lgnutls
 LIB_OPENSSL=-lssl -lcrypto
 REQ_GNUTLS=gnutls
diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h
index ff68dd6..1131943 100644
--- a/librtmp/rtmp.h
+++ b/librtmp/rtmp.h
@@ -24,6 +24,10 @@
  *  http://www.gnu.org/copyleft/lgpl.html
  */
 
+#ifndef NO_CRYPTO
+#define CRYPTO
+#endif
+
 #include <errno.h>
 #include <stdint.h>
 #include <stddef.h>
@@ -146,6 +150,7 @@ extern "C"
     unsigned short socksport;
     unsigned short port;
 
+#ifdef CRYPTO
 #define RTMP_SWF_HASHLEN	32
     void *dh;			// for encryption
     void *rc4keyIn;
@@ -154,6 +159,7 @@ extern "C"
     uint32_t SWFSize;
     char SWFHash[RTMP_SWF_HASHLEN];
     char SWFVerificationResponse[RTMP_SWF_HASHLEN+10];
+#endif
   } RTMP_LNK;
 
   /* state for read() wrapper */