diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 13:24:52 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 13:24:52 -0500 |
| commit | f9d2b97ad1f9e7ea8098d8bd3db31730501eab0b (patch) | |
| tree | 07df039e6056106a4ce0b849911b9ecf7ba97710 /src | |
| parent | a1c27d0e564347c73cf678a3a09615692be67346 (diff) | |
| parent | a4f12da2afc3898b958d874e84b747048f983ff0 (diff) | |
| download | cryptography-f9d2b97ad1f9e7ea8098d8bd3db31730501eab0b.tar.gz cryptography-f9d2b97ad1f9e7ea8098d8bd3db31730501eab0b.tar.bz2 cryptography-f9d2b97ad1f9e7ea8098d8bd3db31730501eab0b.zip | |
Merge pull request #2788 from reaperhulk/110-patch-9
ECDSA functions we don't use that aren't in 1.1.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/_cffi_src/openssl/ecdsa.py | 16 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 7 |
2 files changed, 0 insertions, 23 deletions
diff --git a/src/_cffi_src/openssl/ecdsa.py b/src/_cffi_src/openssl/ecdsa.py index f231864b..7cbe5215 100644 --- a/src/_cffi_src/openssl/ecdsa.py +++ b/src/_cffi_src/openssl/ecdsa.py @@ -44,14 +44,6 @@ int ECDSA_verify(int, const unsigned char *, int, const unsigned char *, int, EC_KEY *); int ECDSA_size(const EC_KEY *); -const ECDSA_METHOD *ECDSA_OpenSSL(); -void ECDSA_set_default_method(const ECDSA_METHOD *); -const ECDSA_METHOD *ECDSA_get_default_method(); -int ECDSA_get_ex_new_index(long, void *, CRYPTO_EX_new *, - CRYPTO_EX_dup *, CRYPTO_EX_free *); -int ECDSA_set_method(EC_KEY *, const ECDSA_METHOD *); -int ECDSA_set_ex_data(EC_KEY *, int, void *); -void *ECDSA_get_ex_data(EC_KEY *, int); """ CUSTOMIZATIONS = """ @@ -83,14 +75,6 @@ int (*ECDSA_verify)(int, const unsigned char *, int, const unsigned char *, int, EC_KEY *) = NULL; int (*ECDSA_size)(const EC_KEY *) = NULL; -const ECDSA_METHOD* (*ECDSA_OpenSSL)() = NULL; -void (*ECDSA_set_default_method)(const ECDSA_METHOD *) = NULL; -const ECDSA_METHOD* (*ECDSA_get_default_method)() = NULL; -int (*ECDSA_set_method)(EC_KEY *, const ECDSA_METHOD *) = NULL; -int (*ECDSA_get_ex_new_index)(long, void *, CRYPTO_EX_new *, - CRYPTO_EX_dup *, CRYPTO_EX_free *) = NULL; -int (*ECDSA_set_ex_data)(EC_KEY *, int, void *) = NULL; -void* (*ECDSA_get_ex_data)(EC_KEY *, int) = NULL; #else static const long Cryptography_HAS_ECDSA = 1; #endif diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 697be348..f5999312 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -182,13 +182,6 @@ CONDITIONAL_NAMES = { "ECDSA_sign_ex", "ECDSA_verify", "ECDSA_size", - "ECDSA_OpenSSL", - "ECDSA_set_default_method", - "ECDSA_get_default_method", - "ECDSA_set_method", - "ECDSA_get_ex_new_index", - "ECDSA_set_ex_data", - "ECDSA_get_ex_data", ], "Cryptography_HAS_ENGINE_CRYPTODEV": [ "ENGINE_load_cryptodev" |