diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2020-12-14 12:11:11 +0200 |
|---|---|---|
| committer | Alexandru Ardelean <ardeleanalex@gmail.com> | 2020-12-16 08:45:36 +0200 |
| commit | e4303a3d283b8b138668d032665e2904784ea4df (patch) | |
| tree | f85ef3f4d68859779347717d4234bdd94d79b947 /lang/python/python-cryptography/patches/0006-Add-X509_STORE_CTX_trusted_stack-compatibility-macro.patch | |
| parent | a03ce5bc7271eb8b2fc41030c52272d7e06810e6 (diff) | |
python-cryptography: bump to version 3.3.1
Regenerated patches from:
https://github.com/pyca/cryptography/pull/4920
The patch names were kept as generated via 'git format-patch 3.3.1..'
And ran through quilt.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Diffstat (limited to 'lang/python/python-cryptography/patches/0006-Add-X509_STORE_CTX_trusted_stack-compatibility-macro.patch')
| -rw-r--r-- | lang/python/python-cryptography/patches/0006-Add-X509_STORE_CTX_trusted_stack-compatibility-macro.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/lang/python/python-cryptography/patches/0006-Add-X509_STORE_CTX_trusted_stack-compatibility-macro.patch b/lang/python/python-cryptography/patches/0006-Add-X509_STORE_CTX_trusted_stack-compatibility-macro.patch new file mode 100644 index 000000000..2513fe6b7 --- /dev/null +++ b/lang/python/python-cryptography/patches/0006-Add-X509_STORE_CTX_trusted_stack-compatibility-macro.patch @@ -0,0 +1,39 @@ +From 98bf3eda9c950158cf6a0a6a698dd365712201b1 Mon Sep 17 00:00:00 2001 +From: Rosen Penev <rosenp@gmail.com> +Date: Mon, 25 Nov 2019 12:06:16 -0800 +Subject: [PATCH 6/7] 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 | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +--- 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 * + 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 *); +@@ -260,4 +264,10 @@ static const long Cryptography_HAS_X509_ + #else + static const long Cryptography_HAS_X509_CB_ISSUER_CHECK = 1; + #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 + """ |