Don't try to clean up RAND from ENGINE
authorRichard Levitte <levitte@openssl.org>
Thu, 6 Apr 2017 13:58:38 +0000 (15:58 +0200)
committerRichard Levitte <levitte@openssl.org>
Fri, 7 Apr 2017 02:56:13 +0000 (04:56 +0200)
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)

crypto/engine/eng_lib.c

index 28de21d73de6d6ecb0a168a8a34ee2d62a1a00e4..cbefc7eb6c6da5dccd734acbe8a31bacba24296c 100644 (file)
@@ -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);
 }