0.2.50.2

philippe44 · Mar 13, 2021 · 9518719 · 9518719
1 parent 05b0f6a
commit 9518719
Show file tree

Hide file tree

Showing 33 changed files with 24 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+0.2.50.2
+ - make sslsym compatible with openSSL 1.1.x
+
 0.2.50.1
  - noflush properly send silent frames at the right speed
 

diff --git a/aircast/src/aircast.c b/aircast/src/aircast.c
@@ -36,7 +36,7 @@
 #include "config_cast.h"
 #include "sslsym.h"
 
-#define VERSION "v0.2.50.1"" ("__DATE__" @ "__TIME__")"
+#define VERSION "v0.2.50.2"" ("__DATE__" @ "__TIME__")"
 
 #define DISCOVERY_TIME 	20
 #define MEDIA_VOLUME	0.5

diff --git a/airupnp/src/airupnp.c b/airupnp/src/airupnp.c
@@ -38,7 +38,7 @@
 #include "log_util.h"
 #include "sslsym.h"
 
-#define VERSION "v0.2.50.1"" ("__DATE__" @ "__TIME__")"
+#define VERSION "v0.2.50.2"" ("__DATE__" @ "__TIME__")"
 
 #define	AV_TRANSPORT 			"urn:schemas-upnp-org:service:AVTransport"
 #define	RENDERING_CTRL 			"urn:schemas-upnp-org:service:RenderingControl"

