|
|
- From 07fb50eecc3a3a50ac543f53f98c285eb1ceeb1e Mon Sep 17 00:00:00 2001
- From: Rosen Penev <rosenp@gmail.com>
- Date: Mon, 25 Nov 2019 12:06:16 -0800
- Subject: [PATCH] Add X509_STORE_CTX_trusted_stack compatibility macro
-
- Deprecated in 1.1
-
- Signed-off-by: Rosen Penev <rosenp@gmail.com>
- ---
- src/_cffi_src/openssl/x509_vfy.py | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
- diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py
- index a1730738..cd143ea0 100644
- --- a/src/_cffi_src/openssl/x509_vfy.py
- +++ b/src/_cffi_src/openssl/x509_vfy.py
- @@ -157,8 +157,12 @@ int X509_STORE_CTX_init(X509_STORE_CTX *, X509_STORE *, X509 *,
- Cryptography_STACK_OF_X509 *);
- void X509_STORE_CTX_trusted_stack(X509_STORE_CTX *,
- Cryptography_STACK_OF_X509 *);
- +void X509_STORE_CTX_set0_trusted_stack(X509_STORE_CTX *,
- + Cryptography_STACK_OF_X509 *);
- void X509_STORE_CTX_set_cert(X509_STORE_CTX *, X509 *);
- -void X509_STORE_CTX_set_chain(X509_STORE_CTX *,Cryptography_STACK_OF_X509 *);
- +void X509_STORE_CTX_set_chain(X509_STORE_CTX *, Cryptography_STACK_OF_X509 *);
- +void X509_STORE_CTX_set0_untrusted(X509_STORE_CTX *,
- + Cryptography_STACK_OF_X509 *);
- X509_VERIFY_PARAM *X509_STORE_CTX_get0_param(X509_STORE_CTX *);
- void X509_STORE_CTX_set0_param(X509_STORE_CTX *, X509_VERIFY_PARAM *);
- int X509_STORE_CTX_set_default(X509_STORE_CTX *, const char *);
- @@ -282,4 +286,15 @@ static const long Cryptography_HAS_X509_CB_ISSUER_CHECK = 0;
- #else
- static const long Cryptography_HAS_X509_CB_ISSUER_CHECK = 1;
- #endif
- +
- +#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_IS_LIBRESSL
- +#define X509_STORE_CTX_set0_trusted_stack X509_STORE_CTX_trusted_stack
- +#define X509_STORE_CTX_set0_untrusted X509_STORE_CTX_set_chain
- +#endif
- +
- +#if (OPENSSL_API_COMPAT >= 0x10100000L) && !CRYPTOGRAPHY_IS_LIBRESSL
- +#define X509_STORE_CTX_trusted_stack X509_STORE_CTX_set0_trusted_stack
- +#define X509_STORE_CTX_set_chain X509_STORE_CTX_set0_untrusted
- +#define X509_STORE_CTX_get_chain X509_STORE_CTX_get1_chain
- +#endif
- """
- --
- 2.26.2
-
|
