From 8d85b9564284a66aa28a0cbb759090b777698e43 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 26 Mar 2017 11:07:31 -0400 Subject: Attempt to simplify the libressl checing (#3482) * Attempt to simplify the libressl checing * SHENANGINS * Attempted fix * More simplification --- src/_cffi_src/openssl/hmac.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/_cffi_src/openssl/hmac.py') diff --git a/src/_cffi_src/openssl/hmac.py b/src/_cffi_src/openssl/hmac.py index daedd328..f15f4dd3 100644 --- a/src/_cffi_src/openssl/hmac.py +++ b/src/_cffi_src/openssl/hmac.py @@ -27,7 +27,7 @@ MACROS = """ CUSTOMIZATIONS = """ HMAC_CTX *Cryptography_HMAC_CTX_new(void) { -#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER && !defined(LIBRESSL_VERSION_NUMBER) +#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER return HMAC_CTX_new(); #else /* This uses OPENSSL_zalloc in 1.1.0, which is malloc + memset */ @@ -39,7 +39,7 @@ HMAC_CTX *Cryptography_HMAC_CTX_new(void) { void Cryptography_HMAC_CTX_free(HMAC_CTX *ctx) { -#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER && !defined(LIBRESSL_VERSION_NUMBER) +#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER return HMAC_CTX_free(ctx); #else if (ctx != NULL) { -- cgit v1.2.3