Skip to content

Commit

Permalink
re-add Cryptography_HAS_TLSEXT_HOSTNAME and bump for 3.3.1 (#5625)
Browse files Browse the repository at this point in the history
* re-add Cryptography_HAS_TLSEXT_HOSTNAME and bump for 3.3.1

* review feedback
  • Loading branch information
reaperhulk authored Dec 10, 2020
1 parent 7e8fff7 commit 1ff0d50
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions src/_cffi_src/openssl/ssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/cryptography/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion vectors/cryptography_vectors/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 1ff0d50

Please sign in to comment.