From: Emmanuel Deloget Date: Thu, 29 Jun 2017 14:21:19 +0000 (+0200) Subject: OpenSSL: remove EVP_CIPHER_CTX_free() from the compat layer X-Git-Tag: v2.4.4~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebb5c70bf6acede8d941687ae0e40d827003fb2e;p=thirdparty%2Fopenvpn.git 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 Acked-by: Steffan Karger 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 (cherry picked from commit 7ee9a94fcbbde941bfed167229a64df0f7cdae0b) --- diff --git a/configure.ac b/configure.ac index 2e5c47fa4..d372295eb 100644 --- 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 cd25bd378..36f68b01e 100644 --- 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