pq sunny day tests, and revert lib wolfssl module change for now.

Author: philljj

.github/workflows/test-sunnyday-simulator.yml

@@ -546,3 +546,15 @@ jobs:
         run: |
           tools/scripts/sim-sunnyday-update.sh
 
+      - name: Run sunny day LMS update test
+        run: |
+          tools/scripts/sim-pq-sunnyday-update.sh config/examples/sim-lms.config
+
+      - name: Run sunny day XMSS update test
+        run: |
+          tools/scripts/sim-pq-sunnyday-update.sh config/examples/sim-xmss.config
+
+      - name: Run sunny day ML-DSA update test
+        run: |
+          tools/scripts/sim-pq-sunnyday-update.sh config/examples/sim-ml-dsa.config
+

config/examples/sim-lms.config

@@ -27,15 +27,15 @@ ARCH=sim
 TARGET=sim
 SIGN?=LMS
 HASH?=SHA256
-LMS_LEVELS=2
-LMS_HEIGHT=5
+LMS_LEVELS=1
+LMS_HEIGHT=10
 LMS_WINTERNITZ=8
+IMAGE_SIGNATURE_SIZE=1456
+IMAGE_HEADER_SIZE=4096
 WOLFBOOT_SMALL_STACK=0
 SPI_FLASH=0
 DEBUG=0
 DELTA_UPDATES=0
-IMAGE_SIGNATURE_SIZE=2644
-IMAGE_HEADER_SIZE?=5288
 
 # sizes should be multiple of system page size
 WOLFBOOT_PARTITION_SIZE=0x40000

config/examples/sim-ml-dsa.config

@@ -38,12 +38,12 @@ DELTA_UPDATES=0
 # Category 2:
 ML_DSA_LEVEL=2
 IMAGE_SIGNATURE_SIZE=2420
-IMAGE_HEADER_SIZE?=4840
+IMAGE_HEADER_SIZE?=8192
 #
 # Category 3:
 # ML_DSA_LEVEL=3
 # IMAGE_SIGNATURE_SIZE=3309
-# IMAGE_HEADER_SIZE?=6618
+# IMAGE_HEADER_SIZE?=8192
 #
 # Category 5:
 # ML_DSA_LEVEL=5
@@ -53,7 +53,7 @@ IMAGE_HEADER_SIZE?=4840
 
 # sizes should be multiple of system page size
 WOLFBOOT_PARTITION_SIZE=0x40000
-WOLFBOOT_SECTOR_SIZE=0x1000
+WOLFBOOT_SECTOR_SIZE=0x2000
 WOLFBOOT_PARTITION_BOOT_ADDRESS=0x20000
 # if on external flash, it should be multiple of system page size
 WOLFBOOT_PARTITION_UPDATE_ADDRESS=0x60000

config/examples/sim-xmss.config

@@ -17,11 +17,11 @@ SPI_FLASH=0
 DEBUG=0
 DELTA_UPDATES=0
 IMAGE_SIGNATURE_SIZE=2500
-IMAGE_HEADER_SIZE?=5000
+IMAGE_HEADER_SIZE?=8192
 
 # sizes should be multiple of system page size
 WOLFBOOT_PARTITION_SIZE=0x40000
-WOLFBOOT_SECTOR_SIZE=0x1000
+WOLFBOOT_SECTOR_SIZE=0x2000
 WOLFBOOT_PARTITION_BOOT_ADDRESS=0x20000
 # if on external flash, it should be multiple of system page size
 WOLFBOOT_PARTITION_UPDATE_ADDRESS=0x60000

lib/wolfssl

@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+# For PQ methods the keytools must be built to match the alg.
+#
+
+print_usage_and_die() {
+  echo "usage:"
+  echo "  ./tools/scripts/sim-pq-sunnyday-update.sh <path to sim-pq dot config>"
+  echo ""
+  echo "example:"
+  echo "  ./tools/scripts/sim-pq-sunnyday-update.sh config/examples/sim-ml-dsa.config"
+  exit 1
+}
+
+err_and_die() {
+  echo "error: $1"
+  exit 1
+}
+
+if [ $# -ne 1 ]; then
+  print_usage_and_die
+fi
+
+sim_pq=$1
+
+if [ ! -f $sim_pq ]; then
+  err_and_die "file not found: $sim_pq"
+fi
+
+cp $sim_pq .config || err_and_die "cp $sim_pq"
+
+make distclean; make clean;
+
+make keytools || err_and_die "keytools build failed"
+
+make test-sim-internal-flash-with-update || err_and_die "make sim failed"
+
+V=`./wolfboot.elf update_trigger get_version 2>/dev/null`
+if [ "x$V" != "x1" ]; then
+    echo "Failed first boot with update_trigger"
+    exit 1
+fi
+
+V=`./wolfboot.elf success get_version 2>/dev/null`
+if [ "x$V" != "x2" ]; then
+    echo "Failed update (V: $V)"
+    exit 1
+fi
+
+echo Test successful.
+exit 0
+
+