diff options
| author | Steven McDonald <steven.mcdonald@anchor.net.au> | 2015-02-18 16:25:29 +1100 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-19 09:17:43 -0600 |
| commit | fab60f1cced530d5d0c53584d66ca91d77700a07 (patch) | |
| tree | 243b1f9888cba5bc33bec884a75fe8464760d309 | |
| parent | 6f711102f5549cb367bbd6c6e2222dc3d8847bbc (diff) | |
| download | cryptography-fab60f1cced530d5d0c53584d66ca91d77700a07.tar.gz cryptography-fab60f1cced530d5d0c53584d66ca91d77700a07.tar.bz2 cryptography-fab60f1cced530d5d0c53584d66ca91d77700a07.zip | |
Disable features exclusive to newer OpenSSL when using LibreSSL
Some features added to newer OpenSSL versions are absent in LibreSSL,
so don't mark these as present if LIBRESSL_VERSION_NUMBER is defined.
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/x509_vfy.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/x509_vfy.py b/src/cryptography/hazmat/bindings/openssl/x509_vfy.py index 6f05f4d7..1f75b86f 100644 --- a/src/cryptography/hazmat/bindings/openssl/x509_vfy.py +++ b/src/cryptography/hazmat/bindings/openssl/x509_vfy.py @@ -191,7 +191,7 @@ int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *, const char *); CUSTOMIZATIONS = """ /* OpenSSL 1.0.2+ verification error codes */ -#if OPENSSL_VERSION_NUMBER >= 0x10002000L +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 1; #else static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0; @@ -207,7 +207,7 @@ static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0; #endif /* OpenSSL 1.0.2+ verification parameters */ -#if OPENSSL_VERSION_NUMBER >= 0x10002000L +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1; #else static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0; |