diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-06-18 22:09:11 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-18 21:09:11 -0500 |
| commit | ada6993060174a27f0dace238c55af039cb85012 (patch) | |
| tree | 92df4e0bbc2aeea2881b322d91004fbd558e8f96 /src | |
| parent | f3779755b0e4ed2a16c8a875d08ab7eefe771a27 (diff) | |
| download | cryptography-ada6993060174a27f0dace238c55af039cb85012.tar.gz cryptography-ada6993060174a27f0dace238c55af039cb85012.tar.bz2 cryptography-ada6993060174a27f0dace238c55af039cb85012.zip | |
Remove a few more 0.9.8 bindings (#2994)
Diffstat (limited to 'src')
| -rw-r--r-- | src/_cffi_src/openssl/rsa.py | 9 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509.py | 4 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509v3.py | 5 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 3 |
4 files changed, 2 insertions, 19 deletions
diff --git a/src/_cffi_src/openssl/rsa.py b/src/_cffi_src/openssl/rsa.py index c053d44c..6b3365de 100644 --- a/src/_cffi_src/openssl/rsa.py +++ b/src/_cffi_src/openssl/rsa.py @@ -79,15 +79,8 @@ int EVP_PKEY_CTX_set_rsa_oaep_md(EVP_PKEY_CTX *, EVP_MD *); """ CUSTOMIZATIONS = """ -#if OPENSSL_VERSION_NUMBER >= 0x10000000 static const long Cryptography_HAS_PSS_PADDING = 1; -#else -/* see evp.py for the definition of Cryptography_HAS_PKEY_CTX */ -static const long Cryptography_HAS_PSS_PADDING = 0; -int (*EVP_PKEY_CTX_set_rsa_padding)(EVP_PKEY_CTX *, int) = NULL; -int (*EVP_PKEY_CTX_set_rsa_pss_saltlen)(EVP_PKEY_CTX *, int) = NULL; -static const long RSA_PKCS1_PSS_PADDING = 0; -#endif + #if OPENSSL_VERSION_NUMBER >= 0x1000100f static const long Cryptography_HAS_MGF1_MD = 1; #else diff --git a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py index 05c7ec0e..5b4d79d6 100644 --- a/src/_cffi_src/openssl/x509.py +++ b/src/_cffi_src/openssl/x509.py @@ -402,10 +402,6 @@ int i2d_re_X509_tbs(X509 *x, unsigned char **pp) } #endif -/* OpenSSL 0.9.8e does not have this definition. */ -#if OPENSSL_VERSION_NUMBER <= 0x0090805fL -typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS; -#endif #ifdef OPENSSL_NO_EC int (*i2d_EC_PUBKEY)(EC_KEY *, unsigned char **) = NULL; EC_KEY *(*d2i_EC_PUBKEY)(EC_KEY **, const unsigned char **, long) = NULL; diff --git a/src/_cffi_src/openssl/x509v3.py b/src/_cffi_src/openssl/x509v3.py index b4276bb2..89becc0b 100644 --- a/src/_cffi_src/openssl/x509v3.py +++ b/src/_cffi_src/openssl/x509v3.py @@ -14,11 +14,8 @@ INCLUDES = """ * together with another opaque typedef for the same name in the TYPES section. * Note that the result is an opaque type. */ -#if OPENSSL_VERSION_NUMBER >= 0x10000000 typedef LHASH_OF(CONF_VALUE) Cryptography_LHASH_OF_CONF_VALUE; -#else -typedef LHASH Cryptography_LHASH_OF_CONF_VALUE; -#endif + typedef STACK_OF(ACCESS_DESCRIPTION) Cryptography_STACK_OF_ACCESS_DESCRIPTION; typedef STACK_OF(DIST_POINT) Cryptography_STACK_OF_DIST_POINT; typedef STACK_OF(POLICYQUALINFO) Cryptography_STACK_OF_POLICYQUALINFO; diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 6ba073d0..6188aa08 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -197,9 +197,6 @@ CONDITIONAL_NAMES = { "RAND_egd_bytes", "RAND_query_egd_bytes", ], - "Cryptography_HAS_PSS_PADDING": [ - "RSA_PKCS1_PSS_PADDING", - ], "Cryptography_HAS_MGF1_MD": [ "EVP_PKEY_CTX_set_rsa_mgf1_md", ], |