Updates to remove hybrid_array::ArrayOps

This was a breaking change: RustCrypto/hybrid-array#30 This PR includes the necessary updates to remain compatible.
RustCrypto · Jan 28, 2024 · 1141bc4 · 1141bc4
1 parent 7de22e5
commit 1141bc4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,3 +26,6 @@ members = [
 
 [profile.dev]
 opt-level = 2
+
+[patch.crates-io.hybrid-array]
+git = "https://github.com/RustCrypto/hybrid-array.git"
diff --git a/md5/src/lib.rs b/md5/src/lib.rs
@@ -14,7 +14,7 @@ pub(crate) mod consts;
 
 use core::{fmt, slice::from_ref};
 use digest::{
-    array::ArrayOps,
+    array::Array,
     block_buffer::Eager,
     core_api::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
@@ -57,7 +57,7 @@ impl UpdateCore for Md5Core {
     #[inline]
     fn update_blocks(&mut self, blocks: &[Block<Self>]) {
         self.block_len = self.block_len.wrapping_add(blocks.len() as u64);
-        let blocks = ArrayOps::cast_slice_to_core(blocks);
+        let blocks = Array::cast_slice_to_core(blocks);
         compress::compress(&mut self.state, blocks)
     }
 }

diff --git a/sha1/src/lib.rs b/sha1/src/lib.rs
@@ -11,7 +11,7 @@ pub use digest::{self, Digest};
 
 use core::{fmt, slice::from_ref};
 use digest::{
-    array::ArrayOps,
+    array::Array,
     block_buffer::Eager,
     core_api::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
@@ -61,7 +61,7 @@ impl UpdateCore for Sha1Core {
     #[inline]
     fn update_blocks(&mut self, blocks: &[Block<Self>]) {
         self.block_len += blocks.len() as u64;
-        let blocks = ArrayOps::cast_slice_to_core(blocks);
+        let blocks = Array::cast_slice_to_core(blocks);
         compress(&mut self.h, blocks);
     }
 }

diff --git a/sha2/src/core_api.rs b/sha2/src/core_api.rs
@@ -1,7 +1,7 @@
 use crate::{consts, sha256::compress256, sha512::compress512};
 use core::{fmt, slice::from_ref};
 use digest::{
-    array::ArrayOps,
+    array::Array,
     block_buffer::Eager,
     core_api::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, OutputSizeUser, TruncSide,
@@ -38,7 +38,7 @@ impl UpdateCore for Sha256VarCore {
     #[inline]
     fn update_blocks(&mut self, blocks: &[Block<Self>]) {
         self.block_len += blocks.len() as u64;
-        let blocks = ArrayOps::cast_slice_to_core(blocks);
+        let blocks = Array::cast_slice_to_core(blocks);
         compress256(&mut self.state, blocks);
     }
 }
@@ -124,7 +124,7 @@ impl UpdateCore for Sha512VarCore {
     #[inline]
     fn update_blocks(&mut self, blocks: &[Block<Self>]) {
         self.block_len += blocks.len() as u128;
-        let blocks = ArrayOps::cast_slice_to_core(blocks);
+        let blocks = Array::cast_slice_to_core(blocks);
         compress512(&mut self.state, blocks);
     }
 }

diff --git a/whirlpool/src/lib.rs b/whirlpool/src/lib.rs
@@ -12,7 +12,7 @@ pub use digest::{self, Digest};
 
 use core::fmt;
 use digest::{
-    array::ArrayOps,
+    array::Array,
     block_buffer::Eager,
     core_api::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
@@ -59,7 +59,7 @@ impl UpdateCore for WhirlpoolCore {
     fn update_blocks(&mut self, blocks: &[Block<Self>]) {
         let block_bits = 8 * Self::block_size() as u64;
         self.update_len(block_bits * (blocks.len() as u64));
-        let blocks = ArrayOps::cast_slice_to_core(blocks);
+        let blocks = Array::cast_slice_to_core(blocks);
         compress(&mut self.state, blocks);
     }
 }