From 4284073f0454b9bb2fbbf0a408a1b9345a58e68d Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Sat, 28 Sep 2024 12:11:22 -0600 Subject: [PATCH] MSRV 1.81 fixups (#1676) The MSRVs for dependent crates did not get bumped before #1660 was merged. This bumps them accordingly. --- .github/workflows/aead.yml | 4 ++-- .github/workflows/async-signature.yml | 3 +-- .github/workflows/cipher.yml | 4 ++-- .github/workflows/digest.yml | 10 +++++----- .github/workflows/elliptic-curve.yml | 4 ++-- .github/workflows/signature.yml | 10 ++++------ .github/workflows/universal-hash.yml | 4 ++-- Cargo.toml | 1 + aead/Cargo.toml | 2 +- aead/README.md | 4 ++-- cipher/Cargo.toml | 4 ++-- cipher/README.md | 4 ++-- digest/Cargo.toml | 2 +- digest/README.md | 4 ++-- elliptic-curve/Cargo.toml | 2 +- elliptic-curve/README.md | 4 ++-- universal-hash/Cargo.toml | 2 +- universal-hash/README.md | 4 ++-- 18 files changed, 35 insertions(+), 37 deletions(-) diff --git a/.github/workflows/aead.yml b/.github/workflows/aead.yml index 11f47906..dc3476c0 100644 --- a/.github/workflows/aead.yml +++ b/.github/workflows/aead.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.65.0 # MSRV + - 1.81.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -52,7 +52,7 @@ jobs: strategy: matrix: rust: - - 1.65.0 # MSRV + - 1.81.0 # MSRV - stable steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/async-signature.yml b/.github/workflows/async-signature.yml index 468c2028..dbef8e7b 100644 --- a/.github/workflows/async-signature.yml +++ b/.github/workflows/async-signature.yml @@ -42,7 +42,7 @@ jobs: strategy: matrix: rust: - - 1.75.0 # MSRV + - 1.81.0 # Minimum Rust version the tests pass on - stable steps: - uses: actions/checkout@v4 @@ -50,7 +50,6 @@ jobs: - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust }} - - run: cargo check --all-features - run: cargo test --release - run: cargo test --all-features --release diff --git a/.github/workflows/cipher.yml b/.github/workflows/cipher.yml index aecc168a..0c1d3d17 100644 --- a/.github/workflows/cipher.yml +++ b/.github/workflows/cipher.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: rust: - - 1.65.0 # MSRV + - 1.81.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -57,7 +57,7 @@ jobs: strategy: matrix: rust: - - 1.65.0 # MSRV + - 1.81.0 # MSRV - stable steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/digest.yml b/.github/workflows/digest.yml index be157840..75a70b20 100644 --- a/.github/workflows/digest.yml +++ b/.github/workflows/digest.yml @@ -2,9 +2,9 @@ name: digest on: pull_request: - paths: - - "digest/**" - - "Cargo.*" + paths: + - "digest/**" + - "Cargo.*" push: branches: master @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.71.0 # MSRV + - 1.81.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -47,7 +47,7 @@ jobs: strategy: matrix: rust: - - 1.71.0 # MSRV + - 1.81.0 # MSRV - stable steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/elliptic-curve.yml b/.github/workflows/elliptic-curve.yml index 6bbf9af4..082155f0 100644 --- a/.github/workflows/elliptic-curve.yml +++ b/.github/workflows/elliptic-curve.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: rust: - - 1.73.0 # MSRV + - 1.81.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -75,7 +75,7 @@ jobs: strategy: matrix: rust: - - 1.73.0 # MSRV + - 1.81.0 # MSRV - stable - nightly steps: diff --git a/.github/workflows/signature.yml b/.github/workflows/signature.yml index fba9726b..c2dfd14a 100644 --- a/.github/workflows/signature.yml +++ b/.github/workflows/signature.yml @@ -38,9 +38,8 @@ jobs: targets: ${{ matrix.target }} - run: cargo build --target ${{ matrix.target }} --release --no-default-features - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features derive - - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features digest - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features rand_core - - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features derive,digest,rand_core + - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features derive,rand_core minimal-versions: uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master @@ -52,7 +51,7 @@ jobs: strategy: matrix: rust: - - 1.72.0 # MSRV + - 1.81.0 # Minimum Rust version the tests pass on - stable steps: - uses: actions/checkout@v4 @@ -60,10 +59,9 @@ jobs: - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust }} - - run: cargo check --all-features - - run: cargo test --no-default-features --release + - run: cargo test --release --no-default-features - run: cargo test --release - - run: cargo test --all-features --release + - run: cargo test --release --all-features derive: runs-on: ubuntu-latest diff --git a/.github/workflows/universal-hash.yml b/.github/workflows/universal-hash.yml index 76a17285..25896c2e 100644 --- a/.github/workflows/universal-hash.yml +++ b/.github/workflows/universal-hash.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.65.0 # MSRV + - 1.81.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -47,7 +47,7 @@ jobs: strategy: matrix: rust: - - 1.65.0 # MSRV + - 1.81.0 # MSRV - stable steps: - uses: actions/checkout@v4 diff --git a/Cargo.toml b/Cargo.toml index 2ca101fb..354080ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,5 +16,6 @@ members = [ ] [patch.crates-io] +crypto-common = { path = "./crypto-common" } digest = { path = "./digest" } signature = { path = "./signature" } diff --git a/aead/Cargo.toml b/aead/Cargo.toml index 3c9aa01d..f6cccaea 100644 --- a/aead/Cargo.toml +++ b/aead/Cargo.toml @@ -13,7 +13,7 @@ documentation = "https://docs.rs/aead" repository = "https://github.com/RustCrypto/traits" keywords = ["crypto", "encryption"] categories = ["cryptography", "no-std"] -rust-version = "1.65" +rust-version = "1.81" [dependencies] crypto-common = "0.2.0-rc.0" diff --git a/aead/README.md b/aead/README.md index b481f9c3..0a0dd045 100644 --- a/aead/README.md +++ b/aead/README.md @@ -19,7 +19,7 @@ See [RustCrypto/AEADs] for cipher implementations which use this trait. ## Minimum Supported Rust Version -Rust **1.65** or higher. +Rust **1.81** or higher. Minimum supported Rust version can be changed in the future, but it will be done with a minor version bump. @@ -51,7 +51,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/aead/badge.svg [docs-link]: https://docs.rs/aead/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.65+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260038-AEADs [build-image]: https://github.com/RustCrypto/traits/workflows/aead/badge.svg?branch=master&event=push diff --git a/cipher/Cargo.toml b/cipher/Cargo.toml index 1125a68b..26fde3ab 100644 --- a/cipher/Cargo.toml +++ b/cipher/Cargo.toml @@ -6,14 +6,14 @@ authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" readme = "README.md" edition = "2021" -rust-version = "1.65" +rust-version = "1.81" documentation = "https://docs.rs/cipher" repository = "https://github.com/RustCrypto/traits" keywords = ["crypto", "block-cipher", "stream-cipher", "trait"] categories = ["cryptography", "no-std"] [dependencies] -crypto-common = { version = "0.2.0-rc.1", path = "../crypto-common/" } +crypto-common = "0.2.0-rc.1" inout = "0.2.0-rc.0" # optional dependencies diff --git a/cipher/README.md b/cipher/README.md index 716973c1..350be54b 100644 --- a/cipher/README.md +++ b/cipher/README.md @@ -16,7 +16,7 @@ implementations which use these traits. ## Minimum Supported Rust Version -Rust **1.65** or higher. +Rust **1.81** or higher. Minimum supported Rust version can be changed in the future, but it will be done with a minor version bump. @@ -48,7 +48,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/cipher/badge.svg [docs-link]: https://docs.rs/cipher/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.65+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260050-traits [build-image]: https://github.com/RustCrypto/traits/workflows/cipher/badge.svg?branch=master&event=push diff --git a/digest/Cargo.toml b/digest/Cargo.toml index 8f44c7d0..8493bf4a 100644 --- a/digest/Cargo.toml +++ b/digest/Cargo.toml @@ -6,7 +6,7 @@ authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" readme = "README.md" edition = "2021" -rust-version = "1.71" +rust-version = "1.81" documentation = "https://docs.rs/digest" repository = "https://github.com/RustCrypto/traits" keywords = ["digest", "crypto", "hash"] diff --git a/digest/README.md b/digest/README.md index da44f69e..dc527f71 100644 --- a/digest/README.md +++ b/digest/README.md @@ -16,7 +16,7 @@ See [RustCrypto/hashes][1] for implementations which use this trait. ## Minimum Supported Rust Version -Rust **1.71** or higher. +Rust **1.81** or higher. Minimum supported Rust version can be changed in the future, but it will be done with a minor version bump. @@ -147,7 +147,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/digest/badge.svg [docs-link]: https://docs.rs/digest/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.71+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260041-hashes [build-image]: https://github.com/RustCrypto/traits/workflows/digest/badge.svg?branch=master&event=push diff --git a/elliptic-curve/Cargo.toml b/elliptic-curve/Cargo.toml index 77921cfb..32c32771 100644 --- a/elliptic-curve/Cargo.toml +++ b/elliptic-curve/Cargo.toml @@ -14,7 +14,7 @@ readme = "README.md" categories = ["cryptography", "no-std"] keywords = ["crypto", "ecc", "elliptic", "weierstrass"] edition = "2021" -rust-version = "1.73" +rust-version = "1.81" [dependencies] base16ct = "0.2" diff --git a/elliptic-curve/README.md b/elliptic-curve/README.md index e2c383f2..0c8fad47 100644 --- a/elliptic-curve/README.md +++ b/elliptic-curve/README.md @@ -15,7 +15,7 @@ and public/secret keys composed thereof. ## Minimum Supported Rust Version -Requires Rust **1.73** or higher. +Requires Rust **1.81** or higher. Minimum supported Rust version can be changed in the future, but it will be done with a minor version bump. @@ -49,6 +49,6 @@ dual licensed as above, without any additional terms or conditions. [build-image]: https://github.com/RustCrypto/traits/actions/workflows/elliptic-curve.yml/badge.svg [build-link]: https://github.com/RustCrypto/traits/actions/workflows/elliptic-curve.yml [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.73+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260040-elliptic-curves diff --git a/universal-hash/Cargo.toml b/universal-hash/Cargo.toml index d98e8dd9..d330e067 100644 --- a/universal-hash/Cargo.toml +++ b/universal-hash/Cargo.toml @@ -5,7 +5,7 @@ description = "Traits which describe the functionality of universal hash functio authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.81" readme = "README.md" documentation = "https://docs.rs/universal-hash" repository = "https://github.com/RustCrypto/traits" diff --git a/universal-hash/README.md b/universal-hash/README.md index 3bc9d097..beaa9e58 100644 --- a/universal-hash/README.md +++ b/universal-hash/README.md @@ -15,7 +15,7 @@ See [RustCrypto/universal-hashes] for implementations which use this trait. ## Minimum Supported Rust Version -Rust **1.65** or higher. +Rust **1.81** or higher. Minimum supported Rust version can be changed in the future, but it will be done with a minor version bump. @@ -47,7 +47,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/universal-hash/badge.svg [docs-link]: https://docs.rs/universal-hash/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.65+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260051-universal-hashes [build-image]: https://github.com/RustCrypto/traits/workflows/universal-hash/badge.svg?branch=master&event=push