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 d8e9fc2250396bba4bda939ecbc2bdb7136a5515..9a428ea3665d6882f2fdef5aae7c9cf17be65c90 100644 (file)
--- 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 6088e05b46e6b9a192907212654df825fa837a43..5c9dbdc7eceb1bf53e3ab891d5e5379b9140665e 100644 (file)
--- 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);