sha1: bump sha1-asm to v0.5

RustCrypto · Jul 18, 2021 · 30d358d · 30d358d
1 parent 5f9d064
commit 30d358d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sha1/Cargo.toml b/sha1/Cargo.toml
@@ -19,7 +19,7 @@ digest = "0.9"
 block-buffer = "0.9"
 opaque-debug = "0.3"
 cfg-if = "1.0"
-sha1-asm = { version = "0.4", optional = true }
+sha1-asm = { version = "0.5", optional = true }
 
 [target.'cfg(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "x86"))'.dependencies]
 cpufeatures = "0.1.5"

diff --git 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
@@ -5,15 +5,13 @@
 /// SHA-1 as well:
 ///
 /// > Enable SHA1 and SHA256 support.
-cpufeatures::new!(sha2_hwcap, "sha2");
+cpufeatures::new!(sha1_hwcap, "sha2");
 
 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);
-        }
+    if sha1_hwcap::get() {
+        sha1_asm::compress(state, blocks);
     } else {
         super::soft::compress(state, blocks);
     }