refactor: backport to 0.10

sha1-checked/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sha1-checked"
-version = "0.11.0"
+version = "0.10.0"
 description = "SHA-1 hash function with collision detection"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
@@ -13,18 +13,18 @@ categories = ["cryptography", "no-std"]
 rust-version = "1.72"
 
 [dependencies]
-digest = "=0.11.0-pre.8"
-sha1 = { version = "=0.11.0-pre.3", default-features = false, path = "../sha1" }
+digest = "0.10.7"
+sha1 = { version = "0.10.6", default-features = false, features = ["compress"] }
 
 [dev-dependencies]
-digest = { version = "=0.11.0-pre.8", features = ["dev"] }
+digest = { version = "0.10.7", features = ["dev"] }
 hex-literal = "0.4"
 
 [features]
 default = ["oid", "std"]
 std = ["digest/std", "sha1/std"]
 oid = ["digest/oid", "sha1/oid"] # Enable OID support
-zeroize = ["digest/zeroize", "sha1/zeroize"]
+zeroize = []
 
 
 [package.metadata.docs.rs]

sha1-checked/src/lib.rs

@@ -29,7 +29,6 @@ extern crate std;
 #[cfg(feature = "zeroize")]
 use digest::zeroize::{Zeroize, ZeroizeOnDrop};
 use digest::{
-    array::Array,
     block_buffer::{BlockBuffer, Eager},
     core_api::BlockSizeUser,
     typenum::{Unsigned, U20, U64},
@@ -115,7 +114,7 @@ impl Sha1 {
             compress::finalize(h, bs * self.block_len, last_block, ctx);
         } else {
             let bit_len = 8 * (buffer.get_pos() as u64 + bs * self.block_len);
-            buffer.len64_padding_be(bit_len, |b| sha1::compress(h, from_ref(&b.0)));
+            buffer.len64_padding_be(bit_len, |b| sha1::compress(h, from_ref(b)));
         }
 
         for (chunk, v) in out.chunks_exact_mut(4).zip(h.iter()) {
@@ -181,9 +180,11 @@ impl Update for Sha1 {
         } = self;
         buffer.digest_blocks(input, |blocks| {
             self.block_len += blocks.len() as u64;
-            let blocks = Array::cast_slice_to_core(blocks);
-
             if let Some(ref mut ctx) = detection {
+                // SAFETY: GenericArray<u8, U64> and [u8; 64] have
+                // exactly the same memory layout
+                let blocks: &[[u8; BLOCK_SIZE]] =
+                    unsafe { &*(blocks as *const _ as *const [[u8; BLOCK_SIZE]]) };
                 compress::compress(h, ctx, blocks);
             } else {
                 sha1::compress(h, blocks);