1. openvpn
  2. Commit ebb5c70bf6acede8d941687ae0e40d827003fb2e
Browse code

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)

Emmanuel Deloget authored on 2017/06/29 23:21:19
Showing 2 changed files
configure.ac
History View file @ ebb5c70
... ... 
@@ -899,7 +899,6 @@ if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then
899 899
900 900 
 	AC_CHECK_FUNCS(
901 901 
 		[ \
902 
-			EVP_CIPHER_CTX_free \
903 902 
 			HMAC_CTX_new \
904 903 
 			HMAC_CTX_free \
905 904 
 			HMAC_CTX_reset \
src/openvpn/openssl_compat.h
History View file @ ebb5c70
... ... 
@@ -88,19 +88,6 @@ EVP_MD_CTX_new(void)
88 88 
 }
89 89 
 #endif
90 90
91 
-#if !defined(HAVE_EVP_CIPHER_CTX_FREE)
92 
-/**
93 
- * Free an existing cipher context
94 
- *
95 
- * @param ctx                 The cipher context
96 
- */
97 
-static inline void
98 
-EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *c)
99 
-{
100 
-	free(c);
101 
-}
102 
-#endif
103 
-
104 91 
 #if !defined(HAVE_HMAC_CTX_RESET)
105 92 
 /**
106 93 
  * Reset a HMAC context