Add OpenSSL 1.1.0+ defines for Windows build

diff --git a/config.h.win32 b/config.h.win32
index ec25b14ebad8ca2bd73d2325b166deb2bf9cf993..7fe8e3fc4001d967feeab0591cb3eae2f5887fa2 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -349,6 +349,36 @@ typedef __int64 off_t;
 /* Verbose query trace logging */
 @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
  * not. That way, with a declaration like `struct s { int n; double

diff --git a/win32utils/Configure b/win32utils/Configure
index 76fa0351872e6ec37ce5be27a7e19cad5988050f..40cddb97087912da7159035d27b1e8af2b129e6f 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -219,7 +219,18 @@ my @substdefh = ("AES_CC",
                  "WANT_QUERYTRACE",
                  "WITH_IDN",
                 "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
 
@@ -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 ($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 $!;
     print F << 'EOF';
@@ -1482,7 +1493,7 @@ int main() {
         }
         printf("\n\nFound   OPENSSL_VERSION_NUMBER %#010x\n",
                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);
 }
 EOF
@@ -1496,6 +1507,15 @@ EOF
             $configdefh{"HAVE_DH_GET0_KEY"} = 1;
             $configdefh{"HAVE_ECDSA_SIG_GET0"} = 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;
         }
     }
 }