8000 38.0.2 release (#7691) · pyca/cryptography@277ee0d · GitHub
[go: up one dir, main page]
Skip to content

Commit 277ee0d

Browse files
reaperhulkreaperhulk
authored
38.0.2 release (#7691)
* upgrade openssl in CI and patch around 3.0.6 bug * changelog and version bump for 38.0.2
1 parent ce119b8 commit 277ee0d

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

‎.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ jobs:
2828
PYTHON:
2929
- {VERSION: "3.10", TOXENV: "flake"}
3030
- {VERSION: "3.10", TOXENV: "rust"}
31-
- {VERSION: "3.10", TOXENV: "docs", OPENSSL: {TYPE: "openssl", VERSION: "3.0.5"}}
31+
- {VERSION: "3.10", TOXENV: "docs", OPENSSL: {TYPE: "openssl", VERSION: "3.0.6"}}
3232
- {VERSION: "pypy-3.7", TOXENV: "pypy3-nocoverage"}
3333
- {VERSION: "pypy-3.8", TOXENV: "pypy3-nocoverage"}
3434
- {VERSION: "pypy-3.9", TOXENV: "pypy3-nocoverage"}
3535
- {VERSION: "3.10", TOXENV: "py310", OPENSSL: {TYPE: "openssl", VERSION: "1.1.0l"}}
36-
- {VERSION: "3.10", TOXENV: "py310", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1q"}}
37-
- {VERSION: "3.10", TOXENV: "py310-ssh", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1q"}}
38-
- {VERSION: "3.10", TOXENV: "py310", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1q", CONFIG_FLAGS: "no-engine no-rc2 no-srtp no-ct no-psk"}}
39-
- {VERSION: "3.10", TOXENV: "py310", OPENSSL: {TYPE: "openssl", VERSION: "3.0.5"}}
40-
- {VERSION: "3.10", TOXENV: "py310", TOXARGS: "--enable-fips=1", OPENSSL: {TYPE: "openssl", CONFIG_FLAGS: "enable-fips", VERSION: "3.0.5"}}
36+
- {VERSION: "3.10", TOXENV: "py310", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1r"}}
37+
- {VERSION: "3.10", TOXENV: "py310-ssh", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1r"}}
38+
- {VERSION: "3.10", TOXENV: "py310", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1r", CONFIG_FLAGS: "no-engine no-rc2 no-srtp no-ct no-psk"}}
39+
- {VERSION: "3.10", TOXENV: "py310", OPENSSL: {TYPE: "openssl", VERSION: "3.0.6"}}
40+
- {VERSION: "3.10", TOXENV: "py310", TOXARGS: "--enable-fips=1", OPENSSL: {TYPE: "openssl", CONFIG_FLAGS: "enable-fips", VERSION: "3.0.6"}}
4141
- {VERSION: "3.10", TOXENV: "py310", OPENSSL: {TYPE: "libressl", VERSION: "3.1.5"}}
4242
- {VERSION: "3.10", TOXENV: "py310", OPENSSL: {TYPE: "libressl", VERSION: "3.2.7"}}
4343
- {VERSION: "3.10", TOXENV: "py310", OPENSSL: {TYPE: "libressl", VERSION: "3.3.6"}}

‎CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Changelog
22
=========
33

4+
.. _v38-0-2:
5+
6+
38.0.2 - 2022-10-11
7+
~~~~~~~~~~~~~~~~~~~
8+
9+
* Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 3.0.6.
10+
411
.. _v38-0-1:
512

613
38.0.1 - 2022-09-07

‎src/cryptography/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"__copyright__",
1010
]
1111

12-
__version__ = "38.0.1"
12+
__version__ = "38.0.2"
1313

1414
__author__ = "The Python Cryptographic Authority and individual contributors"
1515
__copyright__ = "Copyright 2013-2022 {}".format(__author__)

‎src/cryptography/hazmat/backends/openssl/backend.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2190,14 +2190,11 @@ def load_pkcs12(
21902190
res = self._lib.PKCS12_parse(
21912191
p12, password_buf, evp_pkey_ptr, x509_ptr, sk_x509_ptr
21922192
)
2193-
2194-
# Workaround for
2195-
# https://github.com/libressl-portable/portable/issues/659
2196-
if self._lib.CRYPTOGRAPHY_LIBRESSL_LESS_THAN_340:
2197-
self._consume_errors()
2198-
2193+
# OpenSSL 3.0.6 leaves errors on the stack even in success, so
2194+
# we consume all errors unconditionally.
2195+
# https://github.com/openssl/openssl/issues/19389
2196+
self._consume_errors()
21992197
if res == 0:
2200-
self._consume_errors()
22012198
raise ValueError("Invalid password or PKCS12 data")
22022199

22032200
cert = None

‎vectors/cryptography_vectors/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
"__version__",
77
]
88

9-
__version__ = "38.0.1"
9+
__version__ = "38.0.2"

0 commit comments

Comments
 (0)
0