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 /apps | |
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 'apps')
-rw-r--r-- | apps/openssl.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index bb776eb310..e42ee1e6e9 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -21,9 +21,6 @@ # include <openssl/engine.h> #endif #include <openssl/err.h> -#ifdef OPENSSL_FIPS -# include <openssl/fips.h> -#endif #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */ #include "s_apps.h" /* Needed to get the other O_xxx flags. */ @@ -143,15 +140,8 @@ int main(int argc, char *argv[]) CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); if (getenv("OPENSSL_FIPS")) { -#ifdef OPENSSL_FIPS - if (!FIPS_mode_set(1)) { - ERR_print_errors(bio_err); - return 1; - } -#else BIO_printf(bio_err, "FIPS mode not supported.\n"); return 1; -#endif } if (!apps_startup()) |