aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-05-01 18:29:32 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-05-01 18:29:32 -0700
commit8c977a3bac7476b1d8a59c42bc96cf7ad08f430e (patch)
treed57b815889ac3cd4e0f3759df54eabf0fb1fd905
parentb42338388c7c9c6adc54fb5aec51ff25ecc1d81b (diff)
parentef6c31f930fc6ab3f6290cdbd17d47881c6210ac (diff)
downloadcryptography-8c977a3bac7476b1d8a59c42bc96cf7ad08f430e.tar.gz
cryptography-8c977a3bac7476b1d8a59c42bc96cf7ad08f430e.tar.bz2
cryptography-8c977a3bac7476b1d8a59c42bc96cf7ad08f430e.zip
Merge pull request #993 from reaperhulk/really-fix-ecdh
Fix ECDH on CentOS 5.x/6.4
-rw-r--r--cryptography/hazmat/bindings/openssl/ecdh.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/cryptography/hazmat/bindings/openssl/ecdh.py b/cryptography/hazmat/bindings/openssl/ecdh.py
index 77beb7a3..960d46fb 100644
--- a/cryptography/hazmat/bindings/openssl/ecdh.py
+++ b/cryptography/hazmat/bindings/openssl/ecdh.py
@@ -24,6 +24,9 @@ static const int Cryptography_HAS_ECDH;
"""
FUNCTIONS = """
+"""
+
+MACROS = """
int ECDH_compute_key(void *, size_t, const EC_POINT *, EC_KEY *,
void *(*)(const void *, size_t, void *, size_t *));
@@ -35,13 +38,9 @@ int ECDH_set_ex_data(EC_KEY *, int, void *);
void *ECDH_get_ex_data(EC_KEY *, int);
"""
-MACROS = """
-"""
-
CUSTOMIZATIONS = """
#ifdef OPENSSL_NO_ECDH
static const long Cryptography_HAS_ECDH = 0;
-typedef void ECDH_METHOD;
int (*ECDH_compute_key)(void *, size_t, const EC_POINT *, EC_KEY *,
void *(*)(const void *, size_t, void *,