diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-03-26 11:07:31 -0400 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-03-26 11:07:31 -0400 |
commit | 8d85b9564284a66aa28a0cbb759090b777698e43 (patch) | |
tree | 150f2e89467805934f9a0915fe11896b8dfd510c /src/_cffi_src/openssl/hmac.py | |
parent | 9ef1d6fe96b897207739cd75ff283a0f061fd5a0 (diff) | |
download | cryptography-8d85b9564284a66aa28a0cbb759090b777698e43.tar.gz cryptography-8d85b9564284a66aa28a0cbb759090b777698e43.tar.bz2 cryptography-8d85b9564284a66aa28a0cbb759090b777698e43.zip |
Attempt to simplify the libressl checing (#3482)
* Attempt to simplify the libressl checing
* SHENANGINS
* Attempted fix
* More simplification
Diffstat (limited to 'src/_cffi_src/openssl/hmac.py')
-rw-r--r-- | src/_cffi_src/openssl/hmac.py | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |