generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't call ENGINE_cleanup when configured "no-engine"

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Richard Levitte
2016-03-09 12:52:50 +01:00
parent 9ee3a5bb24
commit 9749a07a1d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/init.c
View File

@@ -455,8 +455,10 @@ void OPENSSL_cleanup(void)
CRYPTO_THREAD_cleanup_local(&threadstopkey); CRYPTO_THREAD_cleanup_local(&threadstopkey);
#ifdef OPENSSL_INIT_DEBUG #ifdef OPENSSL_INIT_DEBUG
#ifndef OPENSSL_NO_ENGINE
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
"ENGINE_cleanup()\n"); "ENGINE_cleanup()\n");
#endif
fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: "
"CRYPTO_cleanup_all_ex_data()\n"); "CRYPTO_cleanup_all_ex_data()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: "
@@ -467,7 +469,9 @@ void OPENSSL_cleanup(void)
"RAND_cleanup()\n"); "RAND_cleanup()\n");
#endif #endif
#ifndef OPENSSL_NO_ENGINE
ENGINE_cleanup(); ENGINE_cleanup();
#endif
CRYPTO_cleanup_all_ex_data(); CRYPTO_cleanup_all_ex_data();
EVP_cleanup(); EVP_cleanup();
CONF_modules_free(); CONF_modules_free();