2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00

address win32 build issues

- Replace external -DOPENSSL/-DPKCS11CRYPTO with properly AC_DEFINEd
  HAVE_OPENSSL/HAVE_PKCS11
- Don't enforce the crypto provider from platform.h, just from dst_api.c
  and configure scripts
This commit is contained in:
Ondřej Surý
2018-05-22 15:24:37 +02:00
committed by Evan Hunt
parent 9b6b11f02a
commit 7ee8a7e69f
137 changed files with 265 additions and 319 deletions

View File

@@ -201,6 +201,7 @@ my @substdefh = ("AES_CC",
"HAVE_GEOIP_CITY_V6",
"HAVE_GEOIP_V6",
"HAVE_LIBXML2",
"HAVE_OPENSSL",
"HAVE_OPENSSL_AES",
"HAVE_OPENSSL_DSA",
"HAVE_OPENSSL_ECDSA",
@@ -208,6 +209,7 @@ my @substdefh = ("AES_CC",
"HAVE_OPENSSL_ED448",
"HAVE_OPENSSL_EVP_AES",
"HAVE_OPENSSL_GOST",
"HAVE_PKCS11",
"HAVE_PKCS11_ECDSA",
"HAVE_PKCS11_ED25519",
"HAVE_PKCS11_ED448",
@@ -1321,6 +1323,7 @@ if ($enable_native_pkcs11 eq "yes") {
}
}
$configdefd{"CRYPTO"} = "PKCS11CRYPTO";
$configdefh{"HAVE_PKCS11"} = 1;
if ($use_ecdsa eq "no") {
if ($verbose) {
print "no ECDSA support in native PKCS#11\n";
@@ -1514,6 +1517,7 @@ if ($use_openssl eq "yes") {
$configinc{"OPENSSL_INC"} = "$openssl_inc";
$configlib{"OPENSSL_LIB"} = "$openssl_lib";
$configdll{"OPENSSL_DLL"} = "$openssl_dll";
$configdefh{"HAVE_OPENSSL"} = 1;
if (-f File::Spec->catfile($openssl_inc, "openssl", "dsa.h")) {
$configdefh{"HAVE_OPENSSL_DSA"} = 1;
} elsif ($verbose) {
@@ -1955,7 +1959,11 @@ if ($cookie_algorithm eq "sha1") {
die "Unrecognized cookie algorithm: $cookie_algorithm\n";
}
print "Cryptographic library for DNSSEC: $cryptolib\n";
if ($cryptolib ne "") {
print "Cryptographic library for DNSSEC: $cryptolib\n";
} else {
die "No cryptography library has been found or provided."
}
# enable-openssl-hash
if ($enable_openssl_hash eq "yes") {