OpenSSL: remove EVP_CIPHER_CTX_new() from the compat layer

For unknown reason, the writer of the compat layer seemed to think that
this function was only present in OpenSSL 1.1. This is not the case at
all, since it has been introduced in OpenSSL before version 0.9.8.

Thus, there is no need to add this function to the compat layer, and it
can be safely removed.

Signed-off-by: Emmanuel Deloget <logout@free.fr>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <20170629142119.29502-1-logout@free.fr>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14989.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit a72d21a56a0223b8a50d05d88af64abcda0fc5dc)

diff --git a/configure.ac b/configure.ac
index f2ee5b9ec6e9d4671392aa0294215ea7743e62e5..2e5c47fa473674ab6174443ac293d4ad4270d267 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -899,7 +899,6 @@ if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then
 
        AC_CHECK_FUNCS(
                [ \
-                       EVP_CIPHER_CTX_new \
                        EVP_CIPHER_CTX_free \
                        HMAC_CTX_new \
                        HMAC_CTX_free \

diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h
index 617410e02eb534c6922e472c54659e748359ff7f..cd25bd378b5f2bc13b40c83babdaa777112d7da7 100644 (file)
--- a/src/openvpn/openssl_compat.h
+++ b/src/openvpn/openssl_compat.h
@@ -101,21 +101,6 @@ EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *c)
 }
 #endif
 
-#if !defined(HAVE_EVP_CIPHER_CTX_NEW)
-/**
- * Allocate a new cipher context object
- *
- * @return                    A zero'ed cipher context object
- */
-static inline EVP_CIPHER_CTX *
-EVP_CIPHER_CTX_new(void)
-{
-    EVP_CIPHER_CTX *ctx = NULL;
-    ALLOC_OBJ_CLEAR(ctx, EVP_CIPHER_CTX);
-    return ctx;
-}
-#endif
-
 #if !defined(HAVE_HMAC_CTX_RESET)
 /**
  * Reset a HMAC context