commit 0a7bebfaf710d3691cec311d13be7725af4b93cc
author Alex Gaynor <alex.gaynor@gmail.com> Sat Sep 15 00:23:01 2018 -0400
committer Paul Kehrer <paul.l.kehrer@gmail.com> Sat Sep 15 00:23:01 2018 -0400
tree a45e62680cee04fd76b94caaa4f515feb6206325
parent 9aefda919b1c135a8220ca76339e586e58b3e10e

Remove conditionals for OpenSSL 1.1.1 pre-releases (#4467)

src/_cffi_src/openssl/cryptography.py

diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py
index 3ebe3c5..1149988 100644
--- a/src/_cffi_src/openssl/cryptography.py
+++ b/src/_cffi_src/openssl/cryptography.py
@@ -44,9 +44,6 @@
     (OPENSSL_VERSION_NUMBER >= 0x10100000 && !CRYPTOGRAPHY_IS_LIBRESSL)
 #define CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER \
     (OPENSSL_VERSION_NUMBER >= 0x1010006f && !CRYPTOGRAPHY_IS_LIBRESSL)
-#define CRYPTOGRAPHY_OPENSSL_BETWEEN_111_and_111PRE9 \
-    (OPENSSL_VERSION_NUMBER >= 0x10101000 && \
-     OPENSSL_VERSION_NUMBER <= 0x10101009)
 
 #define CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 \
     (OPENSSL_VERSION_NUMBER < 0x10002000 || CRYPTOGRAPHY_IS_LIBRESSL)

src/_cffi_src/openssl/ocsp.py

diff --git a/src/_cffi_src/openssl/ocsp.py b/src/_cffi_src/openssl/ocsp.py
index a466458..1f535a7 100644
--- a/src/_cffi_src/openssl/ocsp.py
+++ b/src/_cffi_src/openssl/ocsp.py
@@ -82,10 +82,9 @@
 #if ( \
     CRYPTOGRAPHY_OPENSSL_110_OR_GREATER && \
     CRYPTOGRAPHY_OPENSSL_LESS_THAN_110J \
-    ) || CRYPTOGRAPHY_OPENSSL_BETWEEN_111_and_111PRE9
+    )
 /* These structs come from ocsp_lcl.h and are needed to de-opaque the struct
-   for the getters in OpenSSL 1.1.0 through 1.1.0i, as well as 1.1.1-pre1 to
-   1.1.1-pre9 */
+   for the getters in OpenSSL 1.1.0 through 1.1.0i */
 struct ocsp_responder_id_st {
     int type;
     union {
@@ -147,8 +146,7 @@
 }
 #endif
 
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110J || \
-    CRYPTOGRAPHY_OPENSSL_BETWEEN_111_and_111PRE9
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110J
 const X509_ALGOR *OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs)
 {
 #if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110