diff options
| author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2022-03-29 21:50:21 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2022-05-10 09:50:15 +0200 |
| commit | 39f7f543738f954c9a7c0ef554e32563e241bcb9 (patch) | |
| tree | bb1c2ccaa77f9928396b51a9c78a77469749f136 /ssl | |
| parent | 3e8307924efb54274083454f3a05a7d38b54be86 (diff) | |
err: get rid of err_free_strings_int()
Even though the function is not part of the public api, it is not
entirely removed, in order to minimize the chance of breakage,
because it is exported from libcrypto. Instead, we keep a dummy
implementation.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17974)
(cherry picked from commit 1c8787d5e0b01bedfc3cbe5eab5b85290221d8c1)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_init.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index 2948c30713..b31188edea 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -46,7 +46,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_ssl_base) } static CRYPTO_ONCE ssl_strings = CRYPTO_ONCE_STATIC_INIT; -static int ssl_strings_inited = 0; + DEFINE_RUN_ONCE_STATIC(ossl_init_load_ssl_strings) { /* @@ -56,7 +56,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_ssl_strings) #if !defined(OPENSSL_NO_ERR) && !defined(OPENSSL_NO_AUTOERRINIT) OSSL_TRACE(INIT, "ossl_init_load_ssl_strings: ossl_err_load_SSL_strings()\n"); ossl_err_load_SSL_strings(); - ssl_strings_inited = 1; #endif return 1; } @@ -82,17 +81,6 @@ static void ssl_library_stop(void) ssl_comp_free_compression_methods_int(); #endif } - - if (ssl_strings_inited) { - OSSL_TRACE(INIT, "ssl_library_stop: err_free_strings_int()\n"); - /* - * If both crypto and ssl error strings are inited we will end up - * calling err_free_strings_int() twice - but that's ok. The second - * time will be a no-op. It's easier to do that than to try and track - * between the two libraries whether they have both been inited. - */ - err_free_strings_int(); - } } /* |