Handle deprecated OpenSSL thread cleanup functions

Use appropriate OpenSSL thread cleanup function or don't use any,
depending on their deprecation status in various OpenSSL versions.

diff --git a/src/main/threads.c b/src/main/threads.c
index 58bc90803bd2a3a126405cefb842d5d072fde95c..cc79d0c555aba410e5e16b328ecd541b42cd5ee8 100644 (file)
--- a/src/main/threads.c
+++ b/src/main/threads.c
@@ -718,7 +718,11 @@ static void *request_handler_thread(void *arg)
         *      must remove the thread's error queue before
         *      exiting to prevent memory leaks.
         */
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
        ERR_remove_state(0);
+#elif OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+       ERR_remove_thread_state(NULL);
+#endif
 #endif
 
        pthread_mutex_lock(&thread_pool.queue_mutex);

diff --git a/src/main/tls.c b/src/main/tls.c
index 692bab702178a67a1f5623ff55df48cf2ecaa237..6cd912f0f7ff7641d3f849078789ae6c83e04ae2 100644 (file)
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -2526,7 +2526,11 @@ int tls_global_version_check(char const *acknowledged)
  */
 void tls_global_cleanup(void)
 {
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
        ERR_remove_state(0);
+#elif OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+       ERR_remove_thread_state(NULL);
+#endif
        ENGINE_cleanup();
        CONF_modules_unload(1);
        ERR_free_strings();