diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-18 14:04:05 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-06-18 15:04:05 -0400 |
| commit | b67947cb41ac38c10efbb236cffcb515d9d44811 (patch) | |
| tree | 81e5901b9130c13ac4e0bce842f98432744861d2 | |
| parent | 40c6bf654c71fa72dc62fadf5a013bc3e6fb391c (diff) | |
| download | cryptography-b67947cb41ac38c10efbb236cffcb515d9d44811.tar.gz cryptography-b67947cb41ac38c10efbb236cffcb515d9d44811.tar.bz2 cryptography-b67947cb41ac38c10efbb236cffcb515d9d44811.zip | |
remove 0.9.8 support from nid bindings (#2988)
| -rw-r--r-- | src/_cffi_src/openssl/nid.py | 12 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 6 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/_cffi_src/openssl/nid.py b/src/_cffi_src/openssl/nid.py index 94f21c67..b404addf 100644 --- a/src/_cffi_src/openssl/nid.py +++ b/src/_cffi_src/openssl/nid.py @@ -9,8 +9,6 @@ INCLUDES = """ """ TYPES = """ -static const int Cryptography_HAS_ECDSA_SHA2_NIDS; - static const int NID_undef; static const int NID_dsa; static const int NID_dsaWithSHA; @@ -226,14 +224,4 @@ MACROS = """ """ CUSTOMIZATIONS = """ -/* OpenSSL 0.9.8g+ */ -#if OPENSSL_VERSION_NUMBER >= 0x0090807fL -static const long Cryptography_HAS_ECDSA_SHA2_NIDS = 1; -#else -static const long Cryptography_HAS_ECDSA_SHA2_NIDS = 0; -static const int NID_ecdsa_with_SHA224 = 0; -static const int NID_ecdsa_with_SHA256 = 0; -static const int NID_ecdsa_with_SHA384 = 0; -static const int NID_ecdsa_with_SHA512 = 0; -#endif """ diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 1e8f99cd..bec9c0a2 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -211,12 +211,6 @@ CONDITIONAL_NAMES = { "EVP_CTRL_GCM_SET_TAG", "EVP_CTRL_GCM_SET_IVLEN", ], - "Cryptography_HAS_ECDSA_SHA2_NIDS": [ - "NID_ecdsa_with_SHA224", - "NID_ecdsa_with_SHA256", - "NID_ecdsa_with_SHA384", - "NID_ecdsa_with_SHA512", - ], "Cryptography_HAS_EGD": [ "RAND_egd", "RAND_egd_bytes", |