universal-hash: bump crypto-common to v0.2.0-pre; MSRV 1.65

Replaces `generic-array` with `hybrid-array`, which is built on a
combination of `typenum` and const generics, providing a degree of
interoperability between the two systems.

.github/workflows/universal-hash.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -36,17 +36,18 @@ jobs:
           targets: ${{ matrix.target }}
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
 
-  minimal-versions:
-    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
-    with:
-        working-directory: ${{ github.workflow }}
+  # TODO(tarcieri): re-enable after next `crypto-common` release
+  #  minimal-versions:
+  #    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
+  #    with:
+  #        working-directory: ${{ github.workflow }}
 
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         rust:
-          - 1.56.0 # MSRV
+          - 1.65.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

Cargo.toml

@@ -9,12 +9,12 @@ members = [
     "elliptic-curve",
     "kem",
     "password-hash",
+    "universal-hash",
 ]
 # TODO: re-add to `members` when MSRV has been bumped to 1.60+
 exclude = [
     "signature",
     "signature/async",
-    "universal-hash",
 ]
 
 [patch.crates-io]

crypto/Cargo.toml

@@ -22,7 +22,7 @@ digest = { version = "0.10", optional = true, features = ["mac"] }
 elliptic-curve = { version = "0.13", optional = true, path = "../elliptic-curve" }
 password-hash = { version = "0.5", optional = true, path = "../password-hash" }
 signature = { version = "2", optional = true, default-features = false, path = "../signature" }
-universal-hash = { version = "0.5", optional = true, path = "../universal-hash" }
+universal-hash = { version = "0.5", optional = true }
 
 [features]
 std = [

universal-hash/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "universal-hash"
-version = "0.5.1"
+version = "0.6.0-pre"
 description = "Traits which describe the functionality of universal hash functions (UHFs)"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
@@ -13,7 +13,7 @@ keywords = ["crypto", "mac"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-crypto-common = "0.1.6"
+crypto-common = "=0.2.0-pre"
 subtle = { version = "2.4", default-features = false }
 
 [features]

universal-hash/src/lib.rs

@@ -30,14 +30,16 @@
 extern crate std;
 
 pub use crypto_common::{
-    self, generic_array,
+    self, array,
     typenum::{self, consts},
     Block, Key, KeyInit, ParBlocks, Reset,
 };
 
 use core::slice;
-use crypto_common::{BlockSizeUser, ParBlocksSizeUser};
-use generic_array::{ArrayLength, GenericArray};
+use crypto_common::{
+    array::{Array, ArraySize},
+    BlockSizeUser, BlockSizes, ParBlocksSizeUser,
+};
 use subtle::ConstantTimeEq;
 use typenum::Unsigned;
 
@@ -79,15 +81,15 @@ pub trait UniversalHash: BlockSizeUser + Sized {
     /// Update hash function state with the provided block.
     #[inline]
     fn update(&mut self, blocks: &[Block<Self>]) {
-        struct Ctx<'a, BS: ArrayLength<u8>> {
+        struct Ctx<'a, BS: BlockSizes> {
             blocks: &'a [Block<Self>],
         }
 
-        impl<'a, BS: ArrayLength<u8>> BlockSizeUser for Ctx<'a, BS> {
+        impl<'a, BS: BlockSizes> BlockSizeUser for Ctx<'a, BS> {
             type BlockSize = BS;
         }
 
-        impl<'a, BS: ArrayLength<u8>> UhfClosure for Ctx<'a, BS> {
+        impl<'a, BS: BlockSizes> UhfClosure for Ctx<'a, BS> {
             #[inline(always)]
             fn call<B: UhfBackend<BlockSize = BS>>(self, backend: &mut B) {
                 let pb = B::ParBlocksSize::USIZE;
@@ -123,7 +125,7 @@ pub trait UniversalHash: BlockSizeUser + Sized {
         self.update(blocks);
 
         if !tail.is_empty() {
-            let mut padded_block = GenericArray::default();
+            let mut padded_block = Array::default();
             padded_block[..tail.len()].copy_from_slice(tail);
             self.update(slice::from_ref(&padded_block));
         }
@@ -177,10 +179,10 @@ impl std::error::Error for Error {}
 /// Split message into slice of blocks and leftover tail.
 // TODO: replace with `slice::as_chunks` on migration to const generics
 #[inline(always)]
-fn to_blocks<T, N: ArrayLength<T>>(data: &[T]) -> (&[GenericArray<T, N>], &[T]) {
+fn to_blocks<T, N: ArraySize>(data: &[T]) -> (&[Array<T, N>], &[T]) {
     let nb = data.len() / N::USIZE;
     let (left, right) = data.split_at(nb * N::USIZE);
-    let p = left.as_ptr() as *const GenericArray<T, N>;
+    let p = left.as_ptr() as *const Array<T, N>;
     // SAFETY: we guarantee that `blocks` does not point outside of `data`
     // and `p` is valid for reads
     #[allow(unsafe_code)]