From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 16 Jun 2011 16:27:36 +0000 (+0000)
Subject: Option "fipscheck" which checks to see if FIPS is autodetected in
X-Git-Tag: OpenSSL-fips-2_0-rc1~316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2348488797e4ac5ddd301db0f334e723069121a;p=thirdparty%2Fopenssl.git

Option "fipscheck" which checks to see if FIPS is autodetected in
a build. Use this for WIN32 builds.
---

diff --git a/Configure b/Configure
index 4705a54063a..fb8cceb430e 100755
--- a/Configure
+++ b/Configure
@@ -870,6 +870,16 @@ PROCESS_ARGS:
 			$fips = 1;
 			$nofipscanistercheck = 1;
 			}
+		elsif (/^fipscheck$/)
+			{
+			if ($fipscanisteronly != 2)
+				{
+				print STDERR <<"EOF";
+ERROR: FIPS not autodetected. Not running from restricted tarball??
+EOF
+				exit(1);
+				}
+			}
 		elsif (/^fipscanisteronly$/)
 			{
 			$fips = 1;
diff --git a/ms/do_fips.bat b/ms/do_fips.bat
index aac21ad3273..a1e19aa1147 100644
--- a/ms/do_fips.bat
+++ b/ms/do_fips.bat
@@ -43,7 +43,7 @@ SET ASM=nasm
 
 :compile
 
-perl Configure %TARGET% fipscanisteronly
+perl Configure %TARGET% fipscheck
 pause
 
 echo on