Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

re-add Cryptography_HAS_TLSEXT_HOSTNAME and bump for 3.3.1 #5625

Merged
merged 2 commits into from Dec 10, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions CHANGELOG.rst
@@ -1,13 +1,18 @@
Changelog
=========

.. _v3-3-1:

3.3 - 2020-12-09
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol

~~~~~~~~~~~~~~~~

* 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
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.
static const long Cryptography_HAS_TLSEXT_HOSTNAME = 1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add one of our deprecation symbols here in a comment, so we remember to grep for it?


#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
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
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