diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-08-20 11:50:57 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-08-20 08:50:57 -0700 |
| commit | 22bedaafa70283e3efd735b3fba667172a25310f (patch) | |
| tree | ad7b956c0fcd8696a652ffc9f7a837b65ed3faa9 | |
| parent | c3de566e053b06c6055a7b3032fae56a3e64b3b7 (diff) | |
| download | cryptography-22bedaafa70283e3efd735b3fba667172a25310f.tar.gz cryptography-22bedaafa70283e3efd735b3fba667172a25310f.tar.bz2 cryptography-22bedaafa70283e3efd735b3fba667172a25310f.zip | |
Remove branches for 1.0.2 betas. (#3870)
There's no sense in which we actually support them
| -rw-r--r-- | src/_cffi_src/openssl/cryptography.py | 6 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509.py | 4 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509_vfy.py | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py index 1cacc8f5..9095e3ab 100644 --- a/src/_cffi_src/openssl/cryptography.py +++ b/src/_cffi_src/openssl/cryptography.py @@ -25,8 +25,8 @@ INCLUDES = """ #include <windows.h> #endif -#define CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER \ - (OPENSSL_VERSION_NUMBER >= 0x10002002 && !CRYPTOGRAPHY_IS_LIBRESSL) +#define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \ + (OPENSSL_VERSION_NUMBER >= 0x10002000 && !CRYPTOGRAPHY_IS_LIBRESSL) #define CRYPTOGRAPHY_OPENSSL_102L_OR_GREATER \ (OPENSSL_VERSION_NUMBER >= 0x100020cf && !CRYPTOGRAPHY_IS_LIBRESSL) #define CRYPTOGRAPHY_OPENSSL_110_OR_GREATER \ @@ -36,8 +36,6 @@ INCLUDES = """ #define CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 \ (OPENSSL_VERSION_NUMBER < 0x10002000 || CRYPTOGRAPHY_IS_LIBRESSL) -#define CRYPTOGRAPHY_OPENSSL_LESS_THAN_102BETA3 \ - (OPENSSL_VERSION_NUMBER < 0x10002003 || CRYPTOGRAPHY_IS_LIBRESSL) #define CRYPTOGRAPHY_OPENSSL_LESS_THAN_102I \ (OPENSSL_VERSION_NUMBER < 0x1000209f || CRYPTOGRAPHY_IS_LIBRESSL) #define CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 \ diff --git a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py index 2ae574a3..e7619dd6 100644 --- a/src/_cffi_src/openssl/x509.py +++ b/src/_cffi_src/openssl/x509.py @@ -356,9 +356,9 @@ int X509_get_signature_nid(const X509 *x) #endif -/* Added in 1.0.2beta3 but we need it in all versions now due to the great +/* Added in 1.0.2 but we need it in all versions now due to the great opaquing. */ -#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102BETA3 +#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 /* from x509/x_x509.c */ int i2d_re_X509_tbs(X509 *x, unsigned char **pp) { diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py index 7a5e3dd6..58069eb1 100644 --- a/src/_cffi_src/openssl/x509_vfy.py +++ b/src/_cffi_src/openssl/x509_vfy.py @@ -214,8 +214,8 @@ void X509_STORE_set_get_issuer(X509_STORE *, X509_STORE_CTX_get_issuer_fn); """ CUSTOMIZATIONS = """ -/* OpenSSL 1.0.2beta2+ verification parameters and error codes */ -#if CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER +/* OpenSSL 1.0.2+ verification parameters and error codes */ +#if CRYPTOGRAPHY_OPENSSL_102_OR_GREATER static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 1; static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1; #else |