From 298f6bff5b7ce7448b8f537317e6a0369f6d5034 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 31 Aug 2012 00:37:45 +0200 Subject: [PATCH] crypto: use CRYPTO_THREADID_set_callback() Don't use CRYPTO_set_id_callback(), it's deprecated. --- src/node_crypto.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc index d1dd84dab9..7a06fae2c3 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -90,12 +90,16 @@ static Persistent secure_context_constructor; static uv_rwlock_t* locks; -static unsigned long crypto_id_cb(void) { +static void crypto_threadid_cb(CRYPTO_THREADID* tid) { + unsigned long val; + #ifdef _WIN32 - return (unsigned long) GetCurrentThreadId(); -#else /* !_WIN32 */ - return (unsigned long) pthread_self(); -#endif /* !_WIN32 */ + val = static_cast(GetCurrentThreadId()); +#else + val = static_cast(pthread_self()); +#endif + + CRYPTO_THREADID_set_numeric(tid, val); } @@ -4498,7 +4502,7 @@ void InitCrypto(Handle target) { crypto_lock_init(); CRYPTO_set_locking_callback(crypto_lock_cb); - CRYPTO_set_id_callback(crypto_id_cb); + CRYPTO_THREADID_set_callback(crypto_threadid_cb); // Turn off compression. Saves memory - do it in userland. #if !defined(OPENSSL_NO_COMP)