From 816f06e172d5744b2721e1c94863fb76b4313e5e Mon Sep 17 00:00:00 2001 From: Dirkjan Bussink Date: Tue, 22 Dec 2020 19:45:32 +0100 Subject: [PATCH] Remove no longer needed compatibility check CRYPTO_THREADID_set_callback is available since 1.0.1 which is the oldest supported version. This means the check and compatibility code can be removed. Signed-off-by: Dirkjan Bussink Reviewed-by: Jakub Jelen --- ConfigureChecks.cmake | 4 ---- config.h.cmake | 3 --- src/threads/libcrypto.c | 12 ------------ 3 files changed, 19 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index e068c421..c0cce91b 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -112,10 +112,6 @@ if (OPENSSL_FOUND) set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARIES}) check_function_exists(EVP_aes_128_gcm HAVE_OPENSSL_EVP_AES_GCM) - set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARIES}) - check_function_exists(CRYPTO_THREADID_set_callback HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK) - set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARIES}) check_function_exists(CRYPTO_ctr128_encrypt HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT) diff --git a/config.h.cmake b/config.h.cmake index b7a1c954..12e0b73f 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -123,9 +123,6 @@ /* Define to 1 if you have the `EVP_chacha20' function. */ #cmakedefine HAVE_OPENSSL_EVP_CHACHA20 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 `CRYPTO_ctr128_encrypt' function. */ #cmakedefine HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT 1 diff --git a/src/threads/libcrypto.c b/src/threads/libcrypto.c index 5786948b..dac840d3 100644 --- a/src/threads/libcrypto.c +++ b/src/threads/libcrypto.c @@ -57,14 +57,12 @@ 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 */ int crypto_thread_init(struct ssh_threads_callbacks_struct *cb) { @@ -96,12 +94,7 @@ int crypto_thread_init(struct ssh_threads_callbacks_struct *cb) user_callbacks->mutex_init(&libcrypto_mutexes[i]); } -#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; @@ -116,12 +109,7 @@ void crypto_thread_finalize(void) return; } -#ifdef HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK CRYPTO_THREADID_set_callback(NULL); -#else - CRYPTO_set_id_callback(NULL); -#endif - CRYPTO_set_locking_callback(NULL); for (i = 0; i < n; ++i) {