diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-03 00:01:22 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-03 00:01:22 -0500 |
| commit | 9ec0c8e33be79a27f2c38ad3da98a1315928ce39 (patch) | |
| tree | 3c78d14e21f6c7f046eede15a6208c4d72b6e038 | |
| parent | 6d3a07f4fb3094c6868514fcae1cec24c647d2a6 (diff) | |
| parent | 24ea1594afa1b8a0bf7e68bc2f27213351c9c3e1 (diff) | |
| download | cryptography-9ec0c8e33be79a27f2c38ad3da98a1315928ce39.tar.gz cryptography-9ec0c8e33be79a27f2c38ad3da98a1315928ce39.tar.bz2 cryptography-9ec0c8e33be79a27f2c38ad3da98a1315928ce39.zip | |
Merge pull request #2501 from reaperhulk/fix-usernotice
fix a warning in cffi
| -rw-r--r-- | src/_cffi_src/openssl/ec.py | 13 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/_cffi_src/openssl/ec.py b/src/_cffi_src/openssl/ec.py index 10c87c33..e130a343 100644 --- a/src/_cffi_src/openssl/ec.py +++ b/src/_cffi_src/openssl/ec.py @@ -29,7 +29,12 @@ typedef struct { 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 @@ typedef struct { 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 f0ad1d5e..80a6dda3 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -141,6 +141,9 @@ CONDITIONAL_NAMES = { "i2o_ECPublicKey", "o2i_ECPublicKey", "SSL_CTX_set_tmp_ecdh", + "POINT_CONVERSION_COMPRESSED", + "POINT_CONVERSION_UNCOMPRESSED", + "POINT_CONVERSION_HYBRID", ], "Cryptography_HAS_EC_1_0_1": [ |