aboutsummaryrefslogtreecommitdiffstats
path: root/src/_cffi_src/openssl/cryptography.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2018-05-30 22:31:47 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2018-05-31 10:31:47 +0800
commit8a64f1f2fbea73f0b7a4725768dc9597d240c661 (patch)
tree38379a1da072116328118a7e8ba266050ad34c4d /src/_cffi_src/openssl/cryptography.py
parent015483830765fbdd01ce393bd1f02c9f72344a03 (diff)
downloadcryptography-8a64f1f2fbea73f0b7a4725768dc9597d240c661.tar.gz
cryptography-8a64f1f2fbea73f0b7a4725768dc9597d240c661.tar.bz2
cryptography-8a64f1f2fbea73f0b7a4725768dc9597d240c661.zip
Removes branches in bindings for various OpenSSL 1.1.0 prereleases (#4269)
* Remove defines for openssl 1.1.0 pre * Update bio.py * Update dh.py * Update dsa.py * Update rsa.py * Update x509_vfy.py * Compress branches
Diffstat (limited to 'src/_cffi_src/openssl/cryptography.py')
-rw-r--r--src/_cffi_src/openssl/cryptography.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py
index 4f9378d3..137e2f9e 100644
--- a/src/_cffi_src/openssl/cryptography.py
+++ b/src/_cffi_src/openssl/cryptography.py
@@ -43,12 +43,6 @@ INCLUDES = """
(OPENSSL_VERSION_NUMBER < 0x1000209f || CRYPTOGRAPHY_IS_LIBRESSL)
#define CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 \
(OPENSSL_VERSION_NUMBER < 0x10100000 || CRYPTOGRAPHY_IS_LIBRESSL)
-#define CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE4 \
- (OPENSSL_VERSION_NUMBER < 0x10100004 || CRYPTOGRAPHY_IS_LIBRESSL)
-#define CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE5 \
- (OPENSSL_VERSION_NUMBER < 0x10100005 || CRYPTOGRAPHY_IS_LIBRESSL)
-#define CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE6 \
- (OPENSSL_VERSION_NUMBER < 0x10100006 || CRYPTOGRAPHY_IS_LIBRESSL)
"""
TYPES = """