Option "fipscheck" which checks to see if FIPS is autodetected in
authorDr. Stephen Henson <steve@openssl.org>
Thu, 16 Jun 2011 16:27:36 +0000 (16:27 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 16 Jun 2011 16:27:36 +0000 (16:27 +0000)
a build. Use this for WIN32 builds.

Configure
ms/do_fips.bat

index 4705a54..fb8cceb 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;
index aac21ad..a1e19aa 100644 (file)
@@ -43,7 +43,7 @@ SET ASM=nasm
 
 :compile
 
-perl Configure %TARGET% fipscanisteronly
+perl Configure %TARGET% fipscheck
 pause
 
 echo on