From badd5cc898709cba50e4b600ea4e31fd2b235251 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 9 Dec 2020 17:07:59 -0600 Subject: [PATCH 1/2] re-add Cryptography_HAS_TLSEXT_HOSTNAME and bump for 3.3.1 --- CHANGELOG.rst | 9 +++++++-- src/_cffi_src/openssl/ssl.py | 6 ++++++ src/cryptography/__about__.py | 2 +- vectors/cryptography_vectors/__about__.py | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index caa8e20c525b..d10db364f034 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,13 +1,18 @@ Changelog ========= +.. _v3-3-1: + +3.3 - 2020-12-09 +~~~~~~~~~~~~~~~~ + +* Re-added a legacy symbol causing problems for older ``pyOpenSSL`` users. + .. _v3-3: 3.3 - 2020-12-08 ~~~~~~~~~~~~~~~~ -.. note:: This version is not yet released and is under active development. - * **BACKWARDS INCOMPATIBLE:** Support for Python 3.5 has been removed due to low usage and maintenance burden. * **BACKWARDS INCOMPATIBLE:** The diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index f3511e454c98..97d9121afbae 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -25,6 +25,7 @@ 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 @@ -504,6 +505,11 @@ """ 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. +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; diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index d7a3c1e6de87..0c7eaaa09603 100644 --- a/src/cryptography/__about__.py +++ b/src/cryptography/__about__.py @@ -22,7 +22,7 @@ ) __uri__ = "https://github.com/pyca/cryptography" -__version__ = "3.3" +__version__ = "3.3.1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index 5cb6768fa234..44fe9e7d85e7 100644 --- a/vectors/cryptography_vectors/__about__.py +++ b/vectors/cryptography_vectors/__about__.py @@ -20,7 +20,7 @@ __uri__ = "https://github.com/pyca/cryptography" -__version__ = "3.3" +__version__ = "3.3.1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" From 01a65f727a9273456ac1b3ceba648ea51d1bcaa2 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 9 Dec 2020 17:15:48 -0600 Subject: [PATCH 2/2] review feedback --- CHANGELOG.rst | 4 ++-- src/_cffi_src/openssl/ssl.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d10db364f034..3cb53d00e03d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,8 +3,8 @@ Changelog .. _v3-3-1: -3.3 - 2020-12-09 -~~~~~~~~~~~~~~~~ +3.3.1 - 2020-12-09 +~~~~~~~~~~~~~~~~~~ * Re-added a legacy symbol causing problems for older ``pyOpenSSL`` users. diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index 97d9121afbae..9400f115fb44 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -507,7 +507,7 @@ 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. +// users have upgraded. PersistentlyDeprecated2020 static const long Cryptography_HAS_TLSEXT_HOSTNAME = 1; #if CRYPTOGRAPHY_IS_LIBRESSL