The branch master has been updated
via 5006b37b31c5a520c3065048bd8aba8cc3ff128d (commit)
from 5748e4dc3ab1cdde43ae6feecb106e3a41adcdf4 (commit)
- Log -----------------------------------------------------------------
commit 5006b37b31c5a520c3065048bd8aba8cc3ff128d
Author: Richard Levitte <[email protected]>
Date: Thu Apr 6 10:24:55 2017 +0200
In rand_cleanup_int(), don't go creating a default method
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 <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/3136)
-----------------------------------------------------------------------
Summary of changes:
crypto/rand/rand_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index fc47dc9..ad45250 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -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);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
