Fix(SHA): Use correct length padding for SHA384 and SHA512.

- This fixes a long running issue with SHA384 and SHA512, where some digest of specific sizes wouldn't compute correctly, by changing the padding length of the size field.
esp-rs · Aug 10, 2024 · 500b73f · 500b73f
1 parent 941b86c
commit 500b73f
Show file tree

Hide file tree

Showing 5 changed files with 387 additions and 359 deletions.
diff --git a/esp-hal/src/sha.rs b/esp-hal/src/sha.rs
@@ -245,11 +245,12 @@ pub trait Sha<'d, DM: crate::Mode>: core::ops::DerefMut<Target = Context<DM>> {
             }
             self.process_buffer();
 
-            // Wait until buffer has completely processed
-            while self.is_busy() {}
             // Save the content of the current hash for interleaving operation.
             #[cfg(not(esp32))]
             {
+                // Wait until buffer has completely processed
+                while self.is_busy() {}
+
                 let mut saved_digest = [0u8; 64];
                 self.alignment_helper.volatile_read_regset(
                     sha.h_mem(0).as_ptr(),
@@ -303,7 +304,7 @@ pub trait Sha<'d, DM: crate::Mode>: core::ops::DerefMut<Target = Context<DM>> {
         debug_assert!(self.cursor % 4 == 0);
 
         let mod_cursor = self.cursor % chunk_len;
-        if (chunk_len - mod_cursor) < core::mem::size_of::<u64>() {
+        if (chunk_len - mod_cursor) < chunk_len / 8 {
             // Zero out remaining data if buffer is almost full (>=448/896), and process
             // buffer
             let pad_len = chunk_len - mod_cursor;

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -31,7 +31,7 @@ embedded-io-async   = "0.6.1"
 embedded-storage    = "0.3.1"
 esp-alloc           = { path = "../esp-alloc" }
 esp-backtrace       = { path = "../esp-backtrace", features = ["exception-handler", "panic-handler", "println"] }
-esp-hal             = { path = "../esp-hal", features = ["log", "digest"] }
+esp-hal             = { path = "../esp-hal", features = ["log"] }
 esp-hal-embassy     = { path = "../esp-hal-embassy", optional = true }
 esp-hal-smartled    = { path = "../esp-hal-smartled", optional = true }
 esp-ieee802154      = { path = "../esp-ieee802154", optional = true }
@@ -49,7 +49,6 @@ nb                  = "1.1.0"
 p192                = { version = "0.13.0", default-features = false, features = ["arithmetic"] }
 p256                = { version = "0.13.2", default-features = false, features = ["arithmetic"] }
 portable-atomic     = { version = "1.6.0",  default-features = false }
-sha1                = { version = "0.10.6", default-features = false }
 sha2                = { version = "0.10.8", default-features = false }
 smart-leds          = "0.4.0"
 smoltcp             = { version = "0.11.0", default-features = false, features = [ "medium-ethernet", "socket-raw"] }

diff --git a/examples/src/bin/sha_fuzz.rs b/examples/src/bin/sha_fuzz.rs
diff --git a/hil-test/Cargo.toml b/hil-test/Cargo.toml
@@ -147,6 +147,8 @@ hex-literal         = "0.4.1"
 nb                  = "1.1.0"
 p192                = { version = "0.13.0", default-features = false, features = ["arithmetic"] }
 p256                = { version = "0.13.2", default-features = false, features = ["arithmetic"] }
+sha1                = { version = "0.10.6", default-features = false }
+sha2                = { version = "0.10.8", default-features = false }
 
 [features]
 default = ["async", "embassy"]