From 34a71d3cbb6cc9198936f4db2fe8039205b495ab Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 2 Jan 2019 00:12:35 -0800 Subject: [PATCH] Switch to OpenSSL's THREADID API The old callback was deprecated in version 1.0.0 of OpenSSL Fixes compilation without deprecated APIs enabled on 1.0.2. --- tlscommon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tlscommon.c b/tlscommon.c index e429d12..623b007 100644 --- a/tlscommon.c +++ b/tlscommon.c @@ -44,8 +44,8 @@ static uint8_t cookie_secret_initialized = 0; #if OPENSSL_VERSION_NUMBER < 0x10100000 static pthread_mutex_t *ssl_locks = NULL; -unsigned long ssl_thread_id() { - return (unsigned long)pthread_self(); +void ssl_thread_id(CRYPTO_THREADID *id) { + CRYPTO_THREADID_set_numeric(id, (unsigned long)pthread_self()); } void ssl_locking_callback(int mode, int type, const char *file, int line) { @@ -69,7 +69,7 @@ void sslinit() { for (i = 0; i < CRYPTO_num_locks(); i++) { pthread_mutex_init(&ssl_locks[i], NULL); } - CRYPTO_set_id_callback(ssl_thread_id); + CRYPTO_THREADID_set_callback(ssl_thread_id); CRYPTO_set_locking_callback(ssl_locking_callback); SSL_load_error_strings(); #else