From 4479df793c7b0229440cb6ad4a0c26f750ecc0ac Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 27 May 2019 17:41:07 -0700 Subject: [PATCH] Don't initialize and deinitialize with OpenSSL >= 1.1 Will not compile without deprecated APIs enabled. --- pdns/dnsdistdist/libssl.cc | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pdns/dnsdistdist/libssl.cc b/pdns/dnsdistdist/libssl.cc index 0114743a5f..684a276c31 100644 --- a/pdns/dnsdistdist/libssl.cc +++ b/pdns/dnsdistdist/libssl.cc @@ -54,29 +54,23 @@ static void openssl_thread_cleanup() OPENSSL_free(openssllocks); } -#else -static void openssl_thread_setup() -{ -} - -static void openssl_thread_cleanup() -{ -} -#endif /* (OPENSSL_VERSION_NUMBER < 0x1010000fL || defined LIBRESSL_VERSION_NUMBER) */ - static std::atomic s_users; +#endif /* (OPENSSL_VERSION_NUMBER < 0x1010000fL || defined LIBRESSL_VERSION_NUMBER) */ void registerOpenSSLUser() { +#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || defined LIBRESSL_VERSION_NUMBER) if (s_users.fetch_add(1) == 0) { SSL_load_error_strings(); OpenSSL_add_ssl_algorithms(); openssl_thread_setup(); } +#endif } void unregisterOpenSSLUser() { +#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || defined LIBRESSL_VERSION_NUMBER) if (s_users.fetch_sub(1) == 1) { ERR_free_strings(); @@ -89,6 +83,7 @@ void unregisterOpenSSLUser() CRYPTO_cleanup_all_ex_data(); openssl_thread_cleanup(); } +#endif } #endif /* HAVE_LIBSSL */ -- 2.47.2