summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2022-06-21 14:10:43 -0400
committerGitHub <noreply@github.com>2022-06-21 18:10:43 +0000
commitb71c39202ba2d7dfb7a89215e04946e7fbf92896 (patch)
tree59540c5da897d1b758ba85fcae0ae5acfe641b72
parent5954a52f0900569a83138d71ec1c04971452ea5b (diff)
downloadcryptography-37.0.3.tar.gz
Changelog and version bump for 37.0.3 (#7362)37.0.3
* Changelog and version bump for 37.0.3 * Fix Alpine python version in CI
-rw-r--r--.circleci/config.yml2
-rw-r--r--.github/workflows/ci.yml4
-rw-r--r--CHANGELOG.rst7
-rw-r--r--src/cryptography/__about__.py4
-rw-r--r--src/cryptography/hazmat/backends/openssl/backend.py4
-rw-r--r--vectors/cryptography_vectors/__about__.py2
6 files changed, 16 insertions, 7 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index d3d5d7130..02dd53e40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -74,7 +74,7 @@ workflows:
- linux-arm64:
name: linux-arm64-alpine-ci
image: ghcr.io/pyca/cryptography-runner-alpine:aarch64
- toxenv: py39
+ toxenv: py310
filters:
tags:
only: /.*/
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43da403cc..bc90a2f7c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -148,7 +148,7 @@ jobs:
- {IMAGE: "ubuntu-jammy", TOXENV: "py310"}
- {IMAGE: "ubuntu-rolling", TOXENV: "py310"}
- {IMAGE: "fedora", TOXENV: "py310"}
- - {IMAGE: "alpine", TOXENV: "py39"}
+ - {IMAGE: "alpine", TOXENV: "py310"}
name: "${{ matrix.IMAGE.TOXENV }} on ${{ matrix.IMAGE.IMAGE }}"
timeout-minutes: 15
steps:
@@ -412,7 +412,7 @@ jobs:
run: |
CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 \
LDFLAGS="${HOME}/openssl-macos-x86-64/lib/libcrypto.a ${HOME}/openssl-macos-x86-64/lib/libssl.a" \
- CFLAGS="-I${HOME}/openssl-macos-x86-64/include -Werror -Wno-error=deprecated-declarations -Wno-error=incompatible-pointer-types-discards-qualifiers -Wno-error=unused-function -Wno-error=unused-command-line-argument -mmacosx-version-min=10.10 -march=core2 $EXTRA_CFLAGS" \
+ CFLAGS="-I${HOME}/openssl-macos-x86-64/include -Werror -Wno-error=deprecated-declarations -Wno-error=incompatible-pointer-types-discards-qualifiers -Wno-error=unused-function -Wno-error=unused-command-line-argument -mmacosx-version-min=10.10 $EXTRA_CFLAGS" \
tox -vvv -r -- --color=yes --wycheproof-root=wycheproof
env:
TOXENV: ${{ matrix.PYTHON.TOXENV }}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7b66e4c4b..d52a0ee41 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,13 @@
Changelog
=========
+.. _v37-0-3:
+
+37.0.3 - 2022-06-21
+~~~~~~~~~~~~~~~~~~~
+
+* Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 3.0.4.
+
.. _v37-0-2:
37.0.2 - 2022-05-03
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 5bf8b6669..b581d90b6 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -9,7 +9,7 @@ __all__ = [
"__copyright__",
]
-__version__ = "37.0.2"
+__version__ = "37.0.3"
__author__ = "The Python Cryptographic Authority and individual contributors"
-__copyright__ = "Copyright 2013-2021 {}".format(__author__)
+__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 bf34946cb..42fb44648 100644
--- a/src/cryptography/hazmat/backends/openssl/backend.py
+++ b/src/cryptography/hazmat/backends/openssl/backend.py
@@ -713,7 +713,9 @@ class Backend:
return _DSAPublicKey(self, dsa_cdata, evp_pkey)
elif key_type == self._lib.EVP_PKEY_EC:
ec_cdata = self._lib.EVP_PKEY_get1_EC_KEY(evp_pkey)
- self.openssl_assert(ec_cdata != self._ffi.NULL)
+ if ec_cdata == self._ffi.NULL:
+ errors = self._consume_errors_with_text()
+ raise ValueError("Unable to load EC key", errors)
ec_cdata = self._ffi.gc(ec_cdata, self._lib.EC_KEY_free)
return _EllipticCurvePublicKey(self, ec_cdata, evp_pkey)
elif key_type in self._dh_types:
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index de175e38d..5af72d578 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -6,4 +6,4 @@ __all__ = [
"__version__",
]
-__version__ = "37.0.2"
+__version__ = "37.0.3"