diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 11:36:36 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
commit | f148f7034c9e2f9155ca4a8e51cbe7af02f8600a (patch) | |
tree | ae4d11118b29bb1a635194753cfc37f9d5cf43f5 /crypto/init.c | |
parent | 054d43ff972068a0f2ec07319808ca32ad0afb5f (diff) |
Add ossl_ conf symbols
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'crypto/init.c')
-rw-r--r-- | crypto/init.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crypto/init.c b/crypto/init.c index 4bef667199..aa9757936c 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -235,22 +235,22 @@ static int config_inited = 0; static const OPENSSL_INIT_SETTINGS *conf_settings = NULL; DEFINE_RUN_ONCE_STATIC(ossl_init_config) { - int ret = openssl_config_int(NULL); + int ret = ossl_config_int(NULL); config_inited = 1; return ret; } DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_config_settings, ossl_init_config) { - int ret = openssl_config_int(conf_settings); + int ret = ossl_config_int(conf_settings); config_inited = 1; return ret; } DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_config, ossl_init_config) { - OSSL_TRACE(INIT, "openssl_no_config_int()\n"); - openssl_no_config_int(); + OSSL_TRACE(INIT, "ossl_no_config_int()\n"); + ossl_no_config_int(); config_inited = 1; return 1; } @@ -385,8 +385,8 @@ void OPENSSL_cleanup(void) #ifndef OPENSSL_NO_COMP if (zlib_inited) { - OSSL_TRACE(INIT, "OPENSSL_cleanup: comp_zlib_cleanup_int()\n"); - comp_zlib_cleanup_int(); + OSSL_TRACE(INIT, "OPENSSL_cleanup: ossl_comp_zlib_cleanup()\n"); + ossl_comp_zlib_cleanup(); } #endif @@ -406,16 +406,16 @@ void OPENSSL_cleanup(void) * must be called before engine_cleanup_int() * - ENGINEs use CRYPTO_EX_DATA and therefore, must be cleaned up * before the ex data handlers are wiped during default ossl_lib_ctx deinit. - * - conf_modules_free_int() can end up in ENGINE code so must be called + * - ossl_config_modules_free() can end up in ENGINE code so must be called * before engine_cleanup_int() * - ENGINEs and additional EVP algorithms might use added OIDs names so - * obj_cleanup_int() must be called last + * ossl_obj_cleanup_int() must be called last */ OSSL_TRACE(INIT, "OPENSSL_cleanup: ossl_rand_cleanup_int()\n"); ossl_rand_cleanup_int(); - OSSL_TRACE(INIT, "OPENSSL_cleanup: conf_modules_free_int()\n"); - conf_modules_free_int(); + OSSL_TRACE(INIT, "OPENSSL_cleanup: ossl_config_modules_free()\n"); + ossl_config_modules_free(); #ifndef OPENSSL_NO_ENGINE OSSL_TRACE(INIT, "OPENSSL_cleanup: engine_cleanup_int()\n"); @@ -438,8 +438,8 @@ void OPENSSL_cleanup(void) OSSL_TRACE(INIT, "OPENSSL_cleanup: evp_cleanup_int()\n"); evp_cleanup_int(); - OSSL_TRACE(INIT, "OPENSSL_cleanup: obj_cleanup_int()\n"); - obj_cleanup_int(); + OSSL_TRACE(INIT, "OPENSSL_cleanup: ossl_obj_cleanup_int()\n"); + ossl_obj_cleanup_int(); OSSL_TRACE(INIT, "OPENSSL_cleanup: err_int()\n"); err_cleanup(); |