From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 21 Jun 2011 17:10:21 +0000 (+0000)
Subject: Don't set FIPS rand method at same time as RAND method as this can cause the
X-Git-Tag: OpenSSL-fips-2_0-rc1~307
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=ff053fc847df6275bfb6fad3af7c48b9f8af8d13;ds=sidebyside

Don't set FIPS rand method at same time as RAND method as this can cause the
FIPS library to fail. Applications that want to set the FIPS rand method can do
so explicitly and presumably they know what they are doing...
---

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 0c68e35f70..8c28550a76 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -78,10 +78,6 @@ static const RAND_METHOD *default_RAND_meth = NULL;
 
 int RAND_set_rand_method(const RAND_METHOD *meth)
 	{
-#ifdef OPENSSL_FIPS
-	if (!FIPS_rand_set_method(meth))
-		return 0;
-#endif
 #ifndef OPENSSL_NO_ENGINE
 	if(funct_ref)
 		{