commit 770b436c51144124a93142e948620b61d2076393
author Michal Vasko <mvasko@cesnet.cz> Fri Feb 17 14:44:18 2017 +0100
committer Michal Vasko <mvasko@cesnet.cz> Fri Feb 17 14:44:18 2017 +0100
tree 5ee57105ace0928a894693f0f36be130594ce24b
parent 2bdf43328e605ad763c3045c63ba24e2a0eca620

session BUGFIX some openssl 1.1.0 macros did not commit

src/session.c

diff --git a/src/session.c b/src/session.c
index 74c1fef..d778dff 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1098,6 +1098,8 @@
 
 #ifdef NC_ENABLED_TLS
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
+
 struct CRYPTO_dynlock_value {
     pthread_mutex_t lock;
 };
@@ -1135,11 +1137,13 @@
     pthread_mutex_destroy(&l->lock);
     free(l);
 }
+#endif
 
 #endif /* NC_ENABLED_TLS */
 
 #if defined(NC_ENABLED_TLS) && !defined(NC_ENABLED_SSH)
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
 static pthread_mutex_t *tls_locks;
 
 static void
@@ -1157,6 +1161,7 @@
 {
     CRYPTO_THREADID_set_numeric(tid, (unsigned long)pthread_self());
 }
+#endif
 
 static void
 nc_tls_init(void)
@@ -1167,6 +1172,7 @@
     ERR_load_BIO_strings();
     SSL_library_init();
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
     tls_locks = malloc(CRYPTO_num_locks() * sizeof *tls_locks);
     if (!tls_locks) {
         ERRMEM;
@@ -1182,6 +1188,7 @@
     CRYPTO_set_dynlock_create_callback(tls_dyn_create_func);
     CRYPTO_set_dynlock_lock_callback(tls_dyn_lock_func);
     CRYPTO_set_dynlock_destroy_callback(tls_dyn_destroy_func);
+#endif
 }
 
 static void
@@ -1194,14 +1201,13 @@
     nc_thread_destroy();
     EVP_cleanup();
     ERR_free_strings();
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L // >= 1.1.0
-    // no de-init needed
-#elif OPENSSL_VERSION_NUMBER >= 0x10002000L // >= 1.0.2
-    SSL_COMP_free_compression_methods();
-#else
+#if OPENSSL_VERSION_NUMBER < 0x10002000L // < 1.0.2
     sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
+#elif OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
+    SSL_COMP_free_compression_methods();
 #endif
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
     CRYPTO_THREADID_set_callback(NULL);
     CRYPTO_set_locking_callback(NULL);
     for (i = 0; i < CRYPTO_num_locks(); ++i) {
@@ -1212,6 +1218,7 @@
     CRYPTO_set_dynlock_create_callback(NULL);
     CRYPTO_set_dynlock_lock_callback(NULL);
     CRYPTO_set_dynlock_destroy_callback(NULL);
+#endif
 }
 
 #endif /* NC_ENABLED_TLS && !NC_ENABLED_SSH */
@@ -1227,28 +1234,30 @@
 
     nc_ssh_init();
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
     CRYPTO_set_dynlock_create_callback(tls_dyn_create_func);
     CRYPTO_set_dynlock_lock_callback(tls_dyn_lock_func);
     CRYPTO_set_dynlock_destroy_callback(tls_dyn_destroy_func);
+#endif
 }
 
 static void
 nc_ssh_tls_destroy(void)
 {
     ERR_free_strings();
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L // >= 1.1.0
-    // no de-init needed
-#elif OPENSSL_VERSION_NUMBER >= 0x10002000L // >= 1.0.2
-    SSL_COMP_free_compression_methods();
-#else
+#if OPENSSL_VERSION_NUMBER < 0x10002000L // < 1.0.2
     sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
+#elif OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
+    SSL_COMP_free_compression_methods();
 #endif
 
     nc_ssh_destroy();
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
     CRYPTO_set_dynlock_create_callback(NULL);
     CRYPTO_set_dynlock_lock_callback(NULL);
     CRYPTO_set_dynlock_destroy_callback(NULL);
+#endif
 }
 
 #endif /* NC_ENABLED_SSH && NC_ENABLED_TLS */
@@ -1258,13 +1267,15 @@
 API void
 nc_thread_destroy(void)
 {
-    CRYPTO_THREADID crypto_tid;
-
     /* caused data-races and seems not neccessary for avoiding valgrind reachable memory */
     //CRYPTO_cleanup_all_ex_data();
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
+    CRYPTO_THREADID crypto_tid;
+
     CRYPTO_THREADID_current(&crypto_tid);
     ERR_remove_thread_state(&crypto_tid);
+#endif
 }
 
 #endif /* NC_ENABLED_SSH || NC_ENABLED_TLS */