commit 76177e1b8e914bee0018044b982aea65a76676fe
author Tamas Ban <tamas.ban@arm.com> Wed Sep 30 08:01:05 2020 +0100
committer Fabio Utzig <utzig@utzig.org> Fri Oct 02 07:31:11 2020 -0300
tree d369186f8310690bf4668fe28193aa77040db85b
parent ee6615def0c6a19e12de159a0621bd725bcb92b9

boot/mynewt: Add fault injection mitigation

Add software countermeasures against fault injection attacks.

Change-Id: Ibea597fd9ee2bf0693f79f5979304143e2b3db2d
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Signed-off-by: Fabio Utzig <fabio.utzig@nordicsemi.no>

boot/mynewt/src/main.c

diff --git a/boot/mynewt/src/main.c b/boot/mynewt/src/main.c
index 6fc5c60..3d1f9d6 100755
--- a/boot/mynewt/src/main.c
+++ b/boot/mynewt/src/main.c
@@ -45,6 +45,8 @@
 #include "bootutil/image.h"
 #include "bootutil/bootutil.h"
 #include "bootutil/bootutil_log.h"
+#include "bootutil/fault_injection_hardening.h"
+#include "bootutil/fault_injection_hardening_delay_rng.h"
 
 #if MYNEWT_VAL(BOOT_CUSTOM_START)
 void boot_custom_start(uintptr_t flash_base, struct boot_rsp *rsp);
@@ -214,6 +216,7 @@
     struct boot_rsp rsp;
     uintptr_t flash_base;
     int rc;
+    fih_int fih_rc = FIH_FAILURE;
 
     hal_bsp_init();
 
@@ -237,8 +240,11 @@
     flash_map_init();
 #endif
 
-    rc = boot_go(&rsp);
-    assert(rc == 0);
+    FIH_CALL(boot_go, fih_rc, &rsp);
+    if (fih_not_eq(fih_rc, FIH_SUCCESS)) {
+        assert(fih_int_decode(fih_rc) == FIH_POSITIVE_VALUE);
+        FIH_PANIC;
+    }
 
     rc = flash_device_base(rsp.br_flash_dev_id, &flash_base);
     assert(rc == 0);