Merge pull request #1496 from NickeZ/nickez/da14531-v2

NickeZ · web-flow · commit fd999187c3ae · 2025-06-05T14:14:46.000+02:00
da14531: firmware v2
diff --git a/.ci/ci b/.ci/ci
@@ -6,6 +6,10 @@ set -e
 # Deny warnings in rust. CI will fail to compile any code with warnings in it.
 export RUSTFLAGS="-Dwarnings"
 
+# Check the da14531 firmware matches the hash file, which makes reviewing updates to the binary
+# easier.
+sha256sum --check bitbox-da14531-firmware.bin.sha256
+
 # Check style for C and Rust
 ./.ci/check-style
 
diff --git a/bitbox-da14531-firmware.bin b/bitbox-da14531-firmware.bin
diff --git a/bitbox-da14531-firmware.bin.sha256 b/bitbox-da14531-firmware.bin.sha256
@@ -0,0 +1 @@
+1e4aa8364e935c0785e4f891208307d832f788172e4bf61621de6df9ec3c215f  bitbox-da14531-firmware.bin
diff --git a/src/factorysetup.c b/src/factorysetup.c
@@ -46,8 +46,8 @@
 
 // We commit to the BLE firmware hash here to avoid accidentally installing an unexpected firmware.
 static const uint8_t _allowed_ble_fw_hash[32] =
-    "\x2a\x92\xcc\x7f\xd5\xbf\xb0\x81\x17\x8e\x93\xe8\x13\x2b\x8e\x99\x87\x18\x0b\x1e\x60\x9f\xc8"
-    "\x91\x5c\x98\xeb\x4f\x2b\xe8\x19\x0a";
+    "\x1e\x4a\xa8\x36\x4e\x93\x5c\x07\x85\xe4\xf8\x91\x20\x83\x07\xd8\x32\xf7\x88\x17\x2e\x4b\xf6"
+    "\x16\x21\xde\x6d\xf9\xec\x3c\x21\x5f";
 
 // 65 bytes uncompressed secp256k1 root attestation pubkey.
 #define ROOT_PUBKEY_SIZE 65
diff --git a/src/rust/bitbox02-rust/src/hww/api/bluetooth.rs b/src/rust/bitbox02-rust/src/hww/api/bluetooth.rs
@@ -27,7 +27,7 @@ use alloc::vec::Vec;
 
 use bitbox02::{memory, spi_mem};
 
-const ALLOWED_HASH: &[u8; 32] = b"\x2a\x92\xcc\x7f\xd5\xbf\xb0\x81\x17\x8e\x93\xe8\x13\x2b\x8e\x99\x87\x18\x0b\x1e\x60\x9f\xc8\x91\x5c\x98\xeb\x4f\x2b\xe8\x19\x0a";
+const ALLOWED_HASH: &[u8; 32] = b"\x1e\x4a\xa8\x36\x4e\x93\x5c\x07\x85\xe4\xf8\x91\x20\x83\x07\xd8\x32\xf7\x88\x17\x2e\x4b\xf6\x16\x21\xde\x6d\xf9\xec\x3c\x21\x5f";
 
 // We want to write FW to the memory chip in erase-size chunks, so that we don't repeatedly need to
 // read-erase-write the same sector.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+1e4aa8364e935c0785e4f891208307d832f788172e4bf61621de6df9ec3c215f bitbox-da14531-firmware.bin`