diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-03-11 18:02:52 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-03-12 15:11:21 +0100 |
| commit | 12b4e5821d59b5d0c35f830e078d842583be6486 (patch) | |
| tree | eeb47b387a932c61534473309439f075e641e443 /crypto/store/store_register.c | |
| parent | 343475126e55b4e814acb495196b92680df70a88 (diff) | |
Use OPENSSL_init_crypto(OPENSSL_INIT_BASE_ONLY, NULL) in libcrypto
Calling OPENSSL_init_crypto(0, NULL) is a no-op and will
not properly initialize thread local handling.
Only the calls that are needed to initialize thread locals
are kept, the rest of the no-op calls are removed.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14497)
Diffstat (limited to 'crypto/store/store_register.c')
| -rw-r--r-- | crypto/store/store_register.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/crypto/store/store_register.c b/crypto/store/store_register.c index f426a82ecc..51bd591790 100644 --- a/crypto/store/store_register.c +++ b/crypto/store/store_register.c @@ -207,8 +207,6 @@ int ossl_store_register_loader_int(OSSL_STORE_LOADER *loader) } int OSSL_STORE_register_loader(OSSL_STORE_LOADER *loader) { - if (!ossl_store_init_once()) - return 0; return ossl_store_register_loader_int(loader); } @@ -224,9 +222,6 @@ const OSSL_STORE_LOADER *ossl_store_get0_loader_int(const char *scheme) template.close = NULL; template.open_ex = NULL; - if (!ossl_store_init_once()) - return NULL; - if (!RUN_ONCE(®istry_init, do_registry_init)) { ERR_raise(ERR_LIB_OSSL_STORE, ERR_R_MALLOC_FAILURE); return NULL; @@ -275,8 +270,6 @@ OSSL_STORE_LOADER *ossl_store_unregister_loader_int(const char *scheme) } OSSL_STORE_LOADER *OSSL_STORE_unregister_loader(const char *scheme) { - if (!ossl_store_init_once()) - return 0; return ossl_store_unregister_loader_int(scheme); } |