diff options
author | jsing <> | 2014-04-24 12:19:59 +0000 |
---|---|---|
committer | jsing <> | 2014-04-24 12:19:59 +0000 |
commit | 2e912582a3c02782ff63159bad4ca1c02e8a095e (patch) | |
tree | e7121efc2ea3ef2e0e45faaf2aadd98df99fdb8a /src | |
parent | 6923103673e413744c67110027c3358d8e469927 (diff) | |
download | openbsd-2e912582a3c02782ff63159bad4ca1c02e8a095e.tar.gz openbsd-2e912582a3c02782ff63159bad4ca1c02e8a095e.tar.bz2 openbsd-2e912582a3c02782ff63159bad4ca1c02e8a095e.zip |
Remove more FIPS tenticles.
ok beck@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/src/apps/openssl.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/lib/libssl/src/apps/openssl.c b/src/lib/libssl/src/apps/openssl.c index 9a7766cd33..5778191cb1 100644 --- a/src/lib/libssl/src/apps/openssl.c +++ b/src/lib/libssl/src/apps/openssl.c | |||
@@ -236,18 +236,7 @@ main(int argc, char **argv) | |||
236 | { | 236 | { |
237 | CRYPTO_set_locking_callback(lock_dbg_cb); | 237 | CRYPTO_set_locking_callback(lock_dbg_cb); |
238 | } | 238 | } |
239 | if (getenv("OPENSSL_FIPS")) { | 239 | |
240 | #ifdef OPENSSL_FIPS | ||
241 | if (!FIPS_mode_set(1)) { | ||
242 | ERR_load_crypto_strings(); | ||
243 | ERR_print_errors(BIO_new_fp(stderr, BIO_NOCLOSE)); | ||
244 | exit(1); | ||
245 | } | ||
246 | #else | ||
247 | fprintf(stderr, "FIPS mode not supported.\n"); | ||
248 | exit(1); | ||
249 | #endif | ||
250 | } | ||
251 | apps_startup(); | 240 | apps_startup(); |
252 | 241 | ||
253 | /* Lets load up our environment a little */ | 242 | /* Lets load up our environment a little */ |