From: Ondřej Surý <ondrej@sury.org>
Date: Thu, 25 Oct 2018 17:58:31 +0000 (+0200)
Subject: Disable FIPS mode on Windows
X-Git-Tag: v9.13.4~91^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=6aae193ded53d7ea7b2686aca1d33b264103be5c;p=thirdparty%2Fbind9.git

Disable FIPS mode on Windows
---

diff --git a/config.h.win32 b/config.h.win32
index 01a0cddbcff..00aa5267a3a 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -280,9 +280,6 @@ typedef __int64 off_t;
 /* Define to enable "rrset-order fixed" syntax. */
 @DNS_RDATASET_FIXED@
 
-/* Define if OpenSSL provides FIPS_mode() */
-@HAVE_FIPS_MODE@
-
 /* Define if OpenSSL includes Ed25519 support */
 @HAVE_OPENSSL_ED25519@
 
diff --git a/win32utils/Configure b/win32utils/Configure
index d2eed20e833..0e52a17baa5 100644
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -196,7 +196,6 @@ my @substdefh = ("AES_CC",
                  "DNS_RDATASET_FIXED",
                  "ENABLE_RPZ_NSDNAME",
                  "ENABLE_RPZ_NSIP",
-                 "HAVE_FIPS_MODE",
                  "HAVE_GEOIP",
                  "HAVE_GEOIP_CITY_V6",
                  "HAVE_GEOIP_V6",
@@ -1505,31 +1504,6 @@ EOF
 
 # check FIPS_mode
 
-if ($use_openssl eq "yes") {
-    if ($verbose) {
-        printf "checking for FIPS_mode\n";
-    }
-    open F, ">testfips.c" || die $!;
-    print F << 'EOF';
-extern int FIPS_mode();
-
-int main() {
-    return FIPS_mode();
-}
-EOF
-    close F;
-    my $library = $configlib{"OPENSSL_LIB"};
-    $compret = `cl /nologo /MD testfips.c "$library"`;
-    if (grep { -f and -x } ".\\testfips.exe") {
-        $configdefh{"HAVE_FIPS_MODE"} = 1;
-    } else {
-        if ($verbose) {
-            print "can't compile FIPS_mode test: $compret\n";
-            print "disabling FIPS_mode\n";
-        }
-    }
-}
-
 # with-eddsa
 if ($use_openssl eq "no") {
     $use_eddsa = "no";