From 6ac863b915d8993ddd6fda9321da4cf154f23eda Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 18 Oct 2024 10:33:16 -0400 Subject: [PATCH 1/3] 43.0.2 release: fix libressl 4.0.0 --- .github/workflows/ci.yml | 1 + CHANGELOG.rst | 7 +++++++ pyproject.toml | 4 ++-- src/cryptography/__about__.py | 2 +- src/rust/Cargo.lock | 8 ++++---- vectors/cryptography_vectors/__about__.py | 2 +- vectors/pyproject.toml | 2 +- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71e32e2a3afe..a2c3440eeef3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,7 @@ jobs: - {VERSION: "3.12", NOXSESSION: "tests", NOXARGS: "--enable-fips=1", OPENSSL: {TYPE: "openssl", CONFIG_FLAGS: "enable-fips", VERSION: "3.2.2"}} - {VERSION: "3.12", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "libressl", VERSION: "3.8.4"}} - {VERSION: "3.12", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "libressl", VERSION: "3.9.2"}} + - {VERSION: "3.12", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "libressl", VERSION: "4.0.0"}} - {VERSION: "3.12", NOXSESSION: "tests-randomorder"} # Latest commit on the BoringSSL master branch, as of Jul 18, 2024. - {VERSION: "3.12", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "boringssl", VERSION: "82f9853fc7d7360ae44f1e1357a6422c5244bbd8"}} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bb9043108185..5c90c74e2db4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ Changelog ========= +.. _v43-0-2: + +43.0.2 - 2024-10-18 +~~~~~~~~~~~~~~~~~~~ + +* Fixed compilation when using LibreSSL 4.0.0. + .. _v43-0-1: 43.0.1 - 2024-09-03 diff --git a/pyproject.toml b/pyproject.toml index e5b801df72c6..eaeeaf584988 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ build-backend = "maturin" [project] name = "cryptography" -version = "43.0.1" +version = "43.0.2" authors = [ {name = "The Python Cryptographic Authority and individual contributors", email = "cryptography-dev@python.org"} ] @@ -64,7 +64,7 @@ ssh = ["bcrypt >=3.1.5"] # All the following are used for our own testing. nox = ["nox"] test = [ - "cryptography_vectors==43.0.1", + "cryptography_vectors==43.0.2", "pytest >=6.2.0", "pytest-benchmark", "pytest-cov", diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index d224b2fc6f24..0fe33cf18054 100644 --- a/src/cryptography/__about__.py +++ b/src/cryptography/__about__.py @@ -10,7 +10,7 @@ "__version__", ] -__version__ = "43.0.1" +__version__ = "43.0.2" __author__ = "The Python Cryptographic Authority and individual contributors" diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index c5a020fc8f10..17987be9a8c9 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -179,9 +179,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags", "cfg-if", @@ -205,9 +205,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index fb1bc4d96169..bf5aa68aef68 100644 --- a/vectors/cryptography_vectors/__about__.py +++ b/vectors/cryptography_vectors/__about__.py @@ -6,4 +6,4 @@ "__version__", ] -__version__ = "43.0.1" +__version__ = "43.0.2" diff --git a/vectors/pyproject.toml b/vectors/pyproject.toml index 23f52fcadba4..6cdc07c471bf 100644 --- a/vectors/pyproject.toml +++ b/vectors/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi" [project] name = "cryptography_vectors" -version = "43.0.1" +version = "43.0.2" authors = [ {name = "The Python Cryptographic Authority and individual contributors", email = "cryptography-dev@python.org"} ] From 77e15b9dd254910837a47c88730c36fd270379fd Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 4 Oct 2024 15:23:24 -0500 Subject: [PATCH 2/3] Resolve clippy warnings from nightly (#11695) --- src/rust/cryptography-x509/src/common.rs | 8 ++++---- src/rust/cryptography-x509/src/name.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rust/cryptography-x509/src/common.rs b/src/rust/cryptography-x509/src/common.rs index 0b9555314224..c79ff109bf3e 100644 --- a/src/rust/cryptography-x509/src/common.rs +++ b/src/rust/cryptography-x509/src/common.rs @@ -198,7 +198,7 @@ impl<'a> asn1::Asn1Readable<'a> for RawTlv<'a> { true } } -impl<'a> asn1::Asn1Writable for RawTlv<'a> { +impl asn1::Asn1Writable for RawTlv<'_> { fn write(&self, w: &mut asn1::Writer<'_>) -> asn1::WriteResult { w.write_tlv(self.tag, move |dest| dest.push_slice(self.value)) } @@ -471,7 +471,7 @@ impl<'a> asn1::SimpleAsn1Readable<'a> for UnvalidatedVisibleString<'a> { } } -impl<'a> asn1::SimpleAsn1Writable for UnvalidatedVisibleString<'a> { +impl asn1::SimpleAsn1Writable for UnvalidatedVisibleString<'_> { const TAG: asn1::Tag = asn1::VisibleString::TAG; fn write_data(&self, _: &mut asn1::WriteBuf) -> asn1::WriteResult { unimplemented!(); @@ -487,7 +487,7 @@ impl<'a> Utf8StoredBMPString<'a> { } } -impl<'a> asn1::SimpleAsn1Writable for Utf8StoredBMPString<'a> { +impl asn1::SimpleAsn1Writable for Utf8StoredBMPString<'_> { const TAG: asn1::Tag = asn1::BMPString::TAG; fn write_data(&self, writer: &mut asn1::WriteBuf) -> asn1::WriteResult { for ch in self.0.encode_utf16() { @@ -531,7 +531,7 @@ impl<'a, T: asn1::Asn1Readable<'a>> asn1::Asn1Readable<'a> for WithTlv<'a, T> { } } -impl<'a, T: asn1::Asn1Writable> asn1::Asn1Writable for WithTlv<'a, T> { +impl asn1::Asn1Writable for WithTlv<'_, T> { fn write(&self, w: &mut asn1::Writer<'_>) -> asn1::WriteResult<()> { self.value.write(w) } diff --git a/src/rust/cryptography-x509/src/name.rs b/src/rust/cryptography-x509/src/name.rs index 21b6cc8fca9a..41f097689345 100644 --- a/src/rust/cryptography-x509/src/name.rs +++ b/src/rust/cryptography-x509/src/name.rs @@ -35,7 +35,7 @@ impl<'a> asn1::SimpleAsn1Readable<'a> for UnvalidatedIA5String<'a> { } } -impl<'a> asn1::SimpleAsn1Writable for UnvalidatedIA5String<'a> { +impl asn1::SimpleAsn1Writable for UnvalidatedIA5String<'_> { const TAG: asn1::Tag = asn1::IA5String::TAG; fn write_data(&self, dest: &mut asn1::WriteBuf) -> asn1::WriteResult { dest.push_slice(self.0.as_bytes()) From 3948719da212b84b51acdac00d530c554d99996a Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 18 Oct 2024 10:43:38 -0400 Subject: [PATCH 3/3] backlist some setuptools versions --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index eaeeaf584988..4cb0f3bf5bf3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ requires = [ "cffi>=1.12; platform_python_implementation != 'PyPy'", # Needed because cffi imports distutils, and in Python 3.12, distutils has # been removed from the stdlib, but installing setuptools puts it back. - "setuptools!=74.0.0,!=74.1.0,!=74.1.1", + "setuptools!=74.0.0,!=74.1.0,!=74.1.1,!=74.1.2,!=74.1.3,!=75.0.0,!=75.1.0,!=75.2.0", ] build-backend = "maturin"