From b2348488797e4ac5ddd301db0f334e723069121a Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 16 Jun 2011 16:27:36 +0000 Subject: [PATCH] Option "fipscheck" which checks to see if FIPS is autodetected in a build. Use this for WIN32 builds. --- Configure | 10 ++++++++++ ms/do_fips.bat | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Configure b/Configure index 4705a54063..fb8cceb430 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 aac21ad327..a1e19aa114 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 -- 2.34.1