Skip to content

Commit d3eae8d

Browse files
alexalex
authored
Delete all the 1.0.2 code (pyca#5511)
1 parent 558cf91 commit d3eae8d

34 files changed

Lines changed: 61 additions & 610 deletions

‎.readthedocs.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: 2
2+
3+
build:
4+
image: "7.0"
5+

‎.travis.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ matrix:
3131
env: TOXENV=pypy-nocoverage
3232
- python: pypy3.6-7.3.1
3333
env: TOXENV=pypy3-nocoverage
34-
- python: 3.8
35-
env: TOXENV=py38 OPENSSL=1.0.2u
3634
- python: 2.7
3735
env: TOXENV=py27 OPENSSL=1.1.0l
3836
- python: 2.7
@@ -56,9 +54,6 @@ matrix:
5654
- python: 3.8
5755
env: TOXENV=py38 LIBRESSL=3.2.2
5856

59-
- python: 2.7
60-
services: docker
61-
env: TOXENV=py27 DOCKER=pyca/cryptography-runner-centos7
6257
- python: 2.7
6358
services: docker
6459
env: TOXENV=py27 DOCKER=pyca/cryptography-runner-centos8

‎MANIFEST.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exclude .travis.yml .travis
2020
recursive-exclude .travis *
2121
recursive-exclude .github *
2222

23-
exclude release.py .coveragerc codecov.yml dev-requirements.txt rtd-requirements.txt tox.ini
23+
exclude release.py .coveragerc codecov.yml .readthedocs.yml dev-requirements.txt rtd-requirements.txt tox.ini
2424

2525
recursive-exclude .zuul.d *
2626
recursive-exclude .zuul.playbooks *

‎docs/development/c-bindings.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ Caveats
189189
Sometimes, a set of loosely related features are added in the same
190190
version, and it's impractical to create ``#ifdef`` statements for each
191191
one. In that case, it may make sense to either check for a particular
192-
version. For example, to check for OpenSSL 1.1.0 or newer::
192+
version. For example, to check for OpenSSL 1.1.1 or newer::
193193

194-
#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER
194+
#if CRYPTOGRAPHY_OPENSSL_111_OR_GREATER
195195

196196
Sometimes, the version of a library on a particular platform will have
197197
features that you thought it wouldn't, based on its version.

‎docs/faq.rst‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -109,27 +109,14 @@ Your ``pip`` and/or ``setuptools`` are outdated. Please upgrade to the latest
109109
versions with ``pip install -U pip setuptools`` (or on Windows
110110
``python -m pip install -U pip setuptools``).
111111

112-
Importing cryptography causes a ``RuntimeError`` about OpenSSL 1.0.2
113-
--------------------------------------------------------------------
114-
115-
The OpenSSL project has dropped support for the 1.0.2 release series. Since it
116-
is no longer receiving security patches from upstream, ``cryptography`` is also
117-
dropping support for it. To fix this issue you should upgrade to a newer
118-
version of OpenSSL (1.1.0 or later). This may require you to upgrade to a newer
119-
operating system.
120-
121-
For the 3.2 release, you can set the ``CRYPTOGRAPHY_ALLOW_OPENSSL_102``
122-
environment variable. Please note that this is *temporary* and will be removed
123-
in ``cryptography`` 3.3.
124-
125-
Installing cryptography with OpenSSL 0.9.8, 1.0.0, 1.0.1 fails
126-
--------------------------------------------------------------
127-
128-
The OpenSSL project has dropped support for the 0.9.8, 1.0.0, and 1.0.1 release
129-
series. Since they are no longer receiving security patches from upstream,
130-
``cryptography`` is also dropping support for them. To fix this issue you
131-
should upgrade to a newer version of OpenSSL (1.0.2 or later). This may require
132-
you to upgrade to a newer operating system.
112+
Installing cryptography with OpenSSL 0.9.8, 1.0.0, 1.0.1, 1.0.2 fails
113+
---------------------------------------------------------------------
114+
115+
The OpenSSL project has dropped support for the 0.9.8, 1.0.0, 1.0.1, and 1.0.2
116+
release series. Since they are no longer receiving security patches from
117+
upstream, ``cryptography`` is also dropping support for them. To fix this issue
118+
you should upgrade to a newer version of OpenSSL (1.1.0 or later). This may
119+
require you to upgrade to a newer operating system.
133120

134121
Why are there no wheels for Python 3.6+ on Linux or macOS?
135122
----------------------------------------------------------

‎docs/hazmat/backends/openssl.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
OpenSSL backend
44
===============
55

6-
The `OpenSSL`_ C library. Cryptography supports OpenSSL version 1.0.2 and
6+
The `OpenSSL`_ C library. Cryptography supports OpenSSL version 1.1.0 and
77
greater.
88

99
.. data:: cryptography.hazmat.backends.openssl.backend

‎docs/installation.rst‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,9 @@ PyPy 7.3.1, and PyPy3 7.3.1 on these operating systems.
2727
We test compiling with ``clang`` as well as ``gcc`` and use the following
2828
OpenSSL releases:
2929

30-
* ``OpenSSL 1.0.2-latest``
3130
* ``OpenSSL 1.1.0-latest``
3231
* ``OpenSSL 1.1.1-latest``
3332

34-
.. warning::
35-
36-
Cryptography 3.2 has dropped support for OpenSSL 1.0.2, see the
37-
:doc:`FAQ </faq>` for more details
3833

3934
Building cryptography on Windows
4035
--------------------------------

‎src/_cffi_src/build_openssl.py‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,15 @@ def _get_openssl_libraries(platform):
2222
return []
2323
# OpenSSL goes by a different library name on different operating systems.
2424
if platform == "win32" and compiler_type() == "msvc":
25-
windows_link_legacy_openssl = os.environ.get(
26-
"CRYPTOGRAPHY_WINDOWS_LINK_LEGACY_OPENSSL", None
27-
)
28-
if windows_link_legacy_openssl is None:
29-
# Link against the 1.1.0 names
30-
# CRYPTOGRAPHY_OPENSSL_110_OR_GREATER
31-
libs = ["libssl", "libcrypto"]
32-
else:
33-
# Link against the 1.0.2 and lower names
34-
libs = ["libeay32", "ssleay32"]
35-
return libs + ["advapi32", "crypt32", "gdi32", "user32", "ws2_32"]
25+
return [
26+
"libssl",
27+
"libcrypto",
28+
"advapi32",
29+
"crypt32",
30+
"gdi32",
31+
"user32",
32+
"ws2_32",
33+
]
3634
else:
3735
# darwin, linux, mingw all use this path
3836
# In some circumstances, the order in which these libs are

‎src/_cffi_src/openssl/bio.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,4 @@
4141
"""
4242

4343
CUSTOMIZATIONS = """
44-
#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_IS_LIBRESSL
45-
int BIO_up_ref(BIO *b) {
46-
CRYPTO_add(&b->references, 1, CRYPTO_LOCK_BIO);
47-
return 1;
48-
}
49-
#endif
5044
"""

‎src/_cffi_src/openssl/callbacks.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
using CPython APIs by Armin Rigo of the PyPy project.
5252
*/
5353
54-
#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110
54+
#if CRYPTOGRAPHY_IS_LIBRESSL
5555
#ifdef _WIN32
5656
typedef CRITICAL_SECTION Cryptography_mutex;
5757
static __inline void cryptography_mutex_init(Cryptography_mutex *mutex) {

0 commit comments

Comments
 (0)