From 9a426a5003b324cfd77a33bcbe81d9763ea4ba95 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 1 Dec 2015 07:54:05 -0600 Subject: fix a warning in cffi cffi doesn't want to guess the type, so we'll deopaque the enum and strip the values out of the lib if EC is unavailable --- src/_cffi_src/openssl/ec.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/_cffi_src/openssl') diff --git a/src/_cffi_src/openssl/ec.py b/src/_cffi_src/openssl/ec.py index 10c87c33..6a0aa720 100644 --- a/src/_cffi_src/openssl/ec.py +++ b/src/_cffi_src/openssl/ec.py @@ -29,7 +29,11 @@ typedef struct { int nid; const char *comment; } EC_builtin_curve; -typedef enum { ... } point_conversion_form_t; +typedef enum { + POINT_CONVERSION_COMPRESSED = 2, + POINT_CONVERSION_UNCOMPRESSED = 4, + POINT_CONVERSION_HYBRID = 6 +} point_conversion_form_t; """ FUNCTIONS = """ -- cgit v1.2.3 From 04b66daa312165bf311803c2e85c71d0b62c42ef Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 1 Dec 2015 08:15:22 -0600 Subject: let the compiler figure out these values --- src/_cffi_src/openssl/ec.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/_cffi_src/openssl') diff --git a/src/_cffi_src/openssl/ec.py b/src/_cffi_src/openssl/ec.py index 6a0aa720..0635ca29 100644 --- a/src/_cffi_src/openssl/ec.py +++ b/src/_cffi_src/openssl/ec.py @@ -30,9 +30,10 @@ typedef struct { const char *comment; } EC_builtin_curve; typedef enum { - POINT_CONVERSION_COMPRESSED = 2, - POINT_CONVERSION_UNCOMPRESSED = 4, - POINT_CONVERSION_HYBRID = 6 + POINT_CONVERSION_COMPRESSED, + POINT_CONVERSION_UNCOMPRESSED, + POINT_CONVERSION_HYBRID, + ... } point_conversion_form_t; """ -- cgit v1.2.3 From 2ebd4bd63295bb1acbd2857684e2794272d17e2a Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 1 Dec 2015 08:23:02 -0600 Subject: if EC isn't present we need to declare this enum --- src/_cffi_src/openssl/ec.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/_cffi_src/openssl') diff --git a/src/_cffi_src/openssl/ec.py b/src/_cffi_src/openssl/ec.py index 0635ca29..f0be0783 100644 --- a/src/_cffi_src/openssl/ec.py +++ b/src/_cffi_src/openssl/ec.py @@ -213,7 +213,11 @@ typedef struct { int nid; const char *comment; } EC_builtin_curve; -typedef long point_conversion_form_t; +typedef enum { + POINT_CONVERSION_COMPRESSED = 0, + POINT_CONVERSION_UNCOMPRESSED = 1, + POINT_CONVERSION_HYBRID = 2, +} point_conversion_form_t; static const int OPENSSL_EC_NAMED_CURVE = 0; -- cgit v1.2.3 From 24ea1594afa1b8a0bf7e68bc2f27213351c9c3e1 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 1 Dec 2015 14:52:44 -0600 Subject: shouldn't need values here --- src/_cffi_src/openssl/ec.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/_cffi_src/openssl') diff --git a/src/_cffi_src/openssl/ec.py b/src/_cffi_src/openssl/ec.py index f0be0783..e130a343 100644 --- a/src/_cffi_src/openssl/ec.py +++ b/src/_cffi_src/openssl/ec.py @@ -214,9 +214,9 @@ typedef struct { const char *comment; } EC_builtin_curve; typedef enum { - POINT_CONVERSION_COMPRESSED = 0, - POINT_CONVERSION_UNCOMPRESSED = 1, - POINT_CONVERSION_HYBRID = 2, + POINT_CONVERSION_COMPRESSED, + POINT_CONVERSION_UNCOMPRESSED, + POINT_CONVERSION_HYBRID, } point_conversion_form_t; static const int OPENSSL_EC_NAMED_CURVE = 0; -- cgit v1.2.3