From: jsing <jsing@openbsd.org>
Date: Thu, 24 Apr 2014 12:19:59 +0000 (+0000)
Subject: Remove more FIPS tenticles.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=19890f92338ec3a90cf52b662d44a851fb6b421e;p=openbsd

Remove more FIPS tenticles.

ok beck@
---

diff --git a/lib/libssl/src/apps/openssl.c b/lib/libssl/src/apps/openssl.c
index 9a7766cd339..5778191cb18 100644
--- a/lib/libssl/src/apps/openssl.c
+++ b/lib/libssl/src/apps/openssl.c
@@ -236,18 +236,7 @@ main(int argc, char **argv)
 	{
 		CRYPTO_set_locking_callback(lock_dbg_cb);
 	}
-	if (getenv("OPENSSL_FIPS")) {
-#ifdef OPENSSL_FIPS
-		if (!FIPS_mode_set(1)) {
-			ERR_load_crypto_strings();
-			ERR_print_errors(BIO_new_fp(stderr, BIO_NOCLOSE));
-			exit(1);
-		}
-#else
-		fprintf(stderr, "FIPS mode not supported.\n");
-		exit(1);
-#endif
-	}
+
 	apps_startup();
 
 	/* Lets load up our environment a little */