diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2021-06-15 12:25:34 +0300 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2021-06-17 19:27:29 +0300 |
| commit | 01d1b4581e885bc878de6e075b19a1008ef93569 (patch) | |
| tree | bd84986a1e03c5f13a16c8cb9ff5d8a5f2c6e909 /lang/python/python-cryptography/patches/0003-Add-compatibility-for-deprecated-TLS-methods.patch | |
| parent | 6f2ac237a18d0c8258ca838ff4df2245960b7aef (diff) | |
python-cryptography: bump to version 3.4.7
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>
Diffstat (limited to 'lang/python/python-cryptography/patches/0003-Add-compatibility-for-deprecated-TLS-methods.patch')
| -rw-r--r-- | lang/python/python-cryptography/patches/0003-Add-compatibility-for-deprecated-TLS-methods.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/python/python-cryptography/patches/0003-Add-compatibility-for-deprecated-TLS-methods.patch b/lang/python/python-cryptography/patches/0003-Add-compatibility-for-deprecated-TLS-methods.patch index ddad984d0..f30d1e92b 100644 --- a/lang/python/python-cryptography/patches/0003-Add-compatibility-for-deprecated-TLS-methods.patch +++ b/lang/python/python-cryptography/patches/0003-Add-compatibility-for-deprecated-TLS-methods.patch @@ -10,7 +10,7 @@ Subject: [PATCH 3/7] Add compatibility for deprecated TLS methods --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py -@@ -14,12 +14,14 @@ TYPES = """ +@@ -13,12 +13,14 @@ TYPES = """ static const long Cryptography_HAS_SSL_ST; static const long Cryptography_HAS_TLS_ST; static const long Cryptography_HAS_SSL3_METHOD; @@ -27,7 +27,7 @@ Subject: [PATCH 3/7] Add compatibility for deprecated TLS methods static const long Cryptography_HAS_SIGALGS; static const long Cryptography_HAS_PSK; static const long Cryptography_HAS_VERIFIED_CHAIN; -@@ -543,8 +545,43 @@ static const long Cryptography_HAS_SSL3_ +@@ -548,8 +550,43 @@ static const long Cryptography_HAS_SSL3_ static const long Cryptography_HAS_RELEASE_BUFFERS = 1; static const long Cryptography_HAS_OP_NO_COMPRESSION = 1; @@ -75,7 +75,7 @@ Subject: [PATCH 3/7] Add compatibility for deprecated TLS methods static const long Cryptography_HAS_SSL_SET_SSL_CTX = 1; --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py -@@ -33,6 +33,38 @@ def cryptography_has_ssl3_method(): +@@ -31,6 +31,38 @@ def cryptography_has_ssl3_method(): ] @@ -114,7 +114,7 @@ Subject: [PATCH 3/7] Add compatibility for deprecated TLS methods def cryptography_has_102_verification(): return [ "X509_V_ERR_SUITE_B_INVALID_VERSION", -@@ -286,6 +318,10 @@ CONDITIONAL_NAMES = { +@@ -285,6 +317,10 @@ CONDITIONAL_NAMES = { "Cryptography_HAS_RSA_OAEP_MD": cryptography_has_rsa_oaep_md, "Cryptography_HAS_RSA_OAEP_LABEL": cryptography_has_rsa_oaep_label, "Cryptography_HAS_SSL3_METHOD": cryptography_has_ssl3_method, |