diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-08 16:59:21 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-08 16:59:21 -0500 |
| commit | 7a108629d3358f5f07ddb7a454276e8616aa5e70 (patch) | |
| tree | 6cfaa95b70c91e3e17a2af54ae4dd5483ea44f5f /src/_cffi_src | |
| parent | c5f59dae64bc0218da50696fad2bfd75471d6e09 (diff) | |
| parent | 62751e765600c2082f5e6abbe3af6f62220f98e0 (diff) | |
| download | cryptography-7a108629d3358f5f07ddb7a454276e8616aa5e70.tar.gz cryptography-7a108629d3358f5f07ddb7a454276e8616aa5e70.tar.bz2 cryptography-7a108629d3358f5f07ddb7a454276e8616aa5e70.zip | |
Merge pull request #2226 from lluixhi/master
Fix build with LibreSSL >= 2.2.2
Diffstat (limited to 'src/_cffi_src')
| -rw-r--r-- | src/_cffi_src/openssl/ec.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/_cffi_src/openssl/ec.py b/src/_cffi_src/openssl/ec.py index 93ca2754..10c87c33 100644 --- a/src/_cffi_src/openssl/ec.py +++ b/src/_cffi_src/openssl/ec.py @@ -397,7 +397,7 @@ static const long Cryptography_HAS_EC2M = 1; #endif #if defined(OPENSSL_NO_EC) || OPENSSL_VERSION_NUMBER < 0x1000200f || \ - defined(LIBRESSL_VERSION_NUMBER) + defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20020002L static const long Cryptography_HAS_EC_1_0_2 = 0; const char *(*EC_curve_nid2nist)(int) = NULL; #else |