aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-08-26 22:11:50 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-08-27 10:11:50 +0800
commit3b83fc21eb1abe1b53efe5f6920885676158be5c (patch)
treeb86b211fc54dfcf7b9e9e8f61d162beee7cddd0d
parentf25e63d272e9e785717ecec9af8ef0b0d1140130 (diff)
downloadcryptography-3b83fc21eb1abe1b53efe5f6920885676158be5c.tar.gz
cryptography-3b83fc21eb1abe1b53efe5f6920885676158be5c.tar.bz2
cryptography-3b83fc21eb1abe1b53efe5f6920885676158be5c.zip
Refs #3002 -- clearly document that OpenSSL 1.0 support will be removed in the next release. (#3113)
-rw-r--r--docs/installation.rst2
-rw-r--r--src/cryptography/hazmat/bindings/openssl/binding.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/installation.rst b/docs/installation.rst
index 3d10c367..330817c7 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -38,7 +38,7 @@ OpenSSL releases:
.. warning::
OpenSSL 1.0.0 is no longer supported by the OpenSSL project. Cryptography
- will drop support for it in a future release.
+ will drop support for it in the next release.
On Windows
----------
diff --git a/src/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py
index 2b9dca5c..e788502d 100644
--- a/src/cryptography/hazmat/bindings/openssl/binding.py
+++ b/src/cryptography/hazmat/bindings/openssl/binding.py
@@ -219,9 +219,9 @@ class Binding(object):
def _verify_openssl_version(version):
if version < 0x10001000:
warnings.warn(
- "OpenSSL versions less than 1.0.1 are no longer supported by the "
- "OpenSSL project, please upgrade. A future version of "
- "cryptography will drop support for these versions of OpenSSL.",
+ "OpenSSL version 1.0.0 is no longer supported by the OpenSSL "
+ "project, please upgrade. The next version of cryptography will "
+ "drop support for it.",
DeprecationWarning
)