mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

Add OpenSSL 1.1.0+ defines for Windows build

Browse Source
This commit is contained in:
Ondřej Surý
2018-11-16 14:21:14 +01:00
parent 1276cf4cd1
commit 14fa99e3b4
2 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
config.h.win32
View File

@@ -349,6 +349,36 @@ typedef __int64 off_t;
/* Verbose query trace logging */ /* Verbose query trace logging */
@WANT_QUERYTRACE@ @WANT_QUERYTRACE@
/* Define to 1 if you have the `CRYPTO_zalloc' function. */
@HAVE_CRYPTO_ZALLOC@
/* Define to 1 if you have the `EVP_CIPHER_CTX_free' function. */
@HAVE_EVP_CIPHER_CTX_FREE@
/* Define to 1 if you have the `EVP_CIPHER_CTX_new' function. */
@HAVE_EVP_CIPHER_CTX_NEW@
/* Define to 1 if you have the `EVP_MD_CTX_free' function. */
@HAVE_EVP_MD_CTX_FREE@
/* Define to 1 if you have the `EVP_MD_CTX_new' function. */
@HAVE_EVP_MD_CTX_NEW@
/* Define to 1 if you have the `EVP_MD_CTX_reset' function. */
@HAVE_EVP_MD_CTX_RESET@
/* Define to 1 if you have the `HMAC_CTX_free' function. */
@HAVE_HMAC_CTX_FREE@
/* Define to 1 if you have the `HMAC_CTX_get_md' function. */
@HAVE_HMAC_CTX_GET_MD@
/* Define to 1 if you have the `HMAC_CTX_new' function. */
@HAVE_HMAC_CTX_NEW@
/* Define to 1 if you have the `HMAC_CTX_reset' function. */
@HAVE_HMAC_CTX_RESET@
/* /*
* Define to nothing if C supports flexible array members, and to 1 if it does * Define to nothing if C supports flexible array members, and to 1 if it does
* not. That way, with a declaration like `struct s { int n; double * not. That way, with a declaration like `struct s { int n; double

28
win32utils/Configure
View File

@@ -219,7 +219,18 @@ my @substdefh = ("AES_CC",
"WANT_QUERYTRACE", "WANT_QUERYTRACE",
"WITH_IDN", "WITH_IDN",
"CPU_RELAX", "CPU_RELAX",
"VALIDATION_DEFAULT"); "VALIDATION_DEFAULT",
"HAVE_CRYPTO_ZALLOC",
"HAVE_EVP_CIPHER_CTX_FREE",
"HAVE_EVP_CIPHER_CTX_NEW",
"HAVE_EVP_MD_CTX_FREE",
"HAVE_EVP_MD_CTX_NEW",
"HAVE_EVP_MD_CTX_RESET",
"HAVE_HMAC_CTX_FREE",
"HAVE_HMAC_CTX_GET_MD",
"HAVE_HMAC_CTX_NEW",
"HAVE_HMAC_CTX_RESET",
);
# for platform.h # for platform.h
@@ -1466,10 +1477,10 @@ EOF
} }
} }
# check OpenSSL built-in support for DH/DSA/ECDSA/RSA functions # check OpenSSL built-in support for DH/ECDSA/RSA/CRYPTO_ZALLOC/EVP_CIPHER_CTX/EVP_MD_CTX/HMAC_CTX functions
if ($use_openssl eq "yes") { if ($use_openssl eq "yes") {
if ($verbose) { if ($verbose) {
printf "checking OpenSSL built-in support for DH/DSA/ECDSA/RSA functions\n"; printf "checking OpenSSL built-in support for DH/ECDSA/RSA/CRYPTO_ZALLOC/EVP_CIPHER_CTX/EVP_MD_CTX/HMAC_CTX functions\n";
} }
open F, ">testosslfunc.c" || die $!; open F, ">testosslfunc.c" || die $!;
print F << 'EOF'; print F << 'EOF';
@@ -1482,7 +1493,7 @@ int main() {
} }
printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n", printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n",
OPENSSL_VERSION_NUMBER); OPENSSL_VERSION_NUMBER);
printf("This version has no built-in support for DH/ECDSA/RSA functions.\n\n"); printf("This version has no built-in support for DH/ECDSA/RSA/CRYPTO_ZALLOC/EVP_CIPHER_CTX/EVP_MD_CTX/HMAC_CTX functions.\n\n");
return (1); return (1);
} }
EOF EOF
@@ -1496,6 +1507,15 @@ EOF
$configdefh{"HAVE_DH_GET0_KEY"} = 1; $configdefh{"HAVE_DH_GET0_KEY"} = 1;
$configdefh{"HAVE_ECDSA_SIG_GET0"} = 1; $configdefh{"HAVE_ECDSA_SIG_GET0"} = 1;
$configdefh{"HAVE_RSA_SET0_KEY"} = 1; $configdefh{"HAVE_RSA_SET0_KEY"} = 1;
$configdefh{"HAVE_EVP_CIPHER_CTX_FREE"} = 1;
$configdefh{"HAVE_EVP_CIPHER_CTX_NEW"} = 1;
$configdefh{"HAVE_EVP_MD_CTX_FREE"} = 1;
$configdefh{"HAVE_EVP_MD_CTX_NEW"} = 1;
$configdefh{"HAVE_EVP_MD_CTX_RESET"} = 1;
$configdefh{"HAVE_HMAC_CTX_FREE"} = 1;
$configdefh{"HAVE_HMAC_CTX_GET_MD"} = 1;
$configdefh{"HAVE_HMAC_CTX_NEW"} = 1;
$configdefh{"HAVE_HMAC_CTX_RESET"} = 1;
} }
} }
} }