From: Philipp Gesang <philipp.gesang@intra2net.com>
Date: Tue, 27 Nov 2018 15:14:20 +0000 (+0100)
Subject: make crypto code compile with openssl 1.1.x
X-Git-Tag: v2.11~3
X-Git-Url: http://developer.intra2net.com/git/?p=libi2ncommon;a=commitdiff_plain;h=e613cd718ebc029df11f4b43b55e65c95451a04a

make crypto code compile with openssl 1.1.x

From EVP_DigestInit(3):

       EVP_MD_CTX_create() and EVP_MD_CTX_destroy() were renamed
       to EVP_MD_CTX_new() and EVP_MD_CTX_free() in OpenSSL 1.1.
---

diff --git a/src/crypto.cpp b/src/crypto.cpp
index c7ad98b..d08f5d6 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -91,7 +91,11 @@ string I2n::hash_data_raw(string data, algorithm algo)
 
     const EVP_MD *md;
 
+#   if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     EVP_MD_CTX_Ptr ctx(EVP_MD_CTX_create(), EVP_MD_CTX_destroy);
+#   else
+    EVP_MD_CTX_Ptr ctx(EVP_MD_CTX_new(), EVP_MD_CTX_free);
+#   endif
 
     uchar_arr ret(new unsigned char[EVP_MAX_MD_SIZE]);
 
@@ -113,7 +117,11 @@ string I2n::hash_file(string filename, algorithm algo)
 {
     const EVP_MD *md;
 
+#   if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     EVP_MD_CTX_Ptr ctx(EVP_MD_CTX_create(), EVP_MD_CTX_destroy);
+#   else
+    EVP_MD_CTX_Ptr ctx(EVP_MD_CTX_new(), EVP_MD_CTX_free);
+#   endif
 
     uchar_arr ret(new unsigned char[EVP_MAX_MD_SIZE]);