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>
20 lines
591 B
Diff
20 lines
591 B
Diff
From 7eefc9c72f522e414f953fee2d6ca9242c566107 Mon Sep 17 00:00:00 2001
|
|
From: Rosen Penev <rosenp@gmail.com>
|
|
Date: Fri, 7 Jun 2019 18:18:46 -0700
|
|
Subject: [PATCH 1/7] Add new ASN1_STRING_get0_data API
|
|
|
|
Introduced with OpenSSL 1.1
|
|
---
|
|
src/_cffi_src/openssl/asn1.py | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/src/_cffi_src/openssl/asn1.py
|
|
+++ b/src/_cffi_src/openssl/asn1.py
|
|
@@ -105,4 +105,7 @@ ASN1_NULL *ASN1_NULL_new(void);
|
|
"""
|
|
|
|
CUSTOMIZATIONS = """
|
|
+#if (OPENSSL_API_COMPAT >= 0x10100000L) && !CRYPTOGRAPHY_IS_LIBRESSL
|
|
+#define ASN1_STRING_data ASN1_STRING_get0_data
|
|
+#endif
|
|
"""
|