diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2022-10-11 10:50:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-11 13:50:52 -0400 |
| commit | 277ee0d58c6c8cfc9517df35c8a020bea33bddf4 (patch) | |
| tree | 53e92cde5ee4027f21c1868c925820c4ce03f3c3 /src/cryptography | |
| parent | ce119b8e72bee2809a8782b4218e32f04ea5f3a2 (diff) | |
| download | cryptography-277ee0d58c6c8cfc9517df35c8a020bea33bddf4.tar.gz | |
38.0.2 release (#7691)38.0.2
* upgrade openssl in CI and patch around 3.0.6 bug
* changelog and version bump for 38.0.2
Diffstat (limited to 'src/cryptography')
| -rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 96d8768c1..1fe833a9c 100644 --- a/src/cryptography/__about__.py +++ b/src/cryptography/__about__.py @@ -9,7 +9,7 @@ __all__ = [ "__copyright__", ] -__version__ = "38.0.1" +__version__ = "38.0.2" __author__ = "The Python Cryptographic Authority and individual contributors" __copyright__ = "Copyright 2013-2022 {}".format(__author__) diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index 7cc7f97bb..f8776b732 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -2190,14 +2190,11 @@ class Backend: res = self._lib.PKCS12_parse( p12, password_buf, evp_pkey_ptr, x509_ptr, sk_x509_ptr ) - - # Workaround for - # https://github.com/libressl-portable/portable/issues/659 - if self._lib.CRYPTOGRAPHY_LIBRESSL_LESS_THAN_340: - self._consume_errors() - + # OpenSSL 3.0.6 leaves errors on the stack even in success, so + # we consume all errors unconditionally. + # https://github.com/openssl/openssl/issues/19389 + self._consume_errors() if res == 0: - self._consume_errors() raise ValueError("Invalid password or PKCS12 data") cert = None |