From 9e5714bb1cee6a6aa9b015c4855c2ed9d8e54f94 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 22 Apr 2022 08:54:29 -0400
Subject: [PATCH] Be clear that OpenSSL 1.1.0 is going bye bye (#7108)

---
 CHANGELOG.rst                                       | 4 ++--
 src/cryptography/hazmat/bindings/openssl/binding.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3cfae0bd45da..bb9bbe59e15b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -16,8 +16,8 @@ Changelog
   deprecated in version 2.0, but had an extended deprecation timeline due
   to usage. Any remaining users should transition to ``sign`` and ``verify``.
 * Deprecated OpenSSL 1.1.0 support. OpenSSL 1.1.0 is no longer supported by
-  the OpenSSL project. Support for compiling with OpenSSL 1.1.0 will be
-  removed in a future ``cryptography`` release.
+  the OpenSSL project. The next release of ``cryptography`` will be the last
+  to support compiling with OpenSSL 1.1.0.
 * Deprecated Python 3.6 support. Python 3.6 is no longer supported by the
   Python core team. Support for Python 3.6 will be removed in a future
   ``cryptography`` release.
diff --git a/src/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py
index 21e1b71f32e4..a6fbc946d827 100644
--- a/src/cryptography/hazmat/bindings/openssl/binding.py
+++ b/src/cryptography/hazmat/bindings/openssl/binding.py
@@ -196,8 +196,8 @@ def _verify_openssl_version(lib):
     ):
         warnings.warn(
             "OpenSSL version 1.1.0 is no longer supported by the OpenSSL "
-            "project, please upgrade. A future version of cryptography will "
-            "drop support for it.",
+            "project, please upgrade. The next release of cryptography will "
+            "be the last to support compiling with OpenSSL 1.1.0.",
             utils.DeprecatedIn37,
         )