From: Rainer Jung <rjung@apache.org>
Date: Sun, 7 Feb 2016 21:10:16 +0000 (+0000)
Subject: EVP_MD_CTX_new() and EVP_MD_CTX_free()
X-Git-Tag: 2.5.0-alpha~2173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49e969e57b5df1eb54628a51feaa17a6413cea49;p=thirdparty%2Fapache%2Fhttpd.git

EVP_MD_CTX_new() and EVP_MD_CTX_free()
Only exist in OpenSSL 1.1.0. They were
renamed from EVP_MD_CTX_create() and
EVP_MD_CTX_destroy().

Followup to r1728979.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729037 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_ct_sct.c b/modules/ssl/ssl_ct_sct.c
index e9e3ba307c9..6870d6600b7 100644
--- a/modules/ssl/ssl_ct_sct.c
+++ b/modules/ssl/ssl_ct_sct.c
@@ -32,12 +32,20 @@ static apr_status_t verify_signature(sct_fields_t *sctf,
         return APR_EINVAL;
     }
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    ctx = EVP_MD_CTX_create();
+#else
     ctx = EVP_MD_CTX_new();
+#endif
     ap_assert(1 == EVP_VerifyInit(ctx, EVP_sha256()));
     ap_assert(1 == EVP_VerifyUpdate(ctx, sctf->signed_data,
                                     sctf->signed_data_len));
     rc = EVP_VerifyFinal(ctx, sctf->sig, sctf->siglen, pkey);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    EVP_MD_CTX_destroy(ctx);
+#else
     EVP_MD_CTX_free(ctx);
+#endif
 
     return rc == 1 ? APR_SUCCESS : APR_EINVAL;
 }