diff options
| author | Emilia Kasper <emilia@openssl.org> | 2017-02-28 12:30:28 +0100 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2017-02-28 15:26:25 +0100 |
| commit | b53338cbf8822dd774f9e4057307f347d2b63ff0 (patch) | |
| tree | 762d5194d048f5ae4d156b769115ca8f3b5b4155 /crypto/o_init.c | |
| parent | 223a90cc9a94d1f6abf04ef28dc30b03c3e5e0c1 (diff) | |
Clean up references to FIPS
This removes the fips configure option. This option is broken as the
required FIPS code is not available.
FIPS_mode() and FIPS_mode_set() are retained for compatibility, but
FIPS_mode() always returns 0, and FIPS_mode_set() can only be used to
turn FIPS mode off.
Reviewed-by: Stephen Henson <steve@openssl.org>
Diffstat (limited to 'crypto/o_init.c')
| -rw-r--r-- | crypto/o_init.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/crypto/o_init.c b/crypto/o_init.c index 2e0c126095..5eb7654d32 100644 --- a/crypto/o_init.c +++ b/crypto/o_init.c @@ -9,26 +9,13 @@ #include <e_os.h> #include <openssl/err.h> -#ifdef OPENSSL_FIPS -# include <openssl/fips.h> -# include <openssl/rand.h> -#endif /* - * Perform any essential OpenSSL initialization operations. Currently only - * sets FIPS callbacks + * Perform any essential OpenSSL initialization operations. Currently does + * nothing. */ void OPENSSL_init(void) { - static int done = 0; - if (done) - return; - done = 1; -#ifdef OPENSSL_FIPS - FIPS_set_locking_callbacks(CRYPTO_lock, CRYPTO_add_lock); - FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata); - FIPS_set_malloc_callbacks(CRYPTO_malloc, CRYPTO_free); - RAND_init_fips(); -#endif + return; } |