From 43b8b7910d7557aa41e98efeab34be23657fc15c Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 25 Feb 2024 18:04:40 -0500 Subject: [PATCH] Raise MSRV to 1.65 (#10481) --- .github/workflows/ci.yml | 7 ++----- CHANGELOG.rst | 1 + docs/installation.rst | 4 ++-- pyproject.toml | 2 +- src/rust/Cargo.toml | 2 +- src/rust/cryptography-cffi/Cargo.toml | 2 +- src/rust/cryptography-key-parsing/Cargo.toml | 2 +- src/rust/cryptography-openssl/Cargo.toml | 2 +- src/rust/cryptography-x509-verification/Cargo.toml | 2 +- src/rust/cryptography-x509/Cargo.toml | 2 +- 10 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9080d862f888..cc199c75c5fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,11 +47,8 @@ jobs: # Latest commit on the OpenSSL master branch, as of Feb 23, 2024. - {VERSION: "3.12", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "11adf9a75d6b34723d1a20a0da4e4100ea6ca593"}} # Builds with various Rust versions. Includes MSRV and next - # potential future MSRV: - # 1.64 - maturin, workspace inheritance - # 1.65 - Generic associated types (GATs), std::backtrace - - {VERSION: "3.12", NOXSESSION: "rust-noclippy,tests", RUST: "1.63.0"} - - {VERSION: "3.12", NOXSESSION: "rust,tests", RUST: "1.64.0"} + # potential future MSRV. + - {VERSION: "3.12", NOXSESSION: "rust,tests", RUST: "1.65.0"} - {VERSION: "3.12", NOXSESSION: "rust,tests", RUST: "beta"} - {VERSION: "3.12", NOXSESSION: "rust,tests", RUST: "nightly"} timeout-minutes: 15 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7fa93101a919..fa4812dbb2dd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,7 @@ Changelog * **BACKWARDS INCOMPATIBLE:** Support for OpenSSL less than 1.1.1e has been removed. Users on older version of OpenSSL will need to upgrade. * **BACKWARDS INCOMPATIBLE:** Dropped support for LibreSSL < 3.8. +* Updated the minimum supported Rust version (MSRV) to 1.65.0, from 1.63.0. * :func:`~cryptography.hazmat.primitives.asymmetric.rsa.generate_private_key` now enforces a minimum RSA key size of 1024-bit. Note that 1024-bit is still considered insecure, users should generally use a key size of 2048-bits. diff --git a/docs/installation.rst b/docs/installation.rst index 6994aa0216f8..c97dfaeab41c 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -134,7 +134,7 @@ Fedora/RHEL/CentOS .. warning:: For RHEL and CentOS you must be on version 8.8 or newer for the command - below to install a sufficiently new Rust. If your Rust is less than 1.63.0 + below to install a sufficiently new Rust. If your Rust is less than 1.65.0 please see the :ref:`Rust installation instructions ` for information about installing a newer Rust. @@ -312,7 +312,7 @@ Rust a Rust toolchain. Building ``cryptography`` requires having a working Rust toolchain. The current -minimum supported Rust version is 1.63.0. **This is newer than the Rust some +minimum supported Rust version is 1.65.0. **This is newer than the Rust some package managers ship**, so users may need to install with the instructions below. diff --git a/pyproject.toml b/pyproject.toml index 886b99bd0722..64e33aac8aca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -90,7 +90,7 @@ pep8test = ["ruff", "mypy", "check-sdist", "click"] target = "cryptography.hazmat.bindings._rust" path = "src/rust/Cargo.toml" py-limited-api = "auto" -rust-version = ">=1.63.0" +rust-version = ">=1.65.0" [tool.pytest.ini_options] diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index aa533bf210c3..96ea8425ec45 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The cryptography developers "] edition = "2021" publish = false # This specifies the MSRV -rust-version = "1.63.0" +rust-version = "1.65.0" [dependencies] once_cell = "1" diff --git a/src/rust/cryptography-cffi/Cargo.toml b/src/rust/cryptography-cffi/Cargo.toml index 1c498f96932b..e4cd77756121 100644 --- a/src/rust/cryptography-cffi/Cargo.toml +++ b/src/rust/cryptography-cffi/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The cryptography developers "] edition = "2021" publish = false # This specifies the MSRV -rust-version = "1.63.0" +rust-version = "1.65.0" [dependencies] pyo3 = { version = "0.20", features = ["abi3"] } diff --git a/src/rust/cryptography-key-parsing/Cargo.toml b/src/rust/cryptography-key-parsing/Cargo.toml index fdde0053df4c..138ff6cd7984 100644 --- a/src/rust/cryptography-key-parsing/Cargo.toml +++ b/src/rust/cryptography-key-parsing/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The cryptography developers "] edition = "2021" publish = false # This specifies the MSRV -rust-version = "1.63.0" +rust-version = "1.65.0" [dependencies] asn1 = { version = "0.16.0", default-features = false } diff --git a/src/rust/cryptography-openssl/Cargo.toml b/src/rust/cryptography-openssl/Cargo.toml index 0da98d70dda2..cfec09f6abdf 100644 --- a/src/rust/cryptography-openssl/Cargo.toml +++ b/src/rust/cryptography-openssl/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The cryptography developers "] edition = "2021" publish = false # This specifies the MSRV -rust-version = "1.63.0" +rust-version = "1.65.0" [dependencies] cfg-if = "1" diff --git a/src/rust/cryptography-x509-verification/Cargo.toml b/src/rust/cryptography-x509-verification/Cargo.toml index 2ec541fb2af0..5ba846878633 100644 --- a/src/rust/cryptography-x509-verification/Cargo.toml +++ b/src/rust/cryptography-x509-verification/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The cryptography developers "] edition = "2021" publish = false # This specifies the MSRV -rust-version = "1.63.0" +rust-version = "1.65.0" [dependencies] asn1 = { version = "0.16.0", default-features = false } diff --git a/src/rust/cryptography-x509/Cargo.toml b/src/rust/cryptography-x509/Cargo.toml index 86d6b971488d..cf6df6f3d3c4 100644 --- a/src/rust/cryptography-x509/Cargo.toml +++ b/src/rust/cryptography-x509/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The cryptography developers "] edition = "2021" publish = false # This specifies the MSRV -rust-version = "1.63.0" +rust-version = "1.65.0" [dependencies] asn1 = { version = "0.16.0", default-features = false }