diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2020-12-09 21:30:44 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 22:30:44 -0500 |
| commit | 657b75a01de302c34bbd8890b9803a8821662227 (patch) | |
| tree | b65ba3584e1eadf3150cf11140ef5b7f3fa511a2 | |
| parent | 7d34b55c3a3798d83819a3a845e590d234ad0728 (diff) | |
| download | cryptography-657b75a01de302c34bbd8890b9803a8821662227.tar.gz | |
re-add Cryptography_HAS_TLSEXT_HOSTNAME and port 3.3.1 changelog (#5627)
| -rw-r--r-- | CHANGELOG.rst | 7 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a5e699ddb..7ff0f05d9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,6 +8,13 @@ Changelog * **BACKWARDS INCOMPATIBLE:** Support for Python 2 has been removed. +.. _v3-3-1: + +3.3.1 - 2020-12-09 +~~~~~~~~~~~~~~~~~~ + +* Re-added a legacy symbol causing problems for older ``pyOpenSSL`` users. + .. _v3-3: 3.3 - 2020-12-08 diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index 61813a3c0..1977d4c16 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -24,6 +24,7 @@ static const long Cryptography_HAS_PSK; static const long Cryptography_HAS_VERIFIED_CHAIN; static const long Cryptography_HAS_KEYLOG; static const long Cryptography_HAS_GET_PROTO_VERSION; +static const long Cryptography_HAS_TLSEXT_HOSTNAME; /* Internally invented symbol to tell us if SSL_MODE_RELEASE_BUFFERS is * supported @@ -503,6 +504,11 @@ int SSL_CTX_set_max_early_data(SSL_CTX *, uint32_t); """ CUSTOMIZATIONS = """ +// This symbol is being preserved because removing it will break users with +// pyOpenSSL < 19.1 and pip < 20.x. We need to leave this in place until those +// users have upgraded. PersistentlyDeprecated2020 +static const long Cryptography_HAS_TLSEXT_HOSTNAME = 1; + #if CRYPTOGRAPHY_IS_LIBRESSL static const long Cryptography_HAS_VERIFIED_CHAIN = 0; Cryptography_STACK_OF_X509 *(*SSL_get0_verified_chain)(const SSL *) = NULL; |