From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Wed, 8 Feb 2023 16:31:40 +0000 (+0100)
Subject: OpenSSL 3.0: Stay compatible with OpenSSL 1.0 to Fix CentOS7 builds
X-Git-Tag: dnsdist-1.8.0-rc1~39^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F12524%2Fhead;p=thirdparty%2Fpdns.git

OpenSSL 3.0: Stay compatible with OpenSSL 1.0 to Fix CentOS7 builds
---

diff --git a/pdns/opensslsigners.cc b/pdns/opensslsigners.cc
index 1d3952980e..acd69e728d 100644
--- a/pdns/opensslsigners.cc
+++ b/pdns/opensslsigners.cc
@@ -287,7 +287,6 @@ private:
   using MessageDigest = std::unique_ptr<EVP_MD, decltype(&EVP_MD_free)>;
 #else
   using Key = std::unique_ptr<RSA, decltype(&RSA_free)>;
-  using MessageDigest = std::unique_ptr<EVP_MD, decltype(&EVP_MD_meth_free)>;
 #endif
 
   Key d_key;
@@ -1058,12 +1057,12 @@ private:
 
 #if OPENSSL_VERSION_MAJOR >= 3
   using Key = std::unique_ptr<EVP_PKEY, decltype(&EVP_PKEY_free)>;
+  using MessageDigestContext = std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)>;
 #else
   using Key = std::unique_ptr<EC_KEY, decltype(&EC_KEY_free)>;
 #endif
 
   using KeyContext = std::unique_ptr<EVP_PKEY_CTX, decltype(&EVP_PKEY_CTX_free)>;
-  using MessageDigestContext = std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)>;
   using Group = std::unique_ptr<EC_GROUP, decltype(&EC_GROUP_free)>;
   using Point = std::unique_ptr<EC_POINT, decltype(&EC_POINT_free)>;
   using Signature = std::unique_ptr<ECDSA_SIG, decltype(&ECDSA_SIG_free)>;