Bump digest to v0.11.0-pre.3; MSRV 1.71 (#91)

For `hkdf`, this upgrades `hmac` to v0.13.0-pre.0, which transitively
depends on `digest` v0.11.0-pre.3.

This notably includes the migration from generic-array to hybrid-array,
and also switches `hkdf` to use the newly introduced `EagerHash` trait.

Also bumps edition to 2021, and hex-literal to v0.4.

.github/workflows/concat-kdf.yml

@@ -22,7 +22,7 @@ jobs:
  strategy:
  matrix:
  rust:
- - 1.56.0 # MSRV
+ - 1.71.0 # MSRV
  - stable
  target:
  - thumbv7em-none-eabi
@@ -40,7 +40,7 @@ jobs:
  strategy:
  matrix:
  rust:
- - 1.56.0 # MSRV
+ - 1.71.0 # MSRV
  - stable
  steps:
  - uses: actions/checkout@v4

.github/workflows/hkdf.yml

@@ -22,7 +22,7 @@ jobs:
  strategy:
  matrix:
  rust:
- - 1.41.0 # MSRV
+ - 1.71.0 # MSRV
  - stable
  target:
  - thumbv7em-none-eabi
@@ -37,6 +37,8 @@ jobs:
  - run: cargo build --no-default-features --target ${{ matrix.target }}
 
  minimal-versions:
+ # Temporarily disabled until hkdf 0.13.0-pre.0 gets published
+ if: false
  uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
  with:
  working-directory: ${{ github.workflow }}
@@ -46,7 +48,7 @@ jobs:
  strategy:
  matrix:
  rust:
- - 1.41.0 # MSRV
+ - 1.71.0 # MSRV
  - stable
  steps:
  - uses: actions/checkout@v4

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
  "hkdf",
  "concat-kdf",

concat-kdf/Cargo.toml

@@ -1,22 +1,23 @@
 [package]
 name = "concat-kdf"
-version = "0.1.0"
+version = "0.2.0-pre"
 description = "Concatenation Key Derivation Function (Concat KDF)"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 documentation = "https://docs.rs/concat-kdf"
 repository = "https://github.com/RustCrypto/KDFs"
 keywords = ["crypto", "concat-kdf", "KDF", "NIST"]
 categories = ["cryptography", "no-std"]
+rust-version = "1.71"
 
 [dependencies]
-digest = "0.10.7"
+digest = "=0.11.0-pre.3"
 
 [dev-dependencies]
-hex-literal = "0.3.4"
-sha2 = { version = "0.10.3", default-features = false }
+hex-literal = "0.4"
+sha2 = { version = "=0.11.0-pre.0", default-features = false }
 
 [features]
 std = []

concat-kdf/README.md

@@ -21,12 +21,39 @@ let mut key = [0u8; 32];
 concat_kdf::derive_key_into::<sha2::Sha256>(b"shared-secret", b"other-info", &mut key).unwrap();
 ```
 
+## Minimum Supported Rust Version
+
+Rust **1.71** 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:
+
+* [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.
+
 [crate-image]: https://img.shields.io/crates/v/concat-kdf.svg
 [crate-link]: https://crates.io/crates/concat-kdf
 [docs-image]: https://docs.rs/concat-kdf/badge.svg
 [docs-link]: https://docs.rs/concat-kdf/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260043-KDFs
 [build-image]: https://github.com/RustCrypto/KDFs/workflows/concat-kdf/badge.svg?branch=master&event=push

concat-kdf/src/lib.rs

@@ -20,7 +20,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
 use core::fmt;
-use digest::{generic_array::typenum::Unsigned, Digest, FixedOutputReset, Update};
+use digest::{array::typenum::Unsigned, Digest, FixedOutputReset, Update};
 
 #[cfg(feature = "std")]
 extern crate std;

hkdf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hkdf"
-version = "0.12.4"
+version = "0.13.0-pre"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/RustCrypto/KDFs/"
@@ -9,16 +9,17 @@ description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"
 keywords = ["crypto", "HKDF", "KDF"]
 categories = ["cryptography", "no-std"]
 readme = "README.md"
-edition = "2018"
+edition = "2021"
+rust-version = "1.71"
 
 [dependencies]
-hmac = "0.12.1"
+hmac = "=0.13.0-pre.0"
 
 [dev-dependencies]
 blobby = "0.3"
-hex-literal = "0.2.2"
-sha1 = { version = "0.10", default-features = false }
-sha2 = { version = "0.10", default-features = false }
+hex-literal = "0.4"
+sha1 = { version = "=0.11.0-pre.0", default-features = false }
+sha2 = { version = "=0.11.0-pre.0", default-features = false }
 
 [features]
 std = ["hmac/std"]

hkdf/README.md

@@ -71,14 +71,41 @@ let expected = hex!("
 assert_eq!(okm, expected);
 ```
 
+## Minimum Supported Rust Version
+
+Rust **1.71** 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:
+
+* [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)
 
 [crate-image]: https://img.shields.io/crates/v/hkdf.svg
 [crate-link]: https://crates.io/crates/hkdf
 [docs-image]: https://docs.rs/hkdf/badge.svg
 [docs-link]: https://docs.rs/hkdf/
 [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.71+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260043-KDFs
 [build-image]: https://github.com/RustCrypto/KDFs/workflows/hkdf/badge.svg?branch=master&event=push

hkdf/src/lib.rs

@@ -103,7 +103,7 @@ pub use hmac;
 use core::fmt;
 use core::marker::PhantomData;
 use hmac::digest::{
- crypto_common::AlgorithmName, generic_array::typenum::Unsigned, Output, OutputSizeUser,
+ array::typenum::Unsigned, crypto_common::AlgorithmName, Output, OutputSizeUser,
 };
 use hmac::{Hmac, SimpleHmac};