wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove use of CRYPTO_LOCK_INIT in init code

Browse source 
Swap the use of CRYPTO_LOCK_INIT in the init code to use the new threading
API mechanism for locking.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2016-03-07 14:39:22 +00:00
parent a072ed0c88
commit c292b105b1
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crypto/init.c
View file

@ -105,6 +105,7 @@ struct ossl_init_stop_st {
};
static OPENSSL_INIT_STOP *stop_handlers = NULL;
static CRYPTO_RWLOCK *init_lock = NULL;
static CRYPTO_ONCE base = CRYPTO_ONCE_STATIC_INIT;
static int base_inited = 0;
@ -121,6 +122,7 @@ static void ossl_init_base(void)
#ifndef OPENSSL_SYS_UEFI
atexit(OPENSSL_cleanup);
#endif
init_lock = CRYPTO_THREAD_lock_new();
OPENSSL_cpuid_setup();
base_inited = 1;
}
@ -425,6 +427,9 @@ void OPENSSL_cleanup(void)
OPENSSL_free(lasthandler);
}
stop_handlers = NULL;
CRYPTO_THREAD_lock_free(init_lock);
/*
* We assume we are single-threaded for this function, i.e. no race
* conditions for the various "*_inited" vars below.
@ -544,10 +549,10 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
if (opts & OPENSSL_INIT_LOAD_CONFIG) {
int ret;
CRYPTO_w_lock(CRYPTO_LOCK_INIT);
CRYPTO_THREAD_write_lock(init_lock);
config_filename = (settings == NULL) ? NULL : settings->config_name;
ret = CRYPTO_THREAD_run_once(&config, ossl_init_config);
CRYPTO_w_unlock(CRYPTO_LOCK_INIT);
CRYPTO_THREAD_unlock(init_lock);
if (!ret)
return 0;
}

3
crypto/lock.c
View file

@ -163,8 +163,7 @@ static const char *const lock_names[CRYPTO_NUM_LOCKS] = {
"comp",
"fips",
"fips2",
"init",
#if CRYPTO_NUM_LOCKS != 42
#if CRYPTO_NUM_LOCKS != 41
# error "Inconsistency between crypto.h and cryptlib.c"
#endif
};

3
include/openssl/crypto.h
View file

@ -205,8 +205,7 @@ extern "C" {
# define CRYPTO_LOCK_COMP 38
# define CRYPTO_LOCK_FIPS 39
# define CRYPTO_LOCK_FIPS2 40
# define CRYPTO_LOCK_INIT 41
# define CRYPTO_NUM_LOCKS 42
# define CRYPTO_NUM_LOCKS 41
# define CRYPTO_LOCK 1
# define CRYPTO_UNLOCK 2