summaryrefslogtreecommitdiffstats
path: root/crypto/engine
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2017-04-06 15:58:38 +0200
committerRichard Levitte <levitte@openssl.org>2017-04-07 04:55:16 +0200
commit789a2b6250d5e05dfde6ce259e79ef8c172c9f3f (patch)
tree66a13400ace2c3fc42f986d4bf015bfb6665749c /crypto/engine
parentMake getting and setting the RAND default method thread safe (diff)
downloadopenssl-789a2b6250d5e05dfde6ce259e79ef8c172c9f3f.tar.xz
openssl-789a2b6250d5e05dfde6ce259e79ef8c172c9f3f.zip
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)
Diffstat (limited to 'crypto/engine')
-rw-r--r--crypto/engine/eng_lib.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index 385af54919..6f422bd77e 100644
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c
@@ -166,11 +166,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);
}