Fixes for test failures

pull/618/head
David Garske 2025-10-22 12:16:04 -07:00 committed by Daniele Lacamera
parent a7a8ca5a57
commit 80ec565802
5 changed files with 20 additions and 23 deletions

View File

@ -36,9 +36,8 @@ CFLAGS_EXTRA+=-DUSE_SLOW_SHA256
#Partition: Boot: 10KB, App, 10KB
WOLFBOOT_PARTITION_SIZE?=0x2800
WOLFBOOT_SECTOR_SIZE?=0x800
#Max WOLFBOOT size is 10KB
WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08002800
WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x085000
WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x08005000
WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x08007800
#Example debugging partition for larger wolfBoot

View File

@ -27,15 +27,14 @@ CFLAGS_EXTRA+=-DUSE_SLOW_SHA256
# Requires using the STM32CubeProgrammer to set FLASH_SECR -> SEC_SIZE pages
#CFLAGS_EXTRA+=-DFLASH_SECURABLE_MEMORY_SUPPORT
#Partition: Boot: 10KB, App, 10KB
#Partition: Boot: 12KB, App, 8KB
WOLFBOOT_PARTITION_SIZE?=0x2000
WOLFBOOT_SECTOR_SIZE?=0x800
#Max WOLFBOOT size is 10KB
WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08002800
WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08003000
WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x08005000
WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x08007800
#Example debugging partition for larger wolfBoot
#Partition: Boot: 22KB, App, 4K
#DEBUG?=1

@ -1 +1 @@
Subproject commit 1eda4bc257636617e12c6ce340a416ef3f9e902a
Subproject commit 8ac56d726732ac6bd9cc2da3aef066c7daaddf9e

View File

@ -116,8 +116,7 @@ XMSS_EXTRA=\
-D"WOLFSSL_XMSS_VERIFY_ONLY" -D"WOLFSSL_XMSS_MAX_HEIGHT=32"
ML_DSA_OBJS=\
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/dilithium.o \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/memory.o
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/dilithium.o
ML_DSA_EXTRA=\
-D"ML_DSA_IMAGE_SIGNATURE_SIZE"=$(IMAGE_SIGNATURE_SIZE) \

View File

@ -961,40 +961,40 @@ test-all: clean
test-size-all:
make test-size SIGN=NONE LIMIT=4854 NO_ARM_ASM=1
make test-size SIGN=NONE LIMIT=4896 NO_ARM_ASM=1
make keysclean
make test-size SIGN=ED25519 LIMIT=11458 NO_ARM_ASM=1
make test-size SIGN=ED25519 LIMIT=11548 NO_ARM_ASM=1
make keysclean
make test-size SIGN=ECC256 LIMIT=18656 NO_ARM_ASM=1
make clean
make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13566 NO_ARM_ASM=1
make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13700 NO_ARM_ASM=1
make keysclean
make test-size SIGN=RSA2048 LIMIT=11302 NO_ARM_ASM=1
make test-size SIGN=RSA2048 LIMIT=11396 NO_ARM_ASM=1
make clean
make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=11882 NO_ARM_ASM=1
make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=11976 NO_ARM_ASM=1
make keysclean
make test-size SIGN=RSA4096 LIMIT=11586 NO_ARM_ASM=1
make test-size SIGN=RSA4096 LIMIT=11680 NO_ARM_ASM=1
make clean
make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=12166 NO_ARM_ASM=1
make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=12260 NO_ARM_ASM=1
make keysclean
make test-size SIGN=ECC384 LIMIT=18616 NO_ARM_ASM=1
make clean
make test-size SIGN=ECC384 NO_ASM=1 LIMIT=14942 NO_ARM_ASM=1
make test-size SIGN=ECC384 NO_ASM=1 LIMIT=15076 NO_ARM_ASM=1
make keysclean
make test-size SIGN=ED448 LIMIT=13526 NO_ARM_ASM=1
make test-size SIGN=ED448 LIMIT=13616 NO_ARM_ASM=1
make keysclean
make test-size SIGN=RSA3072 LIMIT=11444 NO_ARM_ASM=1
make test-size SIGN=RSA3072 LIMIT=11536 NO_ARM_ASM=1
make clean
make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=11988 NO_ARM_ASM=1
make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=12080 NO_ARM_ASM=1
make keysclean
make test-size SIGN=LMS LMS_LEVELS=2 LMS_HEIGHT=5 LMS_WINTERNITZ=8 \
WOLFBOOT_SMALL_STACK=0 IMAGE_SIGNATURE_SIZE=2644 \
IMAGE_HEADER_SIZE?=5288 LIMIT=7546 NO_ARM_ASM=1
IMAGE_HEADER_SIZE?=5288 LIMIT=7620 NO_ARM_ASM=1
make keysclean
make test-size SIGN=XMSS XMSS_PARAMS='XMSS-SHA2_10_256' \
IMAGE_SIGNATURE_SIZE=2500 IMAGE_HEADER_SIZE?=4096 \
LIMIT=8322 NO_ARM_ASM=1
LIMIT=8408 NO_ARM_ASM=1
make keysclean
make clean
make test-size SIGN=ML_DSA ML_DSA_LEVEL=2 LIMIT=18880 \
make test-size SIGN=ML_DSA ML_DSA_LEVEL=2 LIMIT=19246 \
IMAGE_SIGNATURE_SIZE=2420 IMAGE_HEADER_SIZE?=8192