generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Setting the ex_data index is unsafe in a threaded environment, so

Browse Source 
let's wrap it with a lock.
This commit is contained in:
Richard Levitte 2003-10-06 09:09:44 +00:00
parent 6895cca89d
commit c40b9bdefb
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/comp/c_zlib.c
View File

@ -178,9 +178,12 @@ static int zlib_stateful_init(COMP_CTX *ctx)
CRYPTO_new_ex_data(CRYPTO_EX_INDEX_COMP,ctx,&ctx->ex_data); CRYPTO_new_ex_data(CRYPTO_EX_INDEX_COMP,ctx,&ctx->ex_data);
if (zlib_stateful_ex_idx == -1) if (zlib_stateful_ex_idx == -1)
{ {
zlib_stateful_ex_idx = CRYPTO_w_lock(CRYPTO_LOCK_COMP);
CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_COMP, if (zlib_stateful_ex_idx == -1)
0,NULL,NULL,NULL,zlib_stateful_free_ex_data); zlib_stateful_ex_idx =
CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_COMP,
0,NULL,NULL,NULL,zlib_stateful_free_ex_data);
CRYPTO_w_unlock(CRYPTO_LOCK_COMP);
if (zlib_stateful_ex_idx == -1) if (zlib_stateful_ex_idx == -1)
goto err; goto err;
} }

3
crypto/cryptlib.c
View File

@ -168,7 +168,8 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
"bn", "bn",
"ec_pre_comp", "ec_pre_comp",
"store", "store",
#if CRYPTO_NUM_LOCKS != 38 "comp",
#if CRYPTO_NUM_LOCKS != 39
# error "Inconsistency between crypto.h and cryptlib.c" # error "Inconsistency between crypto.h and cryptlib.c"
#endif #endif
}; };

3
crypto/crypto.h
View File

@ -203,7 +203,8 @@ typedef struct openssl_item_st
#define CRYPTO_LOCK_BN 35 #define CRYPTO_LOCK_BN 35
#define CRYPTO_LOCK_EC_PRE_COMP 36 #define CRYPTO_LOCK_EC_PRE_COMP 36
#define CRYPTO_LOCK_STORE 37 #define CRYPTO_LOCK_STORE 37
#define CRYPTO_NUM_LOCKS 38 #define CRYPTO_LOCK_COMP 38
#define CRYPTO_NUM_LOCKS 39
#define CRYPTO_LOCK 1 #define CRYPTO_LOCK 1
#define CRYPTO_UNLOCK 2 #define CRYPTO_UNLOCK 2