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/x509.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/_cffi_src/openssl/x509.py') diff --git a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py index bb981060..98b5b8e2 100644 --- a/src/_cffi_src/openssl/x509.py +++ b/src/_cffi_src/openssl/x509.py @@ -341,7 +341,7 @@ void X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **, CUSTOMIZATIONS = """ /* Added in 1.0.2 beta but we need it in all versions now due to the great opaquing. */ -#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 || defined(LIBRESSL_VERSION_NUMBER) +#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 /* from x509/x_x509.c version 1.0.2 */ void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, const X509 *x) @@ -361,7 +361,7 @@ int X509_get_signature_nid(const X509 *x) /* Added in 1.0.2beta3 but we need it in all versions now due to the great opaquing. */ -#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102BETA3 || defined(LIBRESSL_VERSION_NUMBER) +#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102BETA3 /* from x509/x_x509.c */ int i2d_re_X509_tbs(X509 *x, unsigned char **pp) { @@ -383,7 +383,7 @@ X509_REVOKED *Cryptography_X509_REVOKED_dup(X509_REVOKED *rev) { /* Added in 1.1.0 but we need it in all versions now due to the great opaquing. */ -#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 || defined(LIBRESSL_VERSION_NUMBER) +#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *x) { -- cgit v1.2.3