commit e1e8263c9b12d2db396c1bc43c46eb855a74d4e6
author Michal Vasko <mvasko@cesnet.cz> Mon Sep 09 09:18:03 2019 +0200
committer Michal Vasko <mvasko@cesnet.cz> Mon Sep 09 09:18:03 2019 +0200
tree 5d50b1adb578b8480515a707a9935b3ca747058c
parent 947d81272b1749b03c164365d8d322f0bae8d10c

session BUILD proper threading support for libssh < 0.8.0

src/session.c

diff --git a/src/session.c b/src/session.c
index b5bec36..ceead10 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1377,26 +1377,29 @@
 
 #ifdef NC_ENABLED_SSH
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
-
 static void
 nc_ssh_init(void)
 {
+#if (LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 8, 0))
     ssh_threads_set_callbacks(ssh_threads_get_pthread());
     ssh_init();
+#endif
 }
 
 static void
 nc_ssh_destroy(void)
 {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
     FIPS_mode_set(0);
     CONF_modules_unload(1);
     nc_thread_destroy();
-    ssh_finalize();
-}
-
 #endif
 
+#if (LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 8, 0))
+    ssh_finalize();
+#endif
+}
+
 #endif /* NC_ENABLED_SSH */
 
 #ifdef NC_ENABLED_TLS
@@ -1535,9 +1538,11 @@
     SSL_load_error_strings();
     ERR_load_BIO_strings();
     SSL_library_init();
+#endif
 
     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);
@@ -1549,14 +1554,16 @@
 {
 #if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
     ERR_free_strings();
-#if OPENSSL_VERSION_NUMBER < 0x10002000L // < 1.0.2
+# 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
+# elif OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
     SSL_COMP_free_compression_methods();
+# endif
 #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);
@@ -1588,7 +1595,7 @@
 {
 #if defined(NC_ENABLED_SSH) && defined(NC_ENABLED_TLS)
     nc_ssh_tls_init();
-#elif defined(NC_ENABLED_SSH) && OPENSSL_VERSION_NUMBER < 0x10100000L
+#elif defined(NC_ENABLED_SSH)
     nc_ssh_init();
 #elif defined(NC_ENABLED_TLS)
     nc_tls_init();
@@ -1600,7 +1607,7 @@
 {
 #if defined(NC_ENABLED_SSH) && defined(NC_ENABLED_TLS)
     nc_ssh_tls_destroy();
-#elif defined(NC_ENABLED_SSH) && OPENSSL_VERSION_NUMBER < 0x10100000L
+#elif defined(NC_ENABLED_SSH)
     nc_ssh_destroy();
 #elif defined(NC_ENABLED_TLS)
     nc_tls_destroy();