From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 12 May 2011 17:59:47 +0000 (+0000)
Subject: Enter FIPS mode by calling FIPS_module_mode_set in openssl.c until
X-Git-Tag: OpenSSL-fips-2_0-rc1~433
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d39c4951306bf7cc805a87e9cc81a522c7b863e0;p=oweals%2Fopenssl.git

Enter FIPS mode by calling FIPS_module_mode_set in openssl.c until
FIPS_mode_set is implemented.
---

diff --git a/apps/openssl.c b/apps/openssl.c
index 1c880d90ba..b0e64a8b54 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -315,7 +315,10 @@ int main(int Argc, char *ARGV[])
 
 	if(getenv("OPENSSL_FIPS")) {
 #ifdef OPENSSL_FIPS
-		if (!FIPS_mode_set(1)) {
+		/* For now call FIPS_module_mode_set(): will call
+		 * FIPS_mode_set() later.
+		 */
+		if (!FIPS_module_mode_set(1)) {
 			ERR_load_crypto_strings();
 			ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
 			EXIT(1);