re-add Cryptography_HAS_TLSEXT_HOSTNAME and bump for 3.3.1 (#5625)

* re-add Cryptography_HAS_TLSEXT_HOSTNAME and bump for 3.3.1 * review feedback
pyca · Dec 10, 2020 · 1ff0d50 · 1ff0d50
1 parent 7e8fff7
commit 1ff0d50
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,13 +1,18 @@
 Changelog
 =========
 
+.. _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
 ~~~~~~~~~~~~~~~~
 
-.. 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
@@ -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. 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;

diff --git 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
@@ -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"