From: Richard Levitte <levitte@openssl.org>
Date: Thu, 6 Apr 2017 13:58:38 +0000 (+0200)
Subject: Don't try to clean up RAND from ENGINE
X-Git-Tag: OpenSSL_1_1_0f~87
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=df13eb7ae70073de8c95ca3c7d2f587037582470;p=oweals%2Fopenssl.git

Don't try to clean up RAND from ENGINE

This is especially harmful since OPENSSL_cleanup() has already called
the RAND cleanup function

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3137)
(cherry picked from commit 789a2b6250d5e05dfde6ce259e79ef8c172c9f3f)
---

diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index 28de21d73d..cbefc7eb6c 100644
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c
@@ -161,11 +161,6 @@ void engine_cleanup_int(void)
                                         engine_cleanup_cb_free);
         cleanup_stack = NULL;
     }
-    /*
-     * FIXME: This should be handled (somehow) through RAND, eg. by it
-     * registering a cleanup callback.
-     */
-    RAND_set_rand_method(NULL);
     CRYPTO_THREAD_lock_free(global_engine_lock);
 }