diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-01 17:54:43 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-01 17:54:43 -0700 |
| commit | b42338388c7c9c6adc54fb5aec51ff25ecc1d81b (patch) | |
| tree | b1910539654590982e0b9e82b83ecac019c608ed | |
| parent | 85f5c32fdc0b00c705db96ba40dcda0260a0e132 (diff) | |
| parent | b6f987cf936f8d84625f310abcb4b1518d45bcdc (diff) | |
| download | cryptography-b42338388c7c9c6adc54fb5aec51ff25ecc1d81b.tar.gz cryptography-b42338388c7c9c6adc54fb5aec51ff25ecc1d81b.tar.bz2 cryptography-b42338388c7c9c6adc54fb5aec51ff25ecc1d81b.zip | |
Merge pull request #992 from reaperhulk/fix-ecdh
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 | 8 |
2 files changed, 4 insertions, 5 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..77beb7a3 100644 --- a/cryptography/hazmat/bindings/openssl/ecdh.py +++ b/cryptography/hazmat/bindings/openssl/ecdh.py @@ -14,15 +14,13 @@ from __future__ import absolute_import, division, print_function INCLUDES = """ -#ifdef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_ECDH #include <openssl/ecdh.h> #endif """ 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 """ |