Error out on OpenSSL 1.0.0 by default (#3276)
* Error out on OpenSSL 1.0.0 by default
* what the heck
diff --git a/docs/faq.rst b/docs/faq.rst
index 2ddc5db..76117a9 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -40,6 +40,19 @@
appear to be at fault, it's possible that this is a bug in ``cryptography``.
Please file an `issue`_ with instructions on how to reproduce it.
+Importing cryptography causes a ``RuntimeError`` about OpenSSL 1.0.0
+--------------------------------------------------------------------
+
+The OpenSSL project has dropped support for the 1.0.0 release series. Since it
+is no longer receiving security patches from upstream, ``cryptography`` is also
+dropping support for it. To fix this issue you should upgrade to a newer
+version of OpenSSL (1.0.1 or later). This may require you to upgrade to a newer
+operating system.
+
+For the 1.7 release, you can set the ``CRYPTOGRAPHY_ALLOW_OPENSSL_100``
+environment variable. Please note that this is *temporary* and will be removed
+in ``cryptography`` 1.8.
+
Installing cryptography with OpenSSL 0.9.8 fails
------------------------------------------------
@@ -49,10 +62,6 @@
version of OpenSSL (1.0.1 or later). This may require you to upgrade to a newer
operating system.
-In ``cryptography`` 1.4, you can set the ``CRYPTOGRAPHY_ALLOW_OPENSSL_098``
-environment variable. Please note that this is *temporary* and is removed in
-``cryptography`` 1.5.
-
.. _`NaCl`: https://nacl.cr.yp.to/
.. _`PyNaCl`: https://pynacl.readthedocs.io
.. _`WSGIApplicationGroup`: https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIApplicationGroup.html
diff --git a/docs/installation.rst b/docs/installation.rst
index 724c63d..e1818d3 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -37,8 +37,8 @@
* ``OpenSSL 1.1.0``
.. warning::
- OpenSSL 1.0.0 is no longer supported by the OpenSSL project. Cryptography
- will drop support for it in the next release.
+ Cryptography 1.7 has dropped support for OpenSSL 1.0.0, see the
+ :doc:`FAQ </faq>` for more details
Building cryptography on Windows
--------------------------------