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/evp/evp_cnf.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/evp/evp_cnf.c')
| -rw-r--r-- | crypto/evp/evp_cnf.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/crypto/evp/evp_cnf.c b/crypto/evp/evp_cnf.c index 71d13b8df0..d0d61b28be 100644 --- a/crypto/evp/evp_cnf.c +++ b/crypto/evp/evp_cnf.c @@ -38,16 +38,8 @@ static int alg_module_init(CONF_IMODULE *md, const CONF *cnf) return 0; } if (m > 0) { -#ifdef OPENSSL_FIPS - if (!FIPS_mode() && !FIPS_mode_set(1)) { - EVPerr(EVP_F_ALG_MODULE_INIT, - EVP_R_ERROR_SETTING_FIPS_MODE); - return 0; - } -#else EVPerr(EVP_F_ALG_MODULE_INIT, EVP_R_FIPS_MODE_NOT_SUPPORTED); return 0; -#endif } } else { EVPerr(EVP_F_ALG_MODULE_INIT, EVP_R_UNKNOWN_OPTION); |