From: Mark Andrews <marka@isc.org>
Date: Thu, 25 Oct 2018 23:01:14 +0000 (+1100)
Subject: EVP_CIPHER_CTX_new and EVP_CIPHER_CTX_free exist in OpenSSL 1.0.1
X-Git-Tag: v9.13.4~87^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=632a0ae10bb8893a237f54351f19bf9667cec7ad;p=thirdparty%2Fbind9.git

EVP_CIPHER_CTX_new and EVP_CIPHER_CTX_free exist in OpenSSL 1.0.1
---

diff --git a/lib/isc/openssl_shim.c b/lib/isc/openssl_shim.c
index d8e9fc22503..9a428ea3665 100644
--- a/lib/isc/openssl_shim.c
+++ b/lib/isc/openssl_shim.c
@@ -32,6 +32,7 @@ OPENSSL_zalloc(size_t size)
 	return (ret);
 }
 
+#if OPENSSL_VERSION_NUMBER < 0x10001000L || defined(LIBRESSL_VERSION_NUMBER)
 EVP_CIPHER_CTX *
 EVP_CIPHER_CTX_new(void)
 {
@@ -47,6 +48,7 @@ EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
 		OPENSSL_free(ctx);
 	}
 }
+#endif
 
 EVP_MD_CTX *
 EVP_MD_CTX_new(void)
diff --git a/lib/isc/openssl_shim.h b/lib/isc/openssl_shim.h
index 6088e05b46e..5c9dbdc7ece 100644
--- a/lib/isc/openssl_shim.h
+++ b/lib/isc/openssl_shim.h
@@ -21,8 +21,10 @@
 #include <openssl/hmac.h>
 
 void *OPENSSL_zalloc(size_t size);
+#if OPENSSL_VERSION_NUMBER < 0x10001000L || defined(LIBRESSL_VERSION_NUMBER)
 EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
 void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx);
+#endif
 EVP_MD_CTX *EVP_MD_CTX_new(void);
 void EVP_MD_CTX_free(EVP_MD_CTX *ctx);
 int EVP_MD_CTX_reset(EVP_MD_CTX *ctx);