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/err/err_all.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/err/err_all.c')
| -rw-r--r-- | crypto/err/err_all.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 3b1304f8e0..6cc8c8f20b 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -31,9 +31,6 @@ #include <openssl/ui.h> #include <openssl/ocsp.h> #include <openssl/err.h> -#ifdef OPENSSL_FIPS -# include <openssl/fips.h> -#endif #include <openssl/ts.h> #include <openssl/cms.h> #include <openssl/ct.h> @@ -43,9 +40,6 @@ int err_load_crypto_strings_int(void) { if ( -#ifdef OPENSSL_FIPS - FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata) == 0 || -#endif #ifndef OPENSSL_NO_ERR ERR_load_ERR_strings() == 0 || /* include error strings for SYSerr */ ERR_load_BN_strings() == 0 || @@ -91,9 +85,6 @@ int err_load_crypto_strings_int(void) #ifndef OPENSSL_NO_UI ERR_load_UI_strings() == 0 || #endif -# ifdef OPENSSL_FIPS - ERR_load_FIPS_strings() == 0 || -# endif # ifndef OPENSSL_NO_CMS ERR_load_CMS_strings() == 0 || # endif |