diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2022-05-03 15:01:12 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2022-05-03 15:01:12 +0000 |
| commit | cf0ffd7607ed8f39829c6951a65a55fa1eb3aafe (patch) | |
| tree | 313b32246c8ef2c8b712ea825eda45d4d09f4a18 /ssl/ssl_init.c | |
| parent | d6d3d400982465ee2c394caa850ba51c537b5a09 (diff) | |
Import OpenSSL 1.1.1ovendor/openssl/1.1.1o
Diffstat (limited to 'ssl/ssl_init.c')
| -rw-r--r-- | ssl/ssl_init.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index d083d9597091..a5d45480c9e0 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -116,7 +116,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) { /* @@ -129,7 +129,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_ssl_strings) "ERR_load_SSL_strings()\n"); # endif ERR_load_SSL_strings(); - ssl_strings_inited = 1; #endif return 1; } @@ -157,20 +156,6 @@ static void ssl_library_stop(void) ssl_comp_free_compression_methods_int(); #endif } - - if (ssl_strings_inited) { -#ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: ssl_library_stop: " - "err_free_strings_int()\n"); -#endif - /* - * 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(); - } } /* |