From: Richard Levitte <levitte@openssl.org>
Date: Wed, 9 Mar 2016 11:52:50 +0000 (+0100)
Subject: Don't call ENGINE_cleanup when configured "no-engine"
X-Git-Tag: OpenSSL_1_1_0-pre4~158
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9749a07a1d9488c2250e5461acec9b8da40762b0;p=oweals%2Fopenssl.git

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

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/crypto/init.c b/crypto/init.c
index c19afd09e2..1cac74193f 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -455,8 +455,10 @@ void OPENSSL_cleanup(void)
     CRYPTO_THREAD_cleanup_local(&threadstopkey);
 
 #ifdef OPENSSL_INIT_DEBUG
+#ifndef OPENSSL_NO_ENGINE
     fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
                     "ENGINE_cleanup()\n");
+#endif
     fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: "
                     "CRYPTO_cleanup_all_ex_data()\n");
     fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: "
@@ -467,7 +469,9 @@ void OPENSSL_cleanup(void)
                     "RAND_cleanup()\n");
 
 #endif
+#ifndef OPENSSL_NO_ENGINE
     ENGINE_cleanup();
+#endif
     CRYPTO_cleanup_all_ex_data();
     EVP_cleanup();
     CONF_modules_free();