diff --git a/bin/aircast-aarch64 b/bin/aircast-aarch64
diff --git a/bin/aircast-aarch64-static b/bin/aircast-aarch64-static
diff --git a/bin/aircast-arm b/bin/aircast-arm
diff --git a/bin/aircast-arm-static b/bin/aircast-arm-static
diff --git a/bin/aircast-arm5 b/bin/aircast-arm5
diff --git a/bin/aircast-bsd-x64 b/bin/aircast-bsd-x64
diff --git a/bin/aircast-bsd-x64-static b/bin/aircast-bsd-x64-static
diff --git a/bin/aircast-i86pc-solaris b/bin/aircast-i86pc-solaris
diff --git a/bin/aircast-osx-multi b/bin/aircast-osx-multi
diff --git a/bin/aircast-ppc b/bin/aircast-ppc
diff --git a/bin/aircast-ppc-static b/bin/aircast-ppc-static
diff --git a/bin/aircast-win.exe b/bin/aircast-win.exe
diff --git a/bin/aircast-x86 b/bin/aircast-x86
diff --git a/bin/aircast-x86-64 b/bin/aircast-x86-64
diff --git a/bin/airupnp-aarch64 b/bin/airupnp-aarch64
diff --git a/bin/airupnp-aarch64-static b/bin/airupnp-aarch64-static
diff --git a/bin/airupnp-arm b/bin/airupnp-arm
diff --git a/bin/airupnp-arm-static b/bin/airupnp-arm-static
diff --git a/bin/airupnp-arm5 b/bin/airupnp-arm5
diff --git a/bin/airupnp-bsd-x64 b/bin/airupnp-bsd-x64
diff --git a/bin/airupnp-i86pc-solaris b/bin/airupnp-i86pc-solaris
diff --git a/bin/airupnp-osx-multi b/bin/airupnp-osx-multi
diff --git a/bin/airupnp-ppc b/bin/airupnp-ppc
diff --git a/bin/airupnp-ppc-static b/bin/airupnp-ppc-static
diff --git a/bin/airupnp-win.exe b/bin/airupnp-win.exe
diff --git a/bin/airupnp-x86 b/bin/airupnp-x86
diff --git a/bin/airupnp-x86-64 b/bin/airupnp-x86-64
diff --git a/bin/airupnp-x86-64-static b/bin/airupnp-x86-64-static
diff --git a/bin/airupnp-x86-static b/bin/airupnp-x86-static
diff --git a/tools/sslsym.c b/tools/sslsym.c
@@ -76,9 +76,13 @@ ret fn(P(n,__VA_ARGS__)) {							\
 		return (shim_##fn)(V(n,__VA_ARGS__));		\
 }
 
+#define SYMSHIMNULL(fn, ret, n, ...) 	  	   		\
+static ret (*shim_##fn)(P(n,__VA_ARGS__))
+
 #else
 
 #define SYMDECL(fn, ret, n, ...)
+#define SYMSHIMNULL(fn, ret, n, ...)
 
 #define SYMSHIMDECL(fn, ret, n, ...)		\
 ret fn(P(n,__VA_ARGS__)) {				 	\
@@ -101,6 +105,7 @@ static int shim_RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
 SYMSHIMDECL(RSA_set0_key, int, 4, RSA*, r, BIGNUM*, n, BIGNUM*, e, BIGNUM*, d);
 #else
 SYMDECL(RSA_set0_key, int, 4, RSA*, r, BIGNUM*, n, BIGNUM*, e, BIGNUM*, d);
+SYMSHIMNULL(RSA_set0_key, int, 4, RSA*, r, BIGNUM*, n, BIGNUM*, e, BIGNUM*, d);
 #endif
 
 #ifndef LINKALL
@@ -143,14 +148,20 @@ static char *LIBCRYPTO[] 	= {
 #define SYMLOAD(h, fn) dlsym_##fn = dlsym(h, #fn)
 #endif
 
-#define SHIMSET(fn) if (!SYM(fn)) SYM(fn) = &(shim_##fn)
+#define SHIMSET(fn) if (!SYM(fn)) SYM(fn) = shim_##fn
 
+#ifndef SSLv23_client_method
+#define _SSLv23_client_method SSLv23_client_method
+#endif
+#ifndef SSL_library_init
+#define _SSL_library_init SSL_library_init
+#endif
+SYMDECL(_SSLv23_client_method, const SSL_METHOD*, 0);
+SYMDECL(_SSL_library_init, int, 0);
+SYMDECL(TLS_client_method, const SSL_METHOD*, 0);
 SYMDECL(SSL_read, int, 3, SSL*, s, void*, buf, int, len);
 SYMDECL(SSL_write, int, 3, SSL*, s, const void*, buf, int, len);
-SYMDECL(SSLv23_client_method, const SSL_METHOD*, 0);
-SYMDECL(TLS_client_method, const SSL_METHOD*, 0);
 SYMDECL(OpenSSL_version_num, unsigned long, 0);
-SYMDECL(SSL_library_init, int, 0);
 SYMDECL(SSL_CTX_set_cipher_list, int, 2, SSL_CTX *, ctx, const char*, str);
 SYMDECL(SSL_CTX_new, SSL_CTX*, 1, const SSL_METHOD *, meth);
 SYMDECL(SSL_CTX_ctrl, long, 4, SSL_CTX *, ctx, int, cmd, long, larg, void*, parg);
@@ -242,10 +253,10 @@ bool load_ssl_symbols(void) {
 	SYMLOAD(SSLhandle, SSL_read);
 	SYMLOAD(SSLhandle, SSL_write);
 	SYMLOAD(SSLhandle, SSL_pending);
-	SYMLOAD(SSLhandle, SSLv23_client_method);
 	SYMLOAD(SSLhandle, TLS_client_method);
-	SYMLOAD(SSLhandle, SSL_library_init);
 	SYMLOAD(SSLhandle, OpenSSL_version_num);
+	SYMLOAD(SSLhandle, _SSLv23_client_method);
+	SYMLOAD(SSLhandle, _SSL_library_init);
 
 	SYMLOAD(CRYPThandle, RAND_seed);
 	SYMLOAD(CRYPThandle, RAND_bytes);
@@ -271,8 +282,8 @@ bool load_ssl_symbols(void) {
 	SYMLOAD(CRYPThandle, PEM_read_bio_RSAPrivateKey);
 
 	// managed deprecated functions
-	if (!SYM(SSLv23_client_method)) SYM(SSLv23_client_method) = SYM(TLS_client_method);
-	if (!SYM(SSL_library_init)) SYM(SSL_library_init) = &lambda;
+	if (!SYM(_SSLv23_client_method)) SYM(_SSLv23_client_method) = SYM(TLS_client_method);
+	if (!SYM(_SSL_library_init)) SYM(_SSL_library_init) = lambda;
 
 	// manage mandatory new functions
 	SHIMSET(RSA_set0_key);