diff options
| author |   djm <djm@openbsd.org> | 2008-09-06 12:17:47 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2008-09-06 12:17:47 +0000 |
| commit | 4fcf65c5c59fcf6124cf9f1fd81aa546850f974c (patch) | |
| tree | 3c0b4c46d91bcb87c8eef7a1e84711159b17f71b /lib/libcrypto/rand/rand_lib.c | |
| parent | import of OpenSSL 0.9.8h (diff) | |
| download | wireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.tar.xz wireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.zip | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/rand/rand_lib.c')
| -rw-r--r-- | lib/libcrypto/rand/rand_lib.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/libcrypto/rand/rand_lib.c b/lib/libcrypto/rand/rand_lib.c index a21bde79de0..513e3389859 100644 --- a/lib/libcrypto/rand/rand_lib.c +++ b/lib/libcrypto/rand/rand_lib.c @@ -63,8 +63,6 @@ #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif -#include <openssl/fips.h> -#include <openssl/fips_rand.h> #ifndef OPENSSL_NO_ENGINE /* non-NULL if default_RAND_meth is ENGINE-provided */ @@ -104,22 +102,8 @@ const RAND_METHOD *RAND_get_rand_method(void) funct_ref = e; else #endif -#ifdef OPENSSL_FIPS - if(FIPS_mode()) - default_RAND_meth=FIPS_rand_method(); - else -#endif - default_RAND_meth = RAND_SSLeay(); + 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; } |