diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2016-11-06 12:07:32 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2016-11-07 11:46:47 +0100 |
commit | 2dff359a331c5c9aab2435c470596b0fee7a502a (patch) | |
tree | 2274c371650f6201515e73623eb767da1e77ae3f | |
parent | 3341f49a49a07cbce003e487ef24a2042e800f01 (diff) | |
download | libssh-2dff359a331c5c9aab2435c470596b0fee7a502a.tar.gz libssh-2dff359a331c5c9aab2435c470596b0fee7a502a.tar.xz libssh-2dff359a331c5c9aab2435c470596b0fee7a502a.zip |
threads: Use new API call for OpenSSL CRYPTO THREADID
BUG: https://red.libssh.org/issues/222
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r-- | ConfigureChecks.cmake | 3 | ||||
-rw-r--r-- | config.h.cmake | 3 | ||||
-rw-r--r-- | src/threads.c | 19 |
3 files changed, 23 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index e18965a5..04d9a1c0 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -107,6 +107,9 @@ if (OPENSSL_FOUND) set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY}) check_function_exists(EVP_aes_128_cbc HAVE_OPENSSL_EVP_AES_CBC) + set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY}) + check_function_exists(CRYPTO_THREADID_set_callback HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK) endif() if (CMAKE_HAVE_PTHREAD_H) diff --git a/config.h.cmake b/config.h.cmake index dd54d5db..726d85ba 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -88,6 +88,9 @@ /* Define to 1 if you have the `EVP_aes128_cbc' function. */ #cmakedefine HAVE_OPENSSL_EVP_AES_CBC 1 +/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ +#cmakedefine HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK 1 + /* Define to 1 if you have the `snprintf' function. */ #cmakedefine HAVE_SNPRINTF 1 diff --git a/src/threads.c b/src/threads.c index 7f3a304e..062c3b84 100644 --- a/src/threads.c +++ b/src/threads.c @@ -116,6 +116,15 @@ static void libcrypto_lock_callback(int mode, int i, const char *file, int line) } } +#ifdef HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK +static void libcrypto_THREADID_callback(CRYPTO_THREADID *id) +{ + unsigned long thread_id = (*user_callbacks->thread_id)(); + + CRYPTO_THREADID_set_numeric(id, thread_id); +} +#endif /* HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK */ + static int libcrypto_thread_init(void){ int n=CRYPTO_num_locks(); int i; @@ -127,8 +136,14 @@ static int libcrypto_thread_init(void){ for (i=0;i<n;++i){ user_callbacks->mutex_init(&libcrypto_mutexes[i]); } - CRYPTO_set_id_callback(user_callbacks->thread_id); - CRYPTO_set_locking_callback(libcrypto_lock_callback); + +#ifdef HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK + CRYPTO_THREADID_set_callback(libcrypto_THREADID_callback); +#else + CRYPTO_set_id_callback(user_callbacks->thread_id); +#endif + + CRYPTO_set_locking_callback(libcrypto_lock_callback); return SSH_OK; } |