From: Emmanuel Deloget Date: Thu, 29 Jun 2017 14:21:18 +0000 (+0200) Subject: OpenSSL: remove EVP_CIPHER_CTX_new() from the compat layer X-Git-Tag: v2.4.4~59 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f9575852bc981e75884d1a75b2e7c1f9af091f4;p=thirdparty%2Fopenvpn.git 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 Acked-by: Steffan Karger 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 (cherry picked from commit a72d21a56a0223b8a50d05d88af64abcda0fc5dc) --- diff --git a/configure.ac b/configure.ac index f2ee5b9ec..2e5c47fa4 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_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 617410e02..cd25bd378 100644 --- 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