summaryrefslogtreecommitdiffstats
path: root/crypto/err
diff options
context:
space:
mode:
authorTomas Mraz <tomas@openssl.org>2021-03-11 18:02:52 +0100
committerTomas Mraz <tomas@openssl.org>2021-03-12 15:11:21 +0100
commit12b4e5821d59b5d0c35f830e078d842583be6486 (patch)
treeeeb47b387a932c61534473309439f075e641e443 /crypto/err
parent343475126e55b4e814acb495196b92680df70a88 (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/err')
-rw-r--r--crypto/err/err.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c
index e5f9866813..a8bde92674 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -197,7 +197,7 @@ static void ERR_STATE_free(ERR_STATE *s)
DEFINE_RUN_ONCE_STATIC(do_err_strings_init)
{
- if (!OPENSSL_init_crypto(0, NULL))
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_BASE_ONLY, NULL))
return 0;
err_string_lock = CRYPTO_THREAD_lock_new();
if (err_string_lock == NULL)