tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-10-25 01:03:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't define/use OpenSSL*Callback() for/in OpenSSL > v1.1

Browse Source 
Since OpenSSL v1.1 the macros they're passed to expand to nothing creating
the illusion those functions aren't used. That triggers compiler warnings.
This commit is contained in:
Alexander A. Klimov 2023-03-24 15:41:20 +01:00
parent bc7debed4f
commit 728d6fff3e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/base/tlsutility.cpp
View File

@ -19,7 +19,6 @@ namespace icinga
{
static bool l_SSLInitialized = false;
static std::mutex *l_Mutexes;
static std::mutex l_RandomMutex;
String GetOpenSSLVersion()
@ -31,7 +30,9 @@ String GetOpenSSLVersion()
#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
}
#ifdef CRYPTO_LOCK
#if OPENSSL_VERSION_NUMBER < 0x10100000L
static std::mutex *l_Mutexes;
static void OpenSSLLockingCallback(int mode, int type, const char *, int)
{
if (mode & CRYPTO_LOCK)
@ -48,7 +49,7 @@ static unsigned long OpenSSLIDCallback()
return (unsigned long)pthread_self();
#endif /* _WIN32 */
}
#endif /* CRYPTO_LOCK */
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
/**
* Initializes the OpenSSL library.
@ -63,11 +64,11 @@ void InitializeOpenSSL()
SSL_COMP_get_compression_methods();
#ifdef CRYPTO_LOCK
#if OPENSSL_VERSION_NUMBER < 0x10100000L
l_Mutexes = new std::mutex[CRYPTO_num_locks()];
CRYPTO_set_locking_callback(&OpenSSLLockingCallback);
CRYPTO_set_id_callback(&OpenSSLIDCallback);
#endif /* CRYPTO_LOCK */
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
l_SSLInitialized = true;
}