From b26bd5eee44c58cd3e39d9103e797e132001725d Mon Sep 17 00:00:00 2001
From: liquidraver <504870+liquidraver@users.noreply.github.com>
Date: Sun, 31 May 2026 15:36:25 +0200
Subject: [PATCH] fix(rng): hard-fail seed KDF on SHA-256 error

extract_via_aes_ctr used the void Utils::sha256, which silently zeroes
its output on PSA failure -> an all-zero AES key -> a constant,
device-shared Ed25519 identity that the degenerate check misses.
Re-inline psa_hash_compute with its status check so a failure reboots.
---
 zephcore/adapters/rng/ZephyrRNG.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/zephcore/adapters/rng/ZephyrRNG.cpp b/zephcore/adapters/rng/ZephyrRNG.cpp
index 81fc19d..93c575b 100644
--- a/zephcore/adapters/rng/ZephyrRNG.cpp
+++ b/zephcore/adapters/rng/ZephyrRNG.cpp
@@ -132,14 +132,24 @@ static int extract_via_aes_ctr(const uint8_t *pool, size_t pool_len,
 {
 	psa_status_t status;
 	uint8_t key[32];
+	size_t key_len = 0;
 
 	/* PSA is idempotent — already initialized via mbedTLS but a defensive
 	 * call here costs nothing if it returns PSA_ERROR_ALREADY_EXISTS. */
 	(void)psa_crypto_init();
 
-	/* Extract: SHA-256(pool) → AES key. Reuses the codebase's PSA-backed
-	 * SHA-256 wrapper instead of open-coding psa_hash_compute here. */
-	Utils::sha256(key, sizeof(key), pool, (int)pool_len);
+	/* Extract: SHA-256(pool) → AES key.  Open-coded here (NOT Utils::sha256)
+	 * on purpose: that wrapper returns void and silently zeroes its output on
+	 * PSA failure.  A zeroed key imports fine and AES-ECB(key=0) derives a
+	 * fixed, device-independent seed that the all-zero/all-FF degenerate check
+	 * cannot catch — every affected unit would share one Ed25519 identity.  We
+	 * must hard-fail so the caller (mixIdentitySeed) cryptoPanicReboots. */
+	status = psa_hash_compute(PSA_ALG_SHA_256, pool, pool_len,
+				  key, sizeof(key), &key_len);
+	if (status != PSA_SUCCESS || key_len != sizeof(key)) {
+		Utils::secureZeroize(key, sizeof(key));
+		return -1;
+	}
 
 	/* Import key for AES-256-ECB */
 	psa_key_attributes_t attr = PSA_KEY_ATTRIBUTES_INIT;