From f75200115d1a778c39c8a8850823928d8be1f8ac Mon Sep 17 00:00:00 2001 From: Alessandro Ghedini Date: Sat, 5 Mar 2016 21:54:02 +0000 Subject: [PATCH] Convert CRYPTO_LOCK_EX_DATA to new multi-threading API Reviewed-by: Matt Caswell Reviewed-by: Rich Salz --- crypto/ex_data.c | 27 ++++++++++++++++++++------- include/openssl/crypto.h | 1 - 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/crypto/ex_data.c b/crypto/ex_data.c index f19fa8e60b..de734d30aa 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -109,6 +109,7 @@ */ #include "internal/cryptlib.h" +#include "internal/threads.h" #include /* @@ -133,6 +134,16 @@ typedef struct ex_callbacks_st { static EX_CALLBACKS ex_data[CRYPTO_EX_INDEX__COUNT]; +static CRYPTO_RWLOCK *ex_data_lock; +static CRYPTO_ONCE ex_data_init = CRYPTO_ONCE_STATIC_INIT; + +static void do_ex_data_init(void) +{ + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); + ex_data_lock = CRYPTO_THREAD_lock_new(); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE); +} + /* * Return the EX_CALLBACKS from the |ex_data| array that corresponds to * a given class. On success, *holds the lock.* @@ -146,8 +157,10 @@ static EX_CALLBACKS *get_and_lock(int class_index) return NULL; } + CRYPTO_THREAD_run_once(&ex_data_init, do_ex_data_init); + ip = &ex_data[class_index]; - CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA); + CRYPTO_THREAD_write_lock(ex_data_lock); if (ip->meth == NULL) { ip->meth = sk_EX_CALLBACK_new_null(); /* We push an initial value on the stack because the SSL @@ -155,7 +168,7 @@ static EX_CALLBACKS *get_and_lock(int class_index) if (ip->meth == NULL || !sk_EX_CALLBACK_push(ip->meth, NULL)) { CRYPTOerr(CRYPTO_F_GET_AND_LOCK, ERR_R_MALLOC_FAILURE); - CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); + CRYPTO_THREAD_unlock(ex_data_lock); return NULL; } } @@ -225,7 +238,7 @@ int CRYPTO_free_ex_index(int class_index, int idx) a->free_func = dummy_free; toret = 1; err: - CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); + CRYPTO_THREAD_unlock(ex_data_lock); return toret; } @@ -262,7 +275,7 @@ int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp, (void)sk_EX_CALLBACK_set(ip->meth, toret, a); err: - CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); + CRYPTO_THREAD_unlock(ex_data_lock); return toret; } @@ -296,7 +309,7 @@ int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad) for (i = 0; i < mx; i++) storage[i] = sk_EX_CALLBACK_value(ip->meth, i); } - CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); + CRYPTO_THREAD_unlock(ex_data_lock); if (mx > 0 && storage == NULL) { CRYPTOerr(CRYPTO_F_CRYPTO_NEW_EX_DATA, ERR_R_MALLOC_FAILURE); @@ -346,7 +359,7 @@ int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, for (i = 0; i < mx; i++) storage[i] = sk_EX_CALLBACK_value(ip->meth, i); } - CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); + CRYPTO_THREAD_unlock(ex_data_lock); if (mx > 0 && storage == NULL) { CRYPTOerr(CRYPTO_F_CRYPTO_DUP_EX_DATA, ERR_R_MALLOC_FAILURE); @@ -391,7 +404,7 @@ void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad) for (i = 0; i < mx; i++) storage[i] = sk_EX_CALLBACK_value(ip->meth, i); } - CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); + CRYPTO_THREAD_unlock(ex_data_lock); if (mx > 0 && storage == NULL) { CRYPTOerr(CRYPTO_F_CRYPTO_FREE_EX_DATA, ERR_R_MALLOC_FAILURE); diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 44611ca7fb..0f09197b78 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -166,7 +166,6 @@ extern "C" { */ # define CRYPTO_LOCK_ERR 1 -# define CRYPTO_LOCK_EX_DATA 2 # define CRYPTO_LOCK_X509 3 # define CRYPTO_LOCK_X509_INFO 4 # define CRYPTO_LOCK_X509_PKEY 5 -- 2.25.1