aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/rand
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-06-21 17:10:21 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-06-21 17:10:21 +0000
commitff053fc847df6275bfb6fad3af7c48b9f8af8d13 (patch)
treefad799ca77dea6233d3692193ff17ed4767c7b85 /crypto/rand
parent279a0001b682a6c7c64caf0968fa3504fee45dcc (diff)
downloadopenssl-ff053fc847df6275bfb6fad3af7c48b9f8af8d13.tar.gz
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...
Diffstat (limited to 'crypto/rand')
-rw-r--r--crypto/rand/rand_lib.c4
1 files changed, 0 insertions, 4 deletions
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)
{