Define NO_SSLSYM to disable runtime SSL dynamic loader.

Increase squeezelite revision to 1154.
ralph-irving · May 20, 2019 · f6afd56 · f6afd56
1 parent f5f4d54
commit f6afd56
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/main.c b/main.c
@@ -205,6 +205,9 @@ static void usage(const char *argv0) {
 #if USE_SSL
                    " SSL"
 #endif
+#if NO_SSLSYM
+                   " NO_SSLSYM"
+#endif
 #if LINKALL
 		   " LINKALL"
 #endif
@@ -689,9 +692,9 @@ int main(int argc, char **argv) {
 	signal(SIGHUP, sighandler);
 #endif
 
-#if USE_SSL && !LINKALL
+#if USE_SSL && !LINKALL && !NO_SSLSYM
 	ssl_loaded = load_ssl_symbols();
-#endif	
+#endif
 
 	// set the output buffer size if not specified on the command line, take account of resampling
 	if (!output_buf_size) {
@@ -816,7 +819,7 @@ int main(int argc, char **argv) {
 	}
 #endif
 
-#if USE_SSL && !LINKALL
+#if USE_SSL && !LINKALL && !NO_SSLSYM
 	free_ssl_symbols();
 #endif	
 

diff --git a/slimproto.c b/slimproto.c
@@ -120,7 +120,7 @@ static void sendHELO(bool reconnect, const char *fixed_cap, const char *var_cap,
 	struct HELO_packet pkt;
 
 #if USE_SSL
-#if !LINKALL
+#if !LINKALL && !NO_SSLSYM
 	if (ssl_loaded) base_cap = SSL_CAP "," BASE_CAP;
 	else base_cap = BASE_CAP;
 #endif	

diff --git a/squeezelite.h b/squeezelite.h
@@ -26,7 +26,7 @@
 
 #define MAJOR_VERSION "1.9"
 #define MINOR_VERSION "2"
-#define MICRO_VERSION "1153"
+#define MICRO_VERSION "1154"
 
 #if defined(CUSTOM_VERSION)
 #define VERSION "v" MAJOR_VERSION "." MINOR_VERSION "-" MICRO_VERSION STR(CUSTOM_VERSION)
@@ -163,6 +163,12 @@
 #define USE_SSL 0
 #endif
 
+#if defined (NO_SSLSYM)
+#undef NO_SSLSYM
+#define NO_SSLSYM 1
+#else
+#define NO_SSLSYM 0
+#endif
 
 #if !LINKALL
 
@@ -735,7 +741,7 @@ void ir_close(void);
 #endif
 
 // sslsym.c
-#if USE_SSL && !LINKALL
+#if USE_SSL && !LINKALL && !NO_SSLSYM
 bool load_ssl_symbols(void);
 void free_ssl_symbols(void);
 bool ssl_loaded;

diff --git a/sslsym.c b/sslsym.c
@@ -1,5 +1,5 @@
 /*
- *  SSL symboles dynamic loader
+ *  SSL symbols dynamic loader
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 #include "squeezelite.h"
 
-#if USE_SSL && !LINKALL
+#if USE_SSL && !LINKALL && !NO_SSLSYM
 
 #if WIN
 #define dlclose FreeLibrary
@@ -73,9 +73,8 @@ static char *LIBCRYPTO[] 	= {	"libcrypto.so",
 #define V5(t1, p1, t2, p2, t3, p3, t4, p4, t5, p5) p1, p2, p3, p4, p5
 #define V6(t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6) p1, p2, p3, p4, p5, p6
 
-#define EXPAND(x) x
-#define P(n, ...) EXPAND(P##n(__VA_ARGS__))
-#define V(n, ...) EXPAND(V##n(__VA_ARGS__))
+#define P(n, ...) P##n(__VA_ARGS__)
+#define V(n, ...) V##n(__VA_ARGS__)
 
 #define SYM(fn) dlsym_##fn
 #define SYMDECL(fn, ret, n, ...) 			\

diff --git a/stream.c b/stream.c
@@ -377,7 +377,7 @@ void stream_init(log_level level, unsigned stream_buf_size) {
 	}
 
 #if USE_SSL
-#if !LINKALL
+#if !LINKALL && !NO_SSLSYM
 	if (ssl_loaded) {
 #endif
 	SSL_library_init();
@@ -387,7 +387,7 @@ void stream_init(log_level level, unsigned stream_buf_size) {
 		exit(0);
 	}	
 	SSL_CTX_set_options(SSLctx, SSL_OP_NO_SSLv2);
-#if !LINKALL
+#if !LINKALL && !NO_SSLSYM
 	}
 #endif	
 	ssl = NULL;