Merge pull request #2684 from alex/deprecated-0.9.8

Formally deprecated support for OpenSSL 0.9.8

4 files changed, 15 insertions, 4 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7c7c5e53..3d3aeb0e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,9 @@ Changelog
 
 .. note:: This version is not yet released and is under active development.
 
+* Deprecated support for OpenSSL 0.9.8. Support will be removed in
+  ``cryptography`` 1.4.
+
 1.2.1 - 2016-01-08
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/installation.rst b/docs/installation.rst
index f9d2261a..1804989b 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -39,8 +39,8 @@ OpenSSL releases:
 
 .. warning::
     OpenSSL versions 0.9.8 and 1.0.0 are no longer supported by the OpenSSL
-    project. A future version of cryptography will drop support for these
-    releases.
+    project. Support for OpenSSL 0.9.8 will be removed in the next
+    ``cryptography`` release.
 
 On Windows
 ----------
diff --git a/src/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py
index 1cfe8162..b2215de3 100644
--- a/src/cryptography/hazmat/bindings/openssl/binding.py
+++ b/src/cryptography/hazmat/bindings/openssl/binding.py
@@ -10,6 +10,7 @@ import threading
 import types
 import warnings
 
+from cryptography import utils
 from cryptography.exceptions import InternalError
 from cryptography.hazmat.bindings._openssl import ffi, lib
 from cryptography.hazmat.bindings.openssl._conditional import CONDITIONAL_NAMES
@@ -204,7 +205,14 @@ class Binding(object):
 # is per module so this approach will not work.
 Binding.init_static_locks()
 
-if Binding.lib.SSLeay() < 0x10001000:
+if Binding.lib.SSLeay() < 0x10000000:
+    warnings.warn(
+        "OpenSSL version 0.9.8 is no longer supported by the OpenSSL project, "
+        "please upgrade. The next version of cryptography will drop support "
+        "for it.",
+        utils.DeprecatedIn12
+    )
+elif Binding.lib.SSLeay() < 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 "
diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py
index b85d50d3..22edd94f 100644
--- a/src/cryptography/utils.py
+++ b/src/cryptography/utils.py
@@ -15,7 +15,7 @@ import warnings
 # the functions deprecated in 1.0 are on an arbitrarily extended deprecation
 # cycle and should not be removed until we agree on when that cycle ends.
 DeprecatedIn10 = DeprecationWarning
-DeprecatedIn12 = PendingDeprecationWarning
+DeprecatedIn12 = DeprecationWarning
 
 
 def read_only_property(name):