Upgrade all crates to the 2024 edition and bump MSRV to 1.85 (#47)

baloo · web-flow · commit 15f7dd084793 · 2025-03-22T04:04:10.000+03:00
diff --git a/.github/workflows/aes-kw.yml b/.github/workflows/aes-kw.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -48,7 +48,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/belt-kwp.yml b/.github/workflows/belt-kwp.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -48,7 +48,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.82.0 # MSRV
+          toolchain: 1.85.0 # MSRV
           components: clippy
           override: true
       - run: cargo clippy --all -- -D warnings
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aes-kw/CHANGELOG.md b/aes-kw/CHANGELOG.md
@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bump `aes` dependency to v0.9 ([#34])
 - `Kek` type is split into separate `AesKw` and `AesKwp` types ([#40])
 - `wrap` and `unwrap` methods now return resulting slice ([#40])
+- Edition changed to 2024 and MSRV bumped to 1.85 ([#47])
+- Relax MSRV policy and allow MSRV bumps in patch releases
 
 ### Removed
 - `Kek::new` inherent method in favor of implementing `InnerInit` ([#40])
@@ -21,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#34]: https://github.com/RustCrypto/key-wraps/pull/34
 [#35]: https://github.com/RustCrypto/key-wraps/pull/35
 [#40]: https://github.com/RustCrypto/key-wraps/pull/40
+[#47]: https://github.com/RustCrypto/key-wraps/pull/47
 
 ## 0.2.1 (2022-04-20)
 ### Changed
diff --git a/aes-kw/Cargo.toml b/aes-kw/Cargo.toml
@@ -9,16 +9,16 @@ repository = "https://github.com/RustCrypto/key-wraps"
 keywords = ["crypto", "AES-KW", "KW", "AES-KWP", "KWP"]
 categories = ["cryptography", "no-std"]
 readme = "README.md"
-edition = "2021"
-rust-version = "1.81"
+edition = "2024"
+rust-version = "1.85"
 
 [dependencies]
-aes = "=0.9.0-pre.2"
+aes = "=0.9.0-pre.3"
 
-const-oid = { version = "0.10.0-rc.3", optional = true }
+const-oid = { version = "0.10", optional = true }
 
 [dev-dependencies]
-hex-literal = "0.3"
+hex-literal = "1"
 
 [features]
 default = ["oid"]
diff --git a/aes-kw/README.md b/aes-kw/README.md
@@ -87,13 +87,6 @@ let unwrapped_key = kw.unwrap_fixed_key::<U16>(&wrapped_key).unwrap();
 assert_eq!(unwrapped_key, key);
 ```
 
-## Minimum Supported Rust Version
-
-This crate requires **Rust 1.81** at a minimum.
-
-We may change the MSRV in the future, but it will be accompanied by a minor
-version bump.
-
 ## License
 
 Licensed under either of:
@@ -116,7 +109,7 @@ dual licensed as above, without any additional terms or conditions.
 [docs-image]: https://docs.rs/aes-kw/badge.svg
 [docs-link]: https://docs.rs/aes-kw/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.85+-blue.svg
 [build-image]: https://github.com/RustCrypto/key-wraps/actions/workflows/aes-kw.yml/badge.svg
 [build-link]: https://github.com/RustCrypto/key-wraps/actions/workflows/aes-kw.yml
 
diff --git a/aes-kw/src/ctx.rs b/aes-kw/src/ctx.rs
@@ -1,7 +1,7 @@
 use crate::IV_LEN;
 use aes::cipher::{
-    typenum::U16, Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherEncBackend,
-    BlockCipherEncClosure, BlockSizeUser,
+    Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherEncBackend,
+    BlockCipherEncClosure, BlockSizeUser, typenum::U16,
 };
 
 pub(crate) struct Ctx<'a> {
diff --git a/aes-kw/src/kw.rs b/aes-kw/src/kw.rs
@@ -1,11 +1,11 @@
 use core::ops::{Add, Rem};
 
-use crate::{ctx::Ctx, error::IntegrityCheckFailed, Error, IvLen, IV_LEN};
+use crate::{Error, IV_LEN, IvLen, ctx::Ctx, error::IntegrityCheckFailed};
 use aes::cipher::{
+    Array, Block, BlockCipherDecrypt, BlockCipherEncrypt,
     array::ArraySize,
     crypto_common::{InnerInit, InnerUser},
-    typenum::{Mod, NonZero, Sum, Zero, U16},
-    Array, Block, BlockCipherDecrypt, BlockCipherEncrypt,
+    typenum::{Mod, NonZero, Sum, U16, Zero},
 };
 
 /// Default Initial Value for AES-KW as defined in RFC3394 § 2.2.3.1.
diff --git a/aes-kw/src/kwp.rs b/aes-kw/src/kwp.rs
@@ -1,12 +1,12 @@
 use core::ops::{Add, Div, Mul};
 
-use crate::{ctx::Ctx, Error, IntegrityCheckFailed, IvLen, IV_LEN};
+use crate::{Error, IV_LEN, IntegrityCheckFailed, IvLen, ctx::Ctx};
 use aes::cipher::{
+    Array, Block, BlockCipherDecrypt, BlockCipherEncrypt,
     array::ArraySize,
-    consts::{B1, U4294967296, U7},
+    consts::{B1, U7, U4294967296},
     crypto_common::{InnerInit, InnerUser},
     typenum::{Add1, IsLess, Le, NonZero, Prod, Quot, Sum, U16},
-    Array, Block, BlockCipherDecrypt, BlockCipherEncrypt,
 };
 
 /// Maximum length of the AES-KWP input data (2^32 bytes) represented as a `typenum` type.
diff --git a/aes-kw/src/lib.rs b/aes-kw/src/lib.rs
@@ -24,7 +24,7 @@ pub use kwp::AesKwp;
 
 pub use aes;
 pub use aes::cipher;
-pub use aes::cipher::{crypto_common::InnerInit, KeyInit};
+pub use aes::cipher::{KeyInit, crypto_common::InnerInit};
 
 /// AES-128 key wrapping
 pub type KwAes128 = AesKw<aes::Aes128>;
diff --git a/aes-kw/tests/kw_tests.rs b/aes-kw/tests/kw_tests.rs
@@ -1,6 +1,6 @@
 use aes_kw::{
-    cipher::consts::{U16, U24, U32},
     Error, KeyInit, KwAes128, KwAes192, KwAes256,
+    cipher::consts::{U16, U24, U32},
 };
 use hex_literal::hex;
 use std::assert_eq;
diff --git a/aes-kw/tests/kwp_tests.rs b/aes-kw/tests/kwp_tests.rs
@@ -1,4 +1,4 @@
-use aes_kw::{cipher::consts, Error, KeyInit, KwpAes128, KwpAes192, KwpAes256};
+use aes_kw::{Error, KeyInit, KwpAes128, KwpAes192, KwpAes256, cipher::consts};
 use hex_literal::hex;
 use std::assert_eq;
 
diff --git a/belt-kwp/Cargo.toml b/belt-kwp/Cargo.toml
@@ -8,14 +8,14 @@ repository = "https://github.com/RustCrypto/key-wraps"
 keywords = ["crypto", "BELT-KW", "KW", "BELT-KWP", "KWP"]
 categories = ["cryptography", "no-std"]
 readme = "README.md"
-edition = "2021"
-rust-version = "1.81"
+edition = "2024"
+rust-version = "1.85"
 
 [dependencies]
-belt-block = "=0.2.0-pre.2"
+belt-block = "=0.2.0-pre.3"
 
 [dev-dependencies]
-hex-literal = "0.4"
+hex-literal = "1"
 
 [features]
 alloc = []
diff --git a/belt-kwp/README.md b/belt-kwp/README.md
@@ -50,13 +50,6 @@ let unwrapped_key = kw.unwrap_fixed_key::<U32>(&wrapped_key, &i).unwrap();
 assert_eq!(unwrapped_key, x);
 ```
 
-## Minimum Supported Rust Version
-
-This crate requires **Rust 1.81** at a minimum.
-
-We may change the MSRV in the future, but it will be accompanied by a minor
-version bump.
-
 ## License
 
 Licensed under either of:
@@ -79,6 +72,6 @@ dual licensed as above, without any additional terms or conditions.
 [docs-image]: https://docs.rs/belt-kwp/badge.svg
 [docs-link]: https://docs.rs/belt-kwp/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.85+-blue.svg
 [build-image]: https://github.com/RustCrypto/key-wraps/actions/workflows/belt-kwp.yml/badge.svg
 [build-link]: https://github.com/RustCrypto/key-wraps/actions/workflows/belt-kwp.yml
diff --git a/belt-kwp/src/lib.rs b/belt-kwp/src/lib.rs
@@ -9,14 +9,13 @@
 #![warn(missing_docs, rust_2018_idioms)]
 
 use belt_block::{
-    belt_wblock_dec, belt_wblock_enc,
+    BeltBlock, belt_wblock_dec, belt_wblock_enc,
     cipher::{
+        Array,
         array::ArraySize,
         consts::U16,
         typenum::{GrEq, IsGreaterOrEqual, NonZero, Sum, Unsigned},
-        Array,
     },
-    BeltBlock,
 };
 use core::{fmt, ops::Add};
 
diff --git a/belt-kwp/tests/mod.rs b/belt-kwp/tests/mod.rs
@@ -1,6 +1,6 @@
 //! Test vectors from STB 4.101.31-2020 (section A.10, tables A.21-A.22):
 //! https://apmi.bsu.by/assets/files/std/belt-spec371.pdf
-use belt_kwp::{cipher::consts::U32, BeltKwp, KeyInit};
+use belt_kwp::{BeltKwp, KeyInit, cipher::consts::U32};
 use hex_literal::hex;
 
 #[test]
