From 0e8cdf1023f6e2045de444b1c7e09f40cccf019e Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 13 Dec 2016 21:05:35 -0500 Subject: Drop 1.0.0 (#3312) * delete the 1.0.0 support * drop the version check * drop the AES-CTR stuff * Update the example * openssl truncates for us now * delete unused test * unused imports * Remove a bunch of conditional bindings for NPN * no more 1.0.0 builders * libressl fix * update the docs * remove dead branches * oops * this is a word, damnit * spelling * try removing this * this test is not needed * unused import --- docs/development/c-bindings.rst | 4 ++-- docs/faq.rst | 29 ++++++++--------------------- docs/hazmat/backends/openssl.rst | 2 +- docs/hazmat/bindings/openssl.rst | 2 +- docs/installation.rst | 5 ----- 5 files changed, 12 insertions(+), 30 deletions(-) (limited to 'docs') diff --git a/docs/development/c-bindings.rst b/docs/development/c-bindings.rst index cbd8fab0..d76154d5 100644 --- a/docs/development/c-bindings.rst +++ b/docs/development/c-bindings.rst @@ -183,9 +183,9 @@ Caveats Sometimes, a set of loosely related features are added in the same version, and it's impractical to create ``#ifdef`` statements for each one. In that case, it may make sense to either check for a particular -version. For example, to check for OpenSSL 1.0.0 or newer:: +version. For example, to check for OpenSSL 1.1.0 or newer:: - #if OPENSSL_VERSION_NUMBER >= 0x10000000L + #if OPENSSL_VERSION_NUMBER >= 0x10100000L Sometimes, the version of a library on a particular platform will have features that you thought it wouldn't, based on its version. diff --git a/docs/faq.rst b/docs/faq.rst index 76117a91..bbcf302e 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -40,27 +40,14 @@ If you have no other libraries using OpenSSL in your process, or they do not 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 ------------------------------------------------- - -The OpenSSL project has dropped support for the 0.9.8 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. +Installing cryptography with OpenSSL 0.9.8 or 1.0.0 fails +--------------------------------------------------------- + +The OpenSSL project has dropped support for the 0.9.8 and 1.0.0 release series. +Since they are no longer receiving security patches from upstream, +``cryptography`` is also dropping support for them. 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. .. _`NaCl`: https://nacl.cr.yp.to/ .. _`PyNaCl`: https://pynacl.readthedocs.io diff --git a/docs/hazmat/backends/openssl.rst b/docs/hazmat/backends/openssl.rst index f97ec571..e293c064 100644 --- a/docs/hazmat/backends/openssl.rst +++ b/docs/hazmat/backends/openssl.rst @@ -3,7 +3,7 @@ OpenSSL backend =============== -The `OpenSSL`_ C library. Cryptography supports OpenSSL version ``1.0.0`` and +The `OpenSSL`_ C library. Cryptography supports OpenSSL version 1.0.1 and greater. .. data:: cryptography.hazmat.backends.openssl.backend diff --git a/docs/hazmat/bindings/openssl.rst b/docs/hazmat/bindings/openssl.rst index 482cfaf8..ac65aa97 100644 --- a/docs/hazmat/bindings/openssl.rst +++ b/docs/hazmat/bindings/openssl.rst @@ -6,7 +6,7 @@ OpenSSL binding .. currentmodule:: cryptography.hazmat.bindings.openssl.binding These are `CFFI`_ bindings to the `OpenSSL`_ C library. Cryptography supports -OpenSSL version ``1.0.0`` and greater. +OpenSSL version 1.0.1 and greater. .. class:: cryptography.hazmat.bindings.openssl.binding.Binding() diff --git a/docs/installation.rst b/docs/installation.rst index 9ad9a3cc..31116ff7 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -28,7 +28,6 @@ Currently we test ``cryptography`` on Python 2.6, 2.7, 3.3, 3.4, 3.5, and PyPy We test compiling with ``clang`` as well as ``gcc`` and use the following OpenSSL releases: -* ``OpenSSL 1.0.0-fips`` (``RHEL/CentOS 6.4``) * ``OpenSSL 1.0.1`` * ``OpenSSL 1.0.1e-fips`` (``RHEL/CentOS 7``) * ``OpenSSL 1.0.1j-freebsd`` @@ -36,10 +35,6 @@ OpenSSL releases: * ``OpenSSL 1.0.2-latest`` * ``OpenSSL 1.1.0`` -.. warning:: - Cryptography 1.7 has dropped support for OpenSSL 1.0.0, see the - :doc:`FAQ ` for more details - Building cryptography on Windows -------------------------------- -- cgit v1.2.3