]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Disable FIPS mode on Windows
authorOndřej Surý <ondrej@sury.org>
Thu, 25 Oct 2018 17:58:31 +0000 (19:58 +0200)
committerOndřej Surý <ondrej@isc.org>
Thu, 25 Oct 2018 18:47:44 +0000 (14:47 -0400)
config.h.win32
win32utils/Configure

index 01a0cddbcff2173d507d1fad619b8b3e6283b91e..00aa5267a3a8aaab5915965b409a2d84c272938a 100644 (file)
@@ -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@
 
index d2eed20e833eeab3affbc845dc6af7d70caced73..0e52a17baa5d8336443302e01df2fed23ce250c7 100644 (file)
@@ -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";