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_fips.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_fips.c')
| -rw-r--r-- | crypto/o_fips.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/crypto/o_fips.c b/crypto/o_fips.c index bf6db65fed..050ea9c216 100644 --- a/crypto/o_fips.c +++ b/crypto/o_fips.c @@ -8,27 +8,17 @@ */ #include "internal/cryptlib.h" -#ifdef OPENSSL_FIPS -# include <openssl/fips.h> -#endif int FIPS_mode(void) { -#ifdef OPENSSL_FIPS - return FIPS_module_mode(); -#else + /* This version of the library does not support FIPS mode. */ return 0; -#endif } int FIPS_mode_set(int r) { -#ifdef OPENSSL_FIPS - return FIPS_module_mode_set(r); -#else if (r == 0) return 1; CRYPTOerr(CRYPTO_F_FIPS_MODE_SET, CRYPTO_R_FIPS_MODE_NOT_SUPPORTED); return 0; -#endif } |