diff --git a/.github/workflows/ascon.yml b/.github/workflows/ascon.yml index c30adf5..5b29ecb 100644 --- a/.github/workflows/ascon.yml +++ b/.github/workflows/ascon.yml @@ -21,7 +21,7 @@ jobs: set-msrv: uses: RustCrypto/actions/.github/workflows/set-msrv.yml@master with: - msrv: 1.81.0 + msrv: 1.85.0 build: needs: set-msrv @@ -46,7 +46,7 @@ jobs: minimal-versions: uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master with: - working-directory: ${{ github.workflow }} + working-directory: ${{ github.workflow }} test: needs: set-msrv diff --git a/.github/workflows/keccak.yml b/.github/workflows/keccak.yml index 39e1bfe..83dee4b 100644 --- a/.github/workflows/keccak.yml +++ b/.github/workflows/keccak.yml @@ -21,7 +21,7 @@ jobs: set-msrv: uses: RustCrypto/actions/.github/workflows/set-msrv.yml@master with: - msrv: 1.81.0 + msrv: 1.85.0 build: needs: set-msrv @@ -46,8 +46,8 @@ jobs: minimal-versions: uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master with: - working-directory: ${{ github.workflow }} - stable-cmd: cargo hack test --release --feature-powerset --skip simd # `simd` requires nightly + working-directory: ${{ github.workflow }} + stable-cmd: cargo hack test --release --feature-powerset --skip simd # `simd` requires nightly test: needs: set-msrv @@ -111,7 +111,7 @@ jobs: runs-on: ubuntu-latest defaults: run: - # Cross mounts only current package, i.e. by default it ignores workspace's Cargo.toml + # Cross mounts only current package, i.e. by default it ignores workspace's Cargo.toml working-directory: . strategy: matrix: diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index d335a9d..6b2d7f8 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -17,7 +17,7 @@ jobs: - uses: RustCrypto/actions/cargo-cache@master - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.82.0 + toolchain: 1.85.0 components: clippy - run: cargo clippy --all -- -D warnings diff --git a/ascon/Cargo.toml b/ascon/Cargo.toml index 4ee02dd..7d6dba9 100644 --- a/ascon/Cargo.toml +++ b/ascon/Cargo.toml @@ -13,11 +13,11 @@ repository = "https://github.com/RustCrypto/sponges" keywords = ["Ascon", "crypto", "permutation"] categories = ["cryptography", "no-std"] readme = "README.md" -edition = "2021" -rust-version = "1.81" +edition = "2024" +rust-version = "1.85" [dependencies] -zeroize = { version = "1.6.0", default-features = false, optional=true } +zeroize = { version = "1.6.0", default-features = false, optional = true } [features] no_unroll = [] # Do not unroll loops for binary size reduction diff --git a/ascon/README.md b/ascon/README.md index 6c75b19..99af549 100644 --- a/ascon/README.md +++ b/ascon/README.md @@ -29,7 +29,7 @@ portfolio of the [CAESAR competition]. ## Minimum Supported Rust Version -This crate requires **Rust 1.81** at a minimum. +This crate requires **Rust 1.85** at a minimum. We may change the MSRV in the future, but it will be accompanied by a minor version bump. @@ -58,7 +58,7 @@ dual licensed as above, without any additional terms or conditions. [build-image]: https://github.com/RustCrypto/sponges/actions/workflows/ascon.yml/badge.svg [build-link]: https://github.com/RustCrypto/sponges/actions/workflows/ascon.yml [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.85+-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/369879-sponges diff --git a/benches/Cargo.toml b/benches/Cargo.toml index f9d90d9..384e2da 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -6,8 +6,8 @@ authors = [ "Sebastian Ramacher ", "RustCrypto Developers", ] -edition = "2021" -rust-version = "1.60" +edition = "2024" +rust-version = "1.85" publish = false [workspace] diff --git a/keccak/Cargo.toml b/keccak/Cargo.toml index 61e856a..13c8d9d 100644 --- a/keccak/Cargo.toml +++ b/keccak/Cargo.toml @@ -13,8 +13,8 @@ repository = "https://github.com/RustCrypto/sponges" keywords = ["crypto", "sponge", "keccak", "keccak-f", "keccak-p"] categories = ["cryptography", "no-std"] readme = "README.md" -edition = "2021" -rust-version = "1.81" +edition = "2024" +rust-version = "1.85" [features] asm = [] # Use optimized assembly when available (currently only ARMv8) diff --git a/keccak/README.md b/keccak/README.md index 7aa4b35..1f3fb9a 100644 --- a/keccak/README.md +++ b/keccak/README.md @@ -22,7 +22,7 @@ is built on this crate. ## Minimum Supported Rust Version -Rust **1.81** or higher. +Rust **1.85** or higher. Minimum supported Rust version can be changed in the future, but it will be done with a minor version bump. @@ -56,7 +56,7 @@ dual licensed as above, without any additional terms or conditions. [build-image]: https://github.com/RustCrypto/sponges/actions/workflows/keccak.yml/badge.svg [build-link]: https://github.com/RustCrypto/sponges/actions/workflows/keccak.yml [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.85+-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/369879-sponges diff --git a/keccak/benches/mod.rs b/keccak/benches/mod.rs index 960c40a..80352a8 100644 --- a/keccak/benches/mod.rs +++ b/keccak/benches/mod.rs @@ -4,7 +4,7 @@ extern crate keccak; extern crate test; -use keccak::{f1600, f200, f400, f800, p1600}; +use keccak::{f200, f400, f800, f1600, p1600}; macro_rules! impl_bench { ($name:ident, $fn:ident, $type:expr) => { diff --git a/keccak/src/lib.rs b/keccak/src/lib.rs index 9881fcb..1f15516 100644 --- a/keccak/src/lib.rs +++ b/keccak/src/lib.rs @@ -202,7 +202,7 @@ pub fn f1600(state: &mut [u64; PLEN]) { #[cfg(feature = "simd")] /// SIMD implementations for Keccak-f1600 sponge function pub mod simd { - use crate::{keccak_p, LaneSize, PLEN}; + use crate::{LaneSize, PLEN, keccak_p}; pub use core::simd::{u64x2, u64x4, u64x8}; macro_rules! impl_lanesize_simd_u64xn { @@ -289,7 +289,7 @@ pub fn keccak_p(state: &mut [L; PLEN], round_count: usize) { #[cfg(test)] mod tests { - use crate::{keccak_p, LaneSize, PLEN}; + use crate::{LaneSize, PLEN, keccak_p}; fn keccak_f(state_first: [L; PLEN], state_second: [L; PLEN]) { let mut state = [L::default(); PLEN];