diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-11-02 12:22:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-02 12:22:32 -0800 |
| commit | 772f4f8d8318a3f62568fbc54b329cff6e4cff7c (patch) | |
| tree | 2b255b26a0118d29c6dc2b4f1bad9738fe9fb582 /lang/python/python-cryptography/patches/030-Add-compatibility-for-deprecated-TLS-methods.patch | |
| parent | c29b51213536b8b4018a9d703659b16eb7b78118 (diff) | |
| parent | a9862edad79ea23d234e7adb531088696fffe5b3 (diff) | |
Merge pull request #13830 from commodo/python-updates1
python: numpy,pillow,cryptography: bump versions
Diffstat (limited to 'lang/python/python-cryptography/patches/030-Add-compatibility-for-deprecated-TLS-methods.patch')
| -rw-r--r-- | lang/python/python-cryptography/patches/030-Add-compatibility-for-deprecated-TLS-methods.patch | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lang/python/python-cryptography/patches/030-Add-compatibility-for-deprecated-TLS-methods.patch b/lang/python/python-cryptography/patches/030-Add-compatibility-for-deprecated-TLS-methods.patch index fcc17e19f..2050e464c 100644 --- a/lang/python/python-cryptography/patches/030-Add-compatibility-for-deprecated-TLS-methods.patch +++ b/lang/python/python-cryptography/patches/030-Add-compatibility-for-deprecated-TLS-methods.patch @@ -8,11 +8,9 @@ Subject: [PATCH] Add compatibility for deprecated TLS methods .../hazmat/bindings/openssl/_conditional.py | 36 +++++++++++++++ 2 files changed, 77 insertions(+), 4 deletions(-) -diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py -index c38e309a..e726417d 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py -@@ -15,8 +15,9 @@ static const long Cryptography_HAS_SSL_ST; +@@ -15,8 +15,9 @@ static const long Cryptography_HAS_SSL_S static const long Cryptography_HAS_TLS_ST; static const long Cryptography_HAS_SSL2; static const long Cryptography_HAS_SSL3_METHOD; @@ -24,7 +22,7 @@ index c38e309a..e726417d 100644 static const long Cryptography_HAS_TLSv1_3; static const long Cryptography_HAS_SECURE_RENEGOTIATION; static const long Cryptography_HAS_TLSEXT_STATUS_REQ_CB; -@@ -24,6 +25,7 @@ static const long Cryptography_HAS_STATUS_REQ_OCSP_RESP; +@@ -24,6 +25,7 @@ static const long Cryptography_HAS_STATU static const long Cryptography_HAS_TLSEXT_STATUS_REQ_TYPE; static const long Cryptography_HAS_SSL_CTX_CLEAR_OPTIONS; static const long Cryptography_HAS_DTLS; @@ -32,7 +30,7 @@ index c38e309a..e726417d 100644 static const long Cryptography_HAS_SIGALGS; static const long Cryptography_HAS_PSK; static const long Cryptography_HAS_CIPHER_DETAILS; -@@ -596,8 +598,43 @@ static const long Cryptography_HAS_STATUS_REQ_OCSP_RESP = 1; +@@ -596,8 +598,43 @@ static const long Cryptography_HAS_STATU static const long Cryptography_HAS_TLSEXT_STATUS_REQ_TYPE = 1; static const long Cryptography_HAS_RELEASE_BUFFERS = 1; static const long Cryptography_HAS_OP_NO_COMPRESSION = 1; @@ -78,8 +76,6 @@ index c38e309a..e726417d 100644 static const long Cryptography_HAS_SSL_OP_MSIE_SSLV2_RSA_PADDING = 1; static const long Cryptography_HAS_SSL_OP_NO_TICKET = 1; static const long Cryptography_HAS_SSL_SET_SSL_CTX = 1; -diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py -index 23dc38a4..c0dca00a 100644 --- 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(): @@ -121,7 +117,7 @@ index 23dc38a4..c0dca00a 100644 def cryptography_has_102_verification(): return [ "X509_V_ERR_SUITE_B_INVALID_VERSION", -@@ -303,6 +335,10 @@ CONDITIONAL_NAMES = { +@@ -307,6 +339,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, @@ -132,6 +128,3 @@ index 23dc38a4..c0dca00a 100644 "Cryptography_HAS_102_VERIFICATION": cryptography_has_102_verification, "Cryptography_HAS_110_VERIFICATION_PARAMS": ( cryptography_has_110_verification_params --- -2.26.2 - |