aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-03-05 14:04:53 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-03-05 14:04:53 -0800
commit05c37cce58aeef99ae8e011c5c0b672b87724dd5 (patch)
tree1cb005ae4d4a3deec1c55afbbb8e144d762f5779
parente92819586845e58c2389f672c5e1c98cf1640411 (diff)
downloadcryptography-05c37cce58aeef99ae8e011c5c0b672b87724dd5.tar.gz
cryptography-05c37cce58aeef99ae8e011c5c0b672b87724dd5.tar.bz2
cryptography-05c37cce58aeef99ae8e011c5c0b672b87724dd5.zip
Simplify
-rw-r--r--cryptography/hazmat/bindings/openssl/ec.py16
1 files changed, 6 insertions, 10 deletions
diff --git a/cryptography/hazmat/bindings/openssl/ec.py b/cryptography/hazmat/bindings/openssl/ec.py
index 84179cd1..4a42960c 100644
--- a/cryptography/hazmat/bindings/openssl/ec.py
+++ b/cryptography/hazmat/bindings/openssl/ec.py
@@ -24,7 +24,8 @@ static const int Cryptography_HAS_EC;
typedef ... EC_KEY;
typedef struct {
- ...;
+ int nid;
+ const char *comment;
} EC_builtin_curve;
static const int NID_X9_62_c2pnb163v1;
@@ -181,24 +182,21 @@ void EC_KEY_free(EC_KEY *);
size_t EC_get_builtin_curves(EC_builtin_curve *, size_t);
-int Cryptography_EC_builtin_curve_get_nid(EC_builtin_curve *);
"""
CUSTOMIZATIONS = """
#ifdef OPENSSL_NO_EC
static const long Cryptography_HAS_EC = 0;
typedef void EC_KEY;
-typedef void EC_builtin_curve;
+typedef struct {
+ int nid;
+ const char *comment;
+} EC_builtin_curve;
EC_KEY* (*EC_KEY_new_by_curve_name)(int) = NULL;
void (*EC_KEY_free)(EC_KEY *) = NULL;
size_t (*EC_get_builtin_curves)(EC_builtin_curve *, size_t) = NULL;
-int (*Cryptography_EC_builtin_curve_get_nid)(EC_builtin_curve *) = NULL;
#else
static const long Cryptography_HAS_EC = 1;
-
-int Cryptography_EC_builtin_curve_get_nid(EC_builtin_curve *c) {
- return c->nid;
-}
#endif
"""
@@ -207,7 +205,5 @@ CONDITIONAL_NAMES = {
"EC_KEY_new_by_curve_name",
"EC_KEY_free",
"EC_get_builtin_curves",
-
- "Cryptography_EC_builtin_curve_get_nid",
],
}