Fixed linker script for emu-app, addressed more comments

Author: danielinux

src/image.c

@@ -2183,6 +2183,7 @@ int wolfBoot_verify_authenticity(struct wolfBoot_image *img)
     if (SIG_OK(img)) {
         uint8_t *stored_secondary_signature;
         uint16_t stored_secondary_signature_size;
+        uint16_t expected_secondary_signature_size = 0;
         /* Invalidate the signature_ok flag */
         wolfBoot_image_clear_signature_ok(img);
         /* Load the pubkey hint for the secondary key */
@@ -2199,10 +2200,40 @@ int wolfBoot_verify_authenticity(struct wolfBoot_image *img)
             CONFIRM_MASK_VALID(image_part, key_mask);
             stored_secondary_signature_size = get_header(img,
                     HDR_SECONDARY_SIGNATURE, &stored_secondary_signature);
+            if (stored_secondary_signature_size == 0 ||
+                    stored_secondary_signature == NULL) {
+                return -1;
+            }
+#if defined(WOLFBOOT_SIGN_SECONDARY_ED25519)
+            expected_secondary_signature_size = ED25519_IMAGE_SIGNATURE_SIZE;
+#elif defined(WOLFBOOT_SIGN_SECONDARY_ED448)
+            expected_secondary_signature_size = ED448_IMAGE_SIGNATURE_SIZE;
+#elif defined (WOLFBOOT_SIGN_SECONDARY_RSA2048) || \
+      defined (WOLFBOOT_SIGN_SECONDARY_RSA3072) || \
+      defined (WOLFBOOT_SIGN_SECONDARY_RSA4096) || \
+      defined (WOLFBOOT_SIGN_SECONDARY_RSA2048ENC) || \
+      defined (WOLFBOOT_SIGN_SECONDARY_RSA3072ENC) || \
+      defined (WOLFBOOT_SIGN_SECONDARY_RSA4096ENC)
+            expected_secondary_signature_size = RSA_IMAGE_SIGNATURE_SIZE;
+#elif defined (WOLFBOOT_SIGN_SECONDARY_ECC256) || \
+      defined (WOLFBOOT_SIGN_SECONDARY_ECC384) || \
+      defined (WOLFBOOT_SIGN_SECONDARY_ECC521)
+            expected_secondary_signature_size = ECC_IMAGE_SIGNATURE_SIZE;
+#elif defined(WOLFBOOT_SIGN_SECONDARY_LMS)
+            expected_secondary_signature_size = LMS_IMAGE_SIGNATURE_SIZE;
+#elif defined(WOLFBOOT_SIGN_SECONDARY_XMSS)
+            expected_secondary_signature_size = XMSS_IMAGE_SIGNATURE_SIZE;
+#elif defined(WOLFBOOT_SIGN_SECONDARY_ML_DSA)
+            expected_secondary_signature_size = ML_DSA_IMAGE_SIGNATURE_SIZE;
+#endif
+            if (expected_secondary_signature_size == 0 ||
+                    stored_secondary_signature_size !=
+                    expected_secondary_signature_size) {
+                return -1;
+            }
             wolfBoot_printf("Verification of hybrid signature\n");
             wolfBoot_verify_signature_secondary(key_slot, img,
                     stored_secondary_signature);
-            (void)stored_secondary_signature_size;
             wolfBoot_printf("Done.\n");
         }
     }

test-app/app_stm32h5.c

@@ -144,7 +144,7 @@ void boot_time_pin_on_early(void)
     reg = GPIOA_MODER & ~(0x03 << (pin * 2));
     GPIOA_MODER = reg | (1 << (pin * 2));
     GPIOA_PUPDR &= ~(0x03 << (pin * 2));
-    GPIOA_BSRR |= (1 << (pin));
+    GPIOA_BSRR = (1 << (pin));
 }
 
 static void boot_led_off(void)

test-app/emu-test-apps/stm32u585/target.ld.in

@@ -23,7 +23,7 @@
 MEMORY
 {
     FLASH (rx)  : ORIGIN = @FLASH_ORIGIN@, LENGTH = 0x001FFF00
-    RAM   (rwx) : ORIGIN = 0x20040000,    LENGTH = 0x00080000
+    RAM   (rwx) : ORIGIN = 0x20020000,    LENGTH = 0x00020000
 }
 
 _estack = ORIGIN(RAM) + LENGTH(RAM);

test-app/emu-test-apps/test.sh

@@ -134,7 +134,7 @@ get_check_config_val() {
   local key="$1"
   local val
   make -C "$WOLFBOOT_ROOT" include/target.h >/dev/null
-  make -C "$WOLFBOOT_ROOT/tools/check_config" check_config CROSS_COMPILE=arm-none-eabi- RAM_CODE=0 >/dev/null
+  make -C "$WOLFBOOT_ROOT/tools/check_config" check_config RAM_CODE=0 >/dev/null
   val="$("$WOLFBOOT_ROOT/tools/check_config/check_config" | grep -m1 "^${key}" | sed 's/.*: *//')"
   [[ -n "$val" ]] || die "missing ${key} from tools/check_config output"
   echo "0x$val"

tools/check_config/Makefile

@@ -3,8 +3,7 @@
 include ../config.mk
 include ../../options.mk
 
-CROSS_COMPILE?=
-CC?=$(CROSS_COMPILE)gcc
+HOSTCC?=gcc
 CFLAGS+=-I. -I../../ -I../../include
 
 .PHONY: run clean
@@ -14,11 +13,11 @@ run:
 	$(Q)$(MAKE) check_config
 
 check_config: check_config.o
-	$(Q)$(CC) -o $@ $^ $(CFLAGS)
+	$(Q)$(HOSTCC) -o $@ $^ $(CFLAGS)
 	$(Q)./$@
 
 %.o:%.c
-	$(Q)$(CC) -c -o $@ $^ $(CFLAGS)
+	$(Q)$(HOSTCC) -c -o $@ $^ $(CFLAGS)
 
 clean:
 	$(Q)rm -f check_config *.o

tools/scripts/boot-time.py

@@ -34,9 +34,9 @@ def dump_vals(req, offs):
 
 def drain_events(req):
     try:
-        evs = req.read_edge_events()
-    except Exception:
-        pass
+        req.read_edge_events()
+    except Exception as e:
+        print(f"Warning: failed to read edge events: {e}")
 
 def main():
 
@@ -92,4 +92,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-