mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

In rand_cleanup_int(), don't go creating a default method

Browse Source 
If no default method was yet given, RAND_get_rand_method() will set it
up.  Doing so just to clean it away seems pretty silly, so instead,
use the default_RAND_meth variable directly.

This also clears a possible race condition where this will try to init
things, such as ERR or ENGINE when in the middle of a OPENSSL_cleanup.

Fixes #3128

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3136)
This commit is contained in:
Richard Levitte 2017-04-06 10:24:55 +02:00
parent 5748e4dc3a
commit 5006b37b31
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/rand/rand_lib.c
View File

@ -74,7 +74,7 @@ int RAND_set_rand_engine(ENGINE *engine)
void rand_cleanup_int(void)
{
const RAND_METHOD *meth = RAND_get_rand_method();
const RAND_METHOD *meth = default_RAND_meth;
if (meth && meth->cleanup)
meth->cleanup();
RAND_set_rand_method(NULL);