Hi,
On Tue, Jun 19, 2018 at 09:46:50PM -0700, Rosen Penev wrote:
> Signed-off-by: Rosen Penev <ros...@gmail.com>
> ---
> src/openvpn/crypto_openssl.c | 9 +++++++++
> src/openvpn/ssl_openssl.c | 32 +++++++++++++++++++++++++++++++-
> src/openvpn/ssl_verify_openssl.c | 1 +
> 3 files changed, 41 insertions(+), 1 deletion(-)
>
> diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c
> index 4fb2f6d6..816d8002 100644
> --- a/src/openvpn/crypto_openssl.c
> +++ b/src/openvpn/crypto_openssl.c
> @@ -670,11 +670,16 @@ cipher_ctx_init(EVP_CIPHER_CTX *ctx, const uint8_t
> *key, int key_len,
> {
> ASSERT(NULL != kt && NULL != ctx);
>
> +#if OPENSSL_VERSION_NUMBER < 0x10100000L
> EVP_CIPHER_CTX_init(ctx);
> +#else
> + EVP_CIPHER_CTX_new();
> +#endif
Thanks for the patch, but this is not the way we want our source to
look like. As in: these extra #if will make maintaining the code
harder and more error-prone.
A patch along the lines of the existing openssl 1.1 / 1.0 compat layer
(the .c files call the 1.1 API and if that API is not available,
openssl_compat.h provides a substitute function) would be something
we might look more closely into.
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
signature.asc
Description: PGP signature
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
