Merge pull request #2504 from reaperhulk/encode-name-constraints
implement support for encoding name constraints
diff --git a/src/_cffi_src/openssl/ec.py b/src/_cffi_src/openssl/ec.py
index 10c87c3..e130a34 100644
--- a/src/_cffi_src/openssl/ec.py
+++ b/src/_cffi_src/openssl/ec.py
@@ -29,7 +29,12 @@
int nid;
const char *comment;
} EC_builtin_curve;
-typedef enum { ... } point_conversion_form_t;
+typedef enum {
+ POINT_CONVERSION_COMPRESSED,
+ POINT_CONVERSION_UNCOMPRESSED,
+ POINT_CONVERSION_HYBRID,
+ ...
+} point_conversion_form_t;
"""
FUNCTIONS = """
@@ -208,7 +213,11 @@
int nid;
const char *comment;
} EC_builtin_curve;
-typedef long point_conversion_form_t;
+typedef enum {
+ POINT_CONVERSION_COMPRESSED,
+ POINT_CONVERSION_UNCOMPRESSED,
+ POINT_CONVERSION_HYBRID,
+} point_conversion_form_t;
static const int OPENSSL_EC_NAMED_CURVE = 0;
diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
index f0ad1d5..80a6dda 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -141,6 +141,9 @@
"i2o_ECPublicKey",
"o2i_ECPublicKey",
"SSL_CTX_set_tmp_ecdh",
+ "POINT_CONVERSION_COMPRESSED",
+ "POINT_CONVERSION_UNCOMPRESSED",
+ "POINT_CONVERSION_HYBRID",
],
"Cryptography_HAS_EC_1_0_1": [