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 4705a54063a12ff5f9ff905da2619a89d5350365..fb8cceb430e52da8f0ee6762f08459b2398209c9 100755 (executable)
--- 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 aac21ad327323678315da4b47875e6295c16125d..a1e19aa11471008a09743ee73ffb351c044a4e1c 100644 (file)
--- 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