diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-05-31 11:39:12 +0800 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2018-05-30 23:39:12 -0400 |
commit | 611fa5a0458a36bb8b13b3e251a5cd359fa34296 (patch) | |
tree | 1a47dc8ab149ef5fcbec3aded2547c2b14b89c1f /src/_cffi_src/openssl/x509_vfy.py | |
parent | 8a64f1f2fbea73f0b7a4725768dc9597d240c661 (diff) | |
download | cryptography-611fa5a0458a36bb8b13b3e251a5cd359fa34296.tar.gz cryptography-611fa5a0458a36bb8b13b3e251a5cd359fa34296.tar.bz2 cryptography-611fa5a0458a36bb8b13b3e251a5cd359fa34296.zip |
LibreSSL 2.7.x support (#4270)
* libre 2.7.3 compatibility
* add a changelog
* actually build against 2.7.3
Diffstat (limited to 'src/_cffi_src/openssl/x509_vfy.py')
-rw-r--r-- | src/_cffi_src/openssl/x509_vfy.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py index a4b91200..618b5c21 100644 --- a/src/_cffi_src/openssl/x509_vfy.py +++ b/src/_cffi_src/openssl/x509_vfy.py @@ -246,6 +246,7 @@ static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0; static const long X509_V_FLAG_SUITEB_192_LOS = 0; static const long X509_V_FLAG_SUITEB_128_LOS = 0; +#if !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER int (*X509_VERIFY_PARAM_set1_host)(X509_VERIFY_PARAM *, const char *, size_t) = NULL; int (*X509_VERIFY_PARAM_set1_email)(X509_VERIFY_PARAM *, const char *, @@ -256,6 +257,7 @@ int (*X509_VERIFY_PARAM_set1_ip_asc)(X509_VERIFY_PARAM *, const char *) = NULL; void (*X509_VERIFY_PARAM_set_hostflags)(X509_VERIFY_PARAM *, unsigned int) = NULL; #endif +#endif /* OpenSSL 1.0.2+ or Solaris's backport */ #ifdef X509_V_FLAG_PARTIAL_CHAIN @@ -273,7 +275,7 @@ static const long Cryptography_HAS_X509_V_FLAG_TRUSTED_FIRST = 0; static const long X509_V_FLAG_TRUSTED_FIRST = 0; #endif -#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 +#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER Cryptography_STACK_OF_X509_OBJECT *X509_STORE_get0_objects(X509_STORE *ctx) { return ctx->objs; } @@ -293,7 +295,9 @@ X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx) X509 *X509_OBJECT_get0_X509(X509_OBJECT *x) { return x->data.x509; } +#endif +#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 static const long Cryptography_HAS_X509_STORE_CTX_GET_ISSUER = 0; typedef void *X509_STORE_CTX_get_issuer_fn; X509_STORE_CTX_get_issuer_fn (*X509_STORE_get_get_issuer)(X509_STORE *) = NULL; |