diff --git a/sha1/src/compress.rs b/sha1/src/compress.rs index 09f24f1f0..66fa3a74f 100644 --- a/sha1/src/compress.rs +++ b/sha1/src/compress.rs @@ -15,9 +15,7 @@ cfg_if::cfg_if! { #[cfg(feature = "asm")] mod soft { pub(crate) fn compress(state: &mut [u32; 5], blocks: &[[u8; 64]]) { - for block in blocks { - sha1_asm::compress(state, block); - } + sha1_asm::compress(state, blocks); } } mod x86; diff --git a/sha1/src/compress/aarch64.rs b/sha1/src/compress/aarch64.rs index 4edd588ef..a704df4f9 100644 --- a/sha1/src/compress/aarch64.rs +++ b/sha1/src/compress/aarch64.rs @@ -7,13 +7,11 @@ /// > Enable SHA1 and SHA256 support. cpufeatures::new!(sha2_hwcap, "sha2"); -pub fn compress(state: &mut [u32; 5], blocks: &[u8; 64]) { +pub fn compress(state: &mut [u32; 5], blocks: &[[u8; 64]]) { // TODO: Replace with https://github.com/rust-lang/rfcs/pull/2725 // after stabilization if sha2_hwcap::get() { - for block in blocks { - sha1_asm::compress(state, block); - } + sha1_asm::compress(state, blocks); } else { super::soft::compress(state, blocks); } diff --git a/sha1/src/consts.rs b/sha1/src/consts.rs index 277576ac9..16908de1d 100644 --- a/sha1/src/consts.rs +++ b/sha1/src/consts.rs @@ -1,17 +1,13 @@ #![allow(clippy::unreadable_literal)] pub const STATE_LEN: usize = 5; - -#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))] pub const BLOCK_LEN: usize = 16; -#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))] +/// Magic constants necessary for SHA-1. pub const K0: u32 = 0x5A827999u32; -#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))] pub const K1: u32 = 0x6ED9EBA1u32; -#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))] pub const K2: u32 = 0x8F1BBCDCu32; -#[cfg(any(not(feature = "asm"), feature = "asm-aarch64"))] pub const K3: u32 = 0xCA62C1D6u32; +/// Magic reset constants necessary for SHA-1. pub const H: [u32; STATE_LEN] = [0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0];