diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 12:49:01 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 12:49:01 -0500 |
| commit | a1c27d0e564347c73cf678a3a09615692be67346 (patch) | |
| tree | d5d17b5a16aeb3ff45151cbf62a58e883ce63506 | |
| parent | 0681de7241dcbaec7b3dc85d3cf3944e4bec8309 (diff) | |
| parent | 97652770d5f25f6f2f19295a89aac4519fec19ae (diff) | |
| download | cryptography-a1c27d0e564347c73cf678a3a09615692be67346.tar.gz cryptography-a1c27d0e564347c73cf678a3a09615692be67346.tar.bz2 cryptography-a1c27d0e564347c73cf678a3a09615692be67346.zip | |
Merge pull request #2787 from reaperhulk/110-patch-8
some ECDH functions we don't use that are no longer present in 1.1.0
| -rw-r--r-- | src/_cffi_src/openssl/ecdh.py | 14 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 3 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/_cffi_src/openssl/ecdh.py b/src/_cffi_src/openssl/ecdh.py index 3116c3b6..099f53cb 100644 --- a/src/_cffi_src/openssl/ecdh.py +++ b/src/_cffi_src/openssl/ecdh.py @@ -20,13 +20,6 @@ FUNCTIONS = """ MACROS = """ int ECDH_compute_key(void *, size_t, const EC_POINT *, EC_KEY *, void *(*)(const void *, size_t, void *, size_t *)); - -int ECDH_get_ex_new_index(long, void *, CRYPTO_EX_new *, CRYPTO_EX_dup *, - CRYPTO_EX_free *); - -int ECDH_set_ex_data(EC_KEY *, int, void *); - -void *ECDH_get_ex_data(EC_KEY *, int); """ CUSTOMIZATIONS = """ @@ -37,13 +30,6 @@ int (*ECDH_compute_key)(void *, size_t, const EC_POINT *, EC_KEY *, void *(*)(const void *, size_t, void *, size_t *)) = NULL; -int (*ECDH_get_ex_new_index)(long, void *, CRYPTO_EX_new *, CRYPTO_EX_dup *, - CRYPTO_EX_free *) = NULL; - -int (*ECDH_set_ex_data)(EC_KEY *, int, void *) = NULL; - -void *(*ECDH_get_ex_data)(EC_KEY *, int) = NULL; - #else static const long Cryptography_HAS_ECDH = 1; #endif diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 8bd9551d..697be348 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -168,9 +168,6 @@ CONDITIONAL_NAMES = { ], "Cryptography_HAS_ECDH": [ "ECDH_compute_key", - "ECDH_get_ex_new_index", - "ECDH_set_ex_data", - "ECDH_get_ex_data", ], "Cryptography_HAS_ECDSA": [ "ECDSA_SIG_new", |