generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Default sensibly when in FIPS mode.

Browse Source
This commit is contained in:
Ben Laurie 2005-06-10 20:49:10 +00:00
parent e85e5ca5ec
commit 7450139b8b
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crypto/rand/rand_lib.c
View File

@ -87,16 +87,6 @@ int RAND_set_rand_method(const RAND_METHOD *meth)
const RAND_METHOD *RAND_get_rand_method(void) const RAND_METHOD *RAND_get_rand_method(void)
{ {
#ifdef OPENSSL_FIPS
if(FIPS_mode()
&& default_RAND_meth != FIPS_rand_check())
{
RANDerr(RAND_F_RAND_GET_RAND_METHOD,RAND_R_NON_FIPS_METHOD);
return 0;
}
#endif
if (!default_RAND_meth) if (!default_RAND_meth)
{ {
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
@ -114,8 +104,22 @@ const RAND_METHOD *RAND_get_rand_method(void)
funct_ref = e; funct_ref = e;
else else
#endif #endif
default_RAND_meth = RAND_SSLeay(); #ifdef OPENSSL_FIPS
if(FIPS_mode())
default_RAND_meth=FIPS_rand_method();
else
#endif
default_RAND_meth = RAND_SSLeay();
} }
#ifdef OPENSSL_FIPS
if(FIPS_mode()
&& default_RAND_meth != FIPS_rand_check())
{
RANDerr(RAND_F_RAND_GET_RAND_METHOD,RAND_R_NON_FIPS_METHOD);
return 0;
}
#endif
return default_RAND_meth; return default_RAND_meth;
} }