Add software-crypto-hmac-sha256 to Nordic (#746)

google · Feb 17, 2025 · 2c8a347 · 2c8a347
1 parent 004b265
commit 2c8a347
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/crates/board/CHANGELOG.md b/crates/board/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Patch
 
+- Enable `api-crypto-sha{256,384}` when `api-crypto-hmac-sha{256,384}` is enabled
 - Update dependencies
 
 ## 0.8.0

diff --git a/crates/board/Cargo.toml b/crates/board/Cargo.toml
@@ -108,8 +108,16 @@ software-crypto-aes256-gcm = [
   "dep:aes-gcm",
   "internal-software-crypto-aead",
 ]
-software-crypto-hmac-sha256 = ["api-crypto-hmac-sha256", "internal-software-crypto-hmac"]
-software-crypto-hmac-sha384 = ["api-crypto-hmac-sha384", "internal-software-crypto-hmac"]
+software-crypto-hmac-sha256 = [
+  "api-crypto-hmac-sha256",
+  "api-crypto-sha256",
+  "internal-software-crypto-hmac",
+]
+software-crypto-hmac-sha384 = [
+  "api-crypto-hmac-sha384",
+  "api-crypto-sha384",
+  "internal-software-crypto-hmac",
+]
 software-crypto-p256 = [
   "api-crypto-p256",
   "dep:p256",

diff --git a/crates/runner-nordic/Cargo.lock b/crates/runner-nordic/Cargo.lock
diff --git a/crates/runner-nordic/Cargo.toml b/crates/runner-nordic/Cargo.toml
@@ -72,6 +72,10 @@ usb-ctap = ["_usb", "dep:usbd-hid", "wasefire-scheduler/board-api-usb-ctap"]
 usb-serial = ["_usb", "dep:usbd-serial", "wasefire-scheduler/board-api-usb-serial"]
 # Software crypto features.
 software-crypto-aes256-gcm = ["wasefire-scheduler/software-crypto-aes256-gcm"]
+software-crypto-hmac-sha256 = [
+  "software-crypto-sha256",
+  "wasefire-scheduler/software-crypto-hmac-sha256",
+]
 software-crypto-p256 = ["software-crypto-sha256", "wasefire-scheduler/software-crypto-p256"]
 software-crypto-sha256 = ["wasefire-scheduler/software-crypto-sha256"]
 # Exactly one is enabled by xtask.
@@ -91,7 +95,13 @@ release = ["dep:panic-abort"]
 native = ["wasefire-scheduler/native"]
 wasm = ["dep:wasefire-interpreter", "wasefire-scheduler/wasm"]
 # Internal features.
-_software-crypto = ["software-crypto-aes256-gcm", "software-crypto-p256", "software-crypto-sha256"]
+_full = ["_software-crypto", "radio-ble", "usb-ctap", "usb-serial"]
+_software-crypto = [
+  "software-crypto-aes256-gcm",
+  "software-crypto-hmac-sha256",
+  "software-crypto-p256",
+  "software-crypto-sha256",
+]
 _usb = []
 
 [lints]

diff --git a/crates/runner-nordic/src/board/crypto.rs b/crates/runner-nordic/src/board/crypto.rs
@@ -22,6 +22,8 @@ impl crypto::Api for Impl {
     type Aes128Ccm = ccm::Impl;
     #[cfg(feature = "software-crypto-aes256-gcm")]
     type Aes256Gcm = crypto::SoftwareAes256Gcm;
+    #[cfg(feature = "software-crypto-hmac-sha256")]
+    type HmacSha256 = crypto::SoftwareHmacSha256<Self>;
     #[cfg(feature = "software-crypto-p256")]
     type P256 = crypto::SoftwareP256<Impl>;
     #[cfg(feature = "software-crypto-sha256")]

diff --git a/crates/runner-nordic/test.sh b/crates/runner-nordic/test.sh
@@ -19,13 +19,15 @@ set -e
 
 ensure_applet
 
+for feature in $(package_features); do
+  case $feature in _*|debug|release|native|wasm) continue ;; esac
+  x cargo clippy --bin=runner-nordic --target=thumbv7em-none-eabi --features=wasm,debug,$feature
+done
+
 test_helper
 
+cargo check --bin=runner-nordic --target=thumbv7em-none-eabi --features=wasm,debug,_full
 cargo check --bin=runner-nordic --target=thumbv7em-none-eabi --features=wasm,debug
-cargo check --bin=runner-nordic --target=thumbv7em-none-eabi --features=wasm,debug,radio-ble
-cargo check --bin=runner-nordic --target=thumbv7em-none-eabi --features=wasm,debug,usb-ctap
-cargo check --bin=runner-nordic --target=thumbv7em-none-eabi --features=wasm,debug,usb-serial
-cargo check --bin=runner-nordic --target=thumbv7em-none-eabi --features=wasm,debug,_software-crypto
 DEFMT_LOG=trace cargo check --bin=runner-nordic --target=thumbv7em-none-eabi --features=wasm,debug
 cargo check --bin=runner-nordic --target=thumbv7em-none-eabi --features=wasm,release
 cargo check --bin=runner-nordic --target=thumbv7em-none-eabi --features=native,release