OpenSSL: remove EVP_CIPHER_CTX_free() 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-2-logout@free.fr>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14988.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 7ee9a94fcbbde941bfed167229a64df0f7cdae0b)

diff --git a/configure.ac b/configure.ac
index 2e5c47fa473674ab6174443ac293d4ad4270d267..d372295ebd1322e9d958b32909d3cc19ec133fdd 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_free \
                        HMAC_CTX_new \
                        HMAC_CTX_free \
                        HMAC_CTX_reset \

diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h
index cd25bd378b5f2bc13b40c83babdaa777112d7da7..36f68b01ea6ad359fee723de6a83417ba1689096 100644 (file)
--- a/src/openvpn/openssl_compat.h
+++ b/src/openvpn/openssl_compat.h
@@ -88,19 +88,6 @@ EVP_MD_CTX_new(void)
 }
 #endif
 
-#if !defined(HAVE_EVP_CIPHER_CTX_FREE)
-/**
- * Free an existing cipher context
- *
- * @param ctx                 The cipher context
- */
-static inline void
-EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *c)
-{
-       free(c);
-}
-#endif
-
 #if !defined(HAVE_HMAC_CTX_RESET)
 /**
  * Reset a HMAC context