Update to digest 0.10 (#36)

src/group/expand.rs

@@ -7,7 +7,8 @@
 
 use core::ops::Add;
 
-use digest::{BlockInput, Digest};
+use digest::core_api::BlockSizeUser;
+use digest::{Digest, FixedOutputReset};
 use generic_array::sequence::Concat;
 use generic_array::typenum::{Unsigned, U1, U2};
 use generic_array::{ArrayLength, GenericArray};
@@ -29,7 +30,7 @@ fn xor<L: ArrayLength<u8>>(x: GenericArray<u8, L>, y: GenericArray<u8, L>) -> Ge
 /// <https://www.ietf.org/archive/id/draft-irtf-cfrg-hash-to-curve-10.txt>
 pub fn expand_message_xmd<
     'a,
-    H: BlockInput + Digest,
+    H: BlockSizeUser + Digest + FixedOutputReset,
     L: ArrayLength<u8>,
     M: IntoIterator<Item = &'a [u8]>,
     D: ArrayLength<u8> + Add<U1>,
@@ -52,13 +53,13 @@ where
     let mut h = H::new();
 
     // msg_prime = Z_pad || msg || l_i_b_str || I2OSP(0, 1) || DST_prime
-    h.update(z_pad);
+    Digest::update(&mut h, z_pad);
     for bytes in msg {
-        h.update(bytes)
+        Digest::update(&mut h, bytes)
     }
-    h.update(l_i_b_str);
-    h.update(i2osp::<U1>(0)?);
-    h.update(&dst_prime);
+    Digest::update(&mut h, l_i_b_str);
+    Digest::update(&mut h, i2osp::<U1>(0)?);
+    Digest::update(&mut h, &dst_prime);
 
     // b[0]
     let b_0 = h.finalize_reset();
@@ -67,9 +68,9 @@ where
     let mut uniform_bytes = GenericArray::default();
 
     for (i, chunk) in (1..(ell + 1)).zip(uniform_bytes.chunks_mut(digest_len)) {
-        h.update(xor(b_0.clone(), b_i.clone()));
-        h.update(i2osp::<U1>(i)?);
-        h.update(&dst_prime);
+        Digest::update(&mut h, xor(b_0.clone(), b_i.clone()));
+        Digest::update(&mut h, i2osp::<U1>(i)?);
+        Digest::update(&mut h, &dst_prime);
         b_i = h.finalize_reset();
         chunk.copy_from_slice(&b_i[..digest_len.min(chunk.len())]);
     }

src/group/mod.rs

@@ -16,7 +16,8 @@ mod ristretto;
 
 use core::ops::{Add, Mul, Sub};
 
-use digest::{BlockInput, Digest};
+use digest::core_api::BlockSizeUser;
+use digest::{Digest, FixedOutputReset};
 use generic_array::typenum::U1;
 use generic_array::{ArrayLength, GenericArray};
 use rand_core::{CryptoRng, RngCore};
@@ -39,7 +40,7 @@ pub trait Group:
     const SUITE_ID: usize;
 
     /// transforms a password and domain separation tag (DST) into a curve point
-    fn hash_to_curve<H: BlockInput + Digest, D: ArrayLength<u8> + Add<U1>>(
+    fn hash_to_curve<H: BlockSizeUser + Digest + FixedOutputReset, D: ArrayLength<u8> + Add<U1>>(
         msg: &[u8],
         dst: GenericArray<u8, D>,
     ) -> Result<Self, InternalError>
@@ -49,7 +50,7 @@ pub trait Group:
     /// Hashes a slice of pseudo-random bytes to a scalar
     fn hash_to_scalar<
         'a,
-        H: BlockInput + Digest,
+        H: BlockSizeUser + Digest + FixedOutputReset,
         D: ArrayLength<u8> + Add<U1>,
         I: IntoIterator<Item = &'a [u8]>,
     >(

src/group/p256.rs

@@ -16,7 +16,8 @@
 use core::ops::{Add, Div, Mul, Neg};
 use core::str::FromStr;
 
-use digest::{BlockInput, Digest};
+use digest::core_api::BlockSizeUser;
+use digest::{Digest, FixedOutputReset};
 use generic_array::typenum::{Unsigned, U1, U2, U32, U33, U48};
 use generic_array::{ArrayLength, GenericArray};
 use num_bigint::{BigInt, Sign};
@@ -44,7 +45,7 @@ impl Group for ProjectivePoint {
 
     // Implements the `hash_to_curve()` function from
     // https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-11#section-3
-    fn hash_to_curve<H: BlockInput + Digest, D: ArrayLength<u8> + Add<U1>>(
+    fn hash_to_curve<H: BlockSizeUser + Digest + FixedOutputReset, D: ArrayLength<u8> + Add<U1>>(
         msg: &[u8],
         dst: GenericArray<u8, D>,
     ) -> Result<Self, InternalError>
@@ -100,7 +101,7 @@ impl Group for ProjectivePoint {
     // Implements the `HashToScalar()` function
     fn hash_to_scalar<
         'a,
-        H: BlockInput + Digest,
+        H: BlockSizeUser + Digest + FixedOutputReset,
         D: ArrayLength<u8> + Add<U1>,
         I: IntoIterator<Item = &'a [u8]>,
     >(

src/group/ristretto.rs

@@ -12,7 +12,8 @@ use curve25519_dalek::constants::RISTRETTO_BASEPOINT_POINT;
 use curve25519_dalek::ristretto::{CompressedRistretto, RistrettoPoint};
 use curve25519_dalek::scalar::Scalar;
 use curve25519_dalek::traits::Identity;
-use digest::{BlockInput, Digest};
+use digest::core_api::BlockSizeUser;
+use digest::{Digest, FixedOutputReset};
 use generic_array::typenum::{U1, U32, U64};
 use generic_array::{ArrayLength, GenericArray};
 use rand_core::{CryptoRng, RngCore};
@@ -28,7 +29,7 @@ impl Group for RistrettoPoint {
 
     // Implements the `hash_to_ristretto255()` function from
     // https://www.ietf.org/archive/id/draft-irtf-cfrg-hash-to-curve-10.txt
-    fn hash_to_curve<H: BlockInput + Digest, D: ArrayLength<u8> + Add<U1>>(
+    fn hash_to_curve<H: BlockSizeUser + Digest + FixedOutputReset, D: ArrayLength<u8> + Add<U1>>(
         msg: &[u8],
         dst: GenericArray<u8, D>,
     ) -> Result<Self, InternalError>
@@ -49,7 +50,7 @@ impl Group for RistrettoPoint {
     // https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-07.html#section-4.1
     fn hash_to_scalar<
         'a,
-        H: BlockInput + Digest,
+        H: BlockSizeUser + Digest + FixedOutputReset,
         D: ArrayLength<u8> + Add<U1>,
         I: IntoIterator<Item = &'a [u8]>,
     >(