Disable FIPS mode on Windows

This commit is contained in:
Ondřej Surý
2018-10-25 19:58:31 +02:00
committed by Ondřej Surý
parent 25805beb29
commit 6aae193ded
2 changed files with 0 additions and 29 deletions

View 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@

View 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";