diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-04-05 15:24:10 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-04-05 15:24:10 +0000 |
| commit | 05e24c87dd1428809d6eaebf754b472a6cb4bb50 (patch) | |
| tree | db17782a6020c7f4962f8bf9c1666f6f19356e1a /crypto/rand/rand.h | |
| parent | cab0595c1426b2f70d88b824028c6d1ef4a4476e (diff) | |
Extensive reorganisation of PRNG handling in FIPS module: all calls
now use an internal RAND_METHOD. All dependencies to OpenSSL standard
PRNG are now removed: it is the applications resposibility to setup
the FIPS PRNG and initalise it.
Initial OpenSSL RAND_init_fips() function that will setup the DRBG
for the "FIPS capable OpenSSL".
Diffstat (limited to 'crypto/rand/rand.h')
| -rw-r--r-- | crypto/rand/rand.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h index 8db2a5f80f..d446c38daf 100644 --- a/crypto/rand/rand.h +++ b/crypto/rand/rand.h @@ -94,7 +94,7 @@ extern int rand_predictable; int RAND_set_rand_method(const RAND_METHOD *meth); const RAND_METHOD *RAND_get_rand_method(void); -#if !defined(OPENSSL_NO_ENGINE) && !defined(OPENSSL_FIPS) +#ifndef OPENSSL_NO_ENGINE int RAND_set_rand_engine(ENGINE *engine); #endif RAND_METHOD *RAND_SSLeay(void); @@ -119,6 +119,10 @@ int RAND_event(UINT, WPARAM, LPARAM); #endif +#ifdef OPENSSL_FIPS +int RAND_init_fips(void); +#endif + /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. @@ -132,6 +136,7 @@ void ERR_load_RAND_strings(void); #define RAND_F_FIPS_RAND_SET_DT 103 #define RAND_F_FIPS_SET_PRNG_SEED 104 #define RAND_F_FIPS_SET_TEST_MODE 105 +#define RAND_F_FIPS_X931_SET_DT 106 #define RAND_F_RAND_GET_RAND_METHOD 101 #define RAND_F_SSLEAY_RAND_BYTES 100 |