aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAshwini Oruganti <ashwini.oruganti@gmail.com>2014-05-01 13:32:57 -0700
committerAshwini Oruganti <ashwini.oruganti@gmail.com>2014-05-01 13:32:57 -0700
commitc5331de78f9f8496f6400b3816f31bee073abf32 (patch)
treeb60d809fe2a9b224f71f7abe8f84cb4cb7c583a2
parente43fffb7614a39b454421798a415625a59687e19 (diff)
downloadcryptography-c5331de78f9f8496f6400b3816f31bee073abf32.tar.gz
cryptography-c5331de78f9f8496f6400b3816f31bee073abf32.tar.bz2
cryptography-c5331de78f9f8496f6400b3816f31bee073abf32.zip
Fix alignment and close an #ifdef
-rw-r--r--cryptography/hazmat/bindings/openssl/ecdh.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/cryptography/hazmat/bindings/openssl/ecdh.py b/cryptography/hazmat/bindings/openssl/ecdh.py
index 6b9b50ce..6f2fb5b5 100644
--- a/cryptography/hazmat/bindings/openssl/ecdh.py
+++ b/cryptography/hazmat/bindings/openssl/ecdh.py
@@ -27,10 +27,10 @@ typedef ... ECDH_METHOD;
FUNCTIONS = """
int ECDH_compute_key(void *, size_t, const EC_POINT *, EC_KEY *,
- void *(*)(const void *, size_t, void *, size_t *));
+ 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 *);
+ CRYPTO_EX_free *);
int ECDH_set_ex_data(EC_KEY *, int, void *);
@@ -46,14 +46,19 @@ static const 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 *, size_t *)) = NULL;
+ 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;
+ 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 Cryptography_HAS_ECDH = 1;
+#endif
"""
CONDITIONAL_NAMES = {