From 6de6ea5e420f50f680fd7ab7da9247fc89d7201b Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 27 Jun 2016 08:28:22 +0200 Subject: [PATCH] Build fix for OpenSSL 1.1.0 fixes #12044 --- lib/base/tlsutility.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp index 772b889ce..37f53b919 100644 --- a/lib/base/tlsutility.cpp +++ b/lib/base/tlsutility.cpp @@ -32,6 +32,7 @@ namespace icinga static bool l_SSLInitialized = false; static boost::mutex *l_Mutexes; +#ifdef CRYPTO_LOCK static void OpenSSLLockingCallback(int mode, int type, const char *, int) { if (mode & CRYPTO_LOCK) @@ -48,6 +49,7 @@ static unsigned long OpenSSLIDCallback(void) return (unsigned long)pthread_self(); #endif /* _WIN32 */ } +#endif /* CRYPTO_LOCK */ /** * Initializes the OpenSSL library. @@ -62,9 +64,11 @@ void InitializeOpenSSL(void) SSL_COMP_get_compression_methods(); +#ifdef CRYPTO_LOCK l_Mutexes = new boost::mutex[CRYPTO_num_locks()]; CRYPTO_set_locking_callback(&OpenSSLLockingCallback); CRYPTO_set_id_callback(&OpenSSLIDCallback); +#endif /* CRYPTO_LOCK */ l_SSLInitialized = true; }