References: <20170629142119.29502-1-logout@...260...>
	<20170629142119.29502-2-logout@...260...>
From: Steffan Karger <steffan@...1856...>
Message-ID: <76fb2205-ceed-063e-f751-40fa8056f0b3@...1856...>
Date: Thu, 29 Jun 2017 19:34:51 +0200
MIME-Version: 1.0
In-Reply-To: <20170629142119.29502-2-logout@...260...>
Content-Language: en-US
Subject: Re: [Openvpn-devel] [PATCH 2/2] OpenSSL: remove
 EVP_CIPHER_CTX_free() from the compat layer
List-Id: <openvpn-devel.lists.sourceforge.net>
List-Unsubscribe: <https://lists.sourceforge.net/lists/options/openvpn-devel>, 
	<mailto:openvpn-devel-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=openvpn-devel>
List-Post: <mailto:openvpn-devel@lists.sourceforge.net>
List-Help: <mailto:openvpn-devel-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/openvpn-devel>, 
	<mailto:openvpn-devel-request@lists.sourceforge.net?subject=subscribe>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
To: openvpn-devel@lists.sourceforge.net

Hi,

On 29-06-17 16:21, Emmanuel Deloget wrote:
> For unknown reason, the write 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@...260...>
> ---
>  configure.ac                 |  1 -
>  src/openvpn/openssl_compat.h | 13 -------------
>  2 files changed, 14 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index cb121795..60bb4658 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -919,7 +919,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 cd25bd37..36f68b01 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
> 

For some reason, the reviewer seemed to think this author was right
about that.  He should crearly have looked a bit better...

ACK

-Steffan