01d1b4581e
Dropped patches: 0004-Replace-EVP_CIPHER_CTX_cleanup-with-EVP_CIPHER_CTX_r.patch 0005-Switch-get_-Update-APIs-to-get0.patch Reworked patches: 0001-Add-new-ASN1_STRING_get0_data-API.patch 0006-Add-X509_STORE_CTX_trusted_stack-compatibility-macro.patch These 2 require that we keep only the CUSTOMIZATIONS stuff for now. Maybe later we can drop this. Ran 'make package/python-cryptography/refresh'. Added patch: 0004-disable-rust.patch upstream did a sloppy job with the CRYPTOGRAPHY_DONT_BUILD_RUST logic; we need to patch it, to make sure the setuptools-rust isn't installed. We may need to carry this patch in our tree for a bit longer than upstream, because in newer versions, CRYPTOGRAPHY_DONT_BUILD_RUST logic gets removed. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
25 lines
893 B
Diff
25 lines
893 B
Diff
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
|
|
@@ -265,4 +265,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
|
|
"""
|