diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-05-01 19:06:01 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-05-01 19:06:01 -0500 |
| commit | 0f600c508d6fe575bf366e9b41ddc15d9f51a071 (patch) | |
| tree | 28338eb39d2898ad49a4523b5e19b0f8da568984 | |
| parent | 85f5c32fdc0b00c705db96ba40dcda0260a0e132 (diff) | |
| download | cryptography-0f600c508d6fe575bf366e9b41ddc15d9f51a071.tar.gz cryptography-0f600c508d6fe575bf366e9b41ddc15d9f51a071.tar.bz2 cryptography-0f600c508d6fe575bf366e9b41ddc15d9f51a071.zip | |
ecdh wasn't actually included so it wasn't being compiled
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/binding.py | 1 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/ecdh.py | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/cryptography/hazmat/bindings/openssl/binding.py index f0ff3275..aa0525ff 100644 --- a/cryptography/hazmat/bindings/openssl/binding.py +++ b/cryptography/hazmat/bindings/openssl/binding.py @@ -55,6 +55,7 @@ class Binding(object): "dh", "dsa", "ec", + "ecdh", "ecdsa", "engine", "err", diff --git a/cryptography/hazmat/bindings/openssl/ecdh.py b/cryptography/hazmat/bindings/openssl/ecdh.py index 6f2fb5b5..adba0152 100644 --- a/cryptography/hazmat/bindings/openssl/ecdh.py +++ b/cryptography/hazmat/bindings/openssl/ecdh.py @@ -21,8 +21,6 @@ INCLUDES = """ TYPES = """ static const int Cryptography_HAS_ECDH; - -typedef ... ECDH_METHOD; """ FUNCTIONS = """ @@ -42,7 +40,7 @@ MACROS = """ CUSTOMIZATIONS = """ #ifdef OPENSSL_NO_ECDH -static const Cryptography_HAS_ECDH = 0; +static const long Cryptography_HAS_ECDH = 0; typedef void ECDH_METHOD; int (*ECDH_compute_key)(void *, size_t, const EC_POINT *, EC_KEY *, @@ -57,7 +55,7 @@ int (*ECDH_set_ex_data)(EC_KEY *, int, void *) = NULL; void *(*ECDH_get_ex_data)(EC_KEY *, int) = NULL; #else -static const Cryptography_HAS_ECDH = 1; +static const long Cryptography_HAS_ECDH = 1; #endif """ |