Skip to content

Commit

Permalink
43.0.2 release: fix libressl 4.0.0 (#11796)
Browse files Browse the repository at this point in the history
* 43.0.2 release: fix libressl 4.0.0

* Resolve clippy warnings from nightly (#11695)

* backlist some setuptools versions
  • Loading branch information
alex authored Oct 18, 2024
1 parent a773387 commit 9a3cdb5
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 15 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ 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"

[project]
name = "cryptography"
version = "43.0.1"
version = "43.0.2"
authors = [
{name = "The Python Cryptographic Authority and individual contributors", email = "[email protected]"}
]
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/cryptography/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"__version__",
]

__version__ = "43.0.1"
__version__ = "43.0.2"


__author__ = "The Python Cryptographic Authority and individual contributors"
Expand Down
8 changes: 4 additions & 4 deletions src/rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/rust/cryptography-x509/src/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down Expand Up @@ -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!();
Expand All @@ -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() {
Expand Down Expand Up @@ -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<T: asn1::Asn1Writable> asn1::Asn1Writable for WithTlv<'_, T> {
fn write(&self, w: &mut asn1::Writer<'_>) -> asn1::WriteResult<()> {
self.value.write(w)
}
Expand Down
2 changes: 1 addition & 1 deletion src/rust/cryptography-x509/src/name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion vectors/cryptography_vectors/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"__version__",
]

__version__ = "43.0.1"
__version__ = "43.0.2"
2 changes: 1 addition & 1 deletion vectors/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "[email protected]"}
]
Expand Down

0 comments on commit 9a3cdb5

Please sign in to comment.