[fix] Checking HMAC return values

LedgerHQ · Dec 15, 2023 · 646ccfc · 646ccfc
1 parent 18c4e74
commit 646ccfc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/nano/nanos_enter_phrase.c b/src/nano/nanos_enter_phrase.c
@@ -16,6 +16,7 @@
 
 #include <os_io_seproxyhal.h>
 #include <lcx_hmac.h>
+#include <ledger_assert.h>
 
 #include "constants.h"
 #include "glyphs.h"
@@ -229,8 +230,10 @@ void compare_recovery_phrase(void) {
     cx_hmac_sha512_t ctx;
     const char key[] = "Bitcoin seed";
 
-    cx_hmac_sha512_init_no_throw(&ctx, (const uint8_t*) key, strlen(key));
-    cx_hmac_no_throw((cx_hmac_t*) &ctx, CX_LAST, buffer, 64, buffer, 64);
+    LEDGER_ASSERT(cx_hmac_sha512_init_no_throw(&ctx, (const uint8_t*) key, strlen(key)) == CX_OK,
+                  "HMAC init failed");
+    LEDGER_ASSERT(cx_hmac_no_throw((cx_hmac_t*) &ctx, CX_LAST, buffer, 64, buffer, 64) == CX_OK,
+                  "HMAC failed");
     PRINTF("Root key from input:\n%.*H\n", 64, buffer);
 
     // get rootkey from device's seed

diff --git a/src/nano/nanox_enter_phrase.c b/src/nano/nanox_enter_phrase.c
@@ -16,6 +16,7 @@
 
 #include <lcx_hmac.h>
 #include <lcx_rng.h>
+#include <ledger_assert.h>
 
 #include "../constants.h"
 #include "../ui.h"
@@ -410,8 +411,10 @@ static uint8_t compare_recovery_phrase(void) {
     cx_hmac_sha512_t ctx;
     const char key[] = "Bitcoin seed";
 
-    cx_hmac_sha512_init_no_throw(&ctx, (const uint8_t*) key, strlen(key));
-    cx_hmac_no_throw((cx_hmac_t*) &ctx, CX_LAST, buffer, 64, buffer, 64);
+    LEDGER_ASSERT(cx_hmac_sha512_init_no_throw(&ctx, (const uint8_t*) key, strlen(key)) == CX_OK,
+                  "HMAC init failed");
+    LEDGER_ASSERT(cx_hmac_no_throw((cx_hmac_t*) &ctx, CX_LAST, buffer, 64, buffer, 64) == CX_OK,
+                  "HMAC failed");
     PRINTF("Root key from input:\n%.*H\n", 64, buffer);
 
     // get rootkey from device's seed

diff --git a/tests/functional/snapshots/stax/check_previous_word/00003.png b/tests/functional/snapshots/stax/check_previous_word/00003.png
diff --git a/tests/functional/snapshots/stax/check_previous_word/00005.png b/tests/functional/snapshots/stax/check_previous_word/00005.png