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

RustCrypto · Feb 28, 2025 · faafada · faafada
1 parent 728a400
commit faafada
Show file tree

Hide file tree

Showing 28 changed files with 109 additions and 136 deletions.
diff --git a/.github/workflows/ansi-x963-kdf.yml b/.github/workflows/ansi-x963-kdf.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -40,7 +40,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/bake-kdf.yml b/.github/workflows/bake-kdf.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -40,7 +40,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/concat-kdf.yml b/.github/workflows/concat-kdf.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -40,7 +40,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/hkdf.yml b/.github/workflows/hkdf.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/kbkdf.yml b/.github/workflows/kbkdf.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -37,6 +37,7 @@ jobs:
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 
   minimal-versions:
+    if: false # Disabled because it can't handle git dependencies use to upgrade ecosystem
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
@@ -46,7 +47,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
@@ -17,7 +17,7 @@ jobs:
       - uses: RustCrypto/actions/cargo-cache@master
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.81.0
+          toolchain: 1.85.0
           components: clippy
       - run: cargo clippy --all -- -D warnings
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,3 +10,14 @@ members = [
 
 [profile.dev]
 opt-level = 2
+
+[patch.crates-io]
+belt-hash = { git = "https://github.com/RustCrypto/hashes.git" }
+sha1      = { git = "https://github.com/RustCrypto/hashes.git" }
+sha2      = { git = "https://github.com/RustCrypto/hashes.git" }
+
+hmac = { git = "https://github.com/RustCrypto/MACs.git" }
+cmac = { git = "https://github.com/RustCrypto/MACs.git" }
+
+# https://github.com/RustCrypto/block-ciphers/pull/472
+aes = { git = "https://github.com/RustCrypto/block-ciphers.git" }
diff --git a/ansi-x963-kdf/Cargo.toml b/ansi-x963-kdf/Cargo.toml
@@ -5,16 +5,16 @@ description = "ANSI X9.63 Key Derivation Function"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
-edition = "2021"
+edition = "2024"
 documentation = "https://docs.rs/ansi-x963-kdf"
 repository = "https://github.com/RustCrypto/KDFs"
 keywords = ["crypto", "ansi-x963-kdf", "KDF", "SEC1"]
 categories = ["cryptography", "no-std"]
-rust-version = "1.81"
+rust-version = "1.85"
 
 [dependencies]
-digest = "=0.11.0-pre.9"
+digest = "=0.11.0-pre.10"
 
 [dev-dependencies]
-hex-literal = "0.4"
+hex-literal = "1"
 sha2 = { version = "=0.11.0-pre.4", default-features = false }
diff --git a/ansi-x963-kdf/README.md b/ansi-x963-kdf/README.md
@@ -24,18 +24,6 @@ ansi_x963_kdf::derive_key_into::<Sha256>(b"secret", b"shared-info", &mut key).un
 assert_eq!(key, hex!("8dbb1d50bcc7fc782abc9db5c64a2826"));
 ```
 
-## Minimum Supported Rust Version
-
-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.
-
-## SemVer Policy
-
-- All on-by-default features of this library are covered by SemVer
-- MSRV is considered exempt from SemVer as noted above
-
 ## License
 
 Licensed under either of:
@@ -58,6 +46,6 @@ dual licensed as above, without any additional terms or conditions.
 [build-image]: https://github.com/RustCrypto/KDFs/actions/workflows/ansi-x963-kdf.yml/badge.svg
 [build-link]: https://github.com/RustCrypto/KDFs/actions/workflows/ansi-x963-kdf.yml
 [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
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260043-KDFs
diff --git a/ansi-x963-kdf/src/lib.rs b/ansi-x963-kdf/src/lib.rs
@@ -2,7 +2,7 @@
 #![doc = include_str!("../README.md")]
 
 use core::fmt;
-use digest::{array::typenum::Unsigned, Digest, FixedOutputReset};
+use digest::{Digest, FixedOutputReset, array::typenum::Unsigned};
 
 /// Derives `key` in-place from `secret` and `shared_info`.
 ///

diff --git a/bake-kdf/Cargo.toml b/bake-kdf/Cargo.toml
@@ -5,8 +5,8 @@ description = "bake-kdf function (STB 34.101.66-2014)"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
-edition = "2021"
-rust-version = "1.72"
+edition = "2024"
+rust-version = "1.85"
 documentation = "https://docs.rs/bake-kdf"
 repository = "https://github.com/RustCrypto/KDFs"
 keywords = ["crypto", "bake", "stb", "kdf"]
@@ -16,7 +16,7 @@ categories = ["cryptography", "no-std"]
 belt-hash = { version = "0.2.0-pre.4", default-features = false }
 
 [dev-dependencies]
-hex-literal = "0.4.1"
+hex-literal = "1"
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/bake-kdf/README.md b/bake-kdf/README.md
@@ -25,6 +25,21 @@ let key = bake_kdf(&x, &s, c);
 assert_eq!(key, hex!("bbd7ece0080bee33c776a140f8d807a113a119a4e4d4270f9f2018fbd5e6292e"));
 ```
 
+## License
+
+Licensed under either of:
+
+* [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
+* [MIT license](http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
+
 
 [//]: # (badges)
 
@@ -35,6 +50,6 @@ assert_eq!(key, hex!("bbd7ece0080bee33c776a140f8d807a113a119a4e4d4270f9f2018fbd5
 [build-image]: https://github.com/RustCrypto/KDFs/actions/workflows/bake-kdf.yml/badge.svg
 [build-link]: https://github.com/RustCrypto/KDFs/actions/workflows/bake-kdf.yml
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.41+-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/260043-KDFs