Remove dependency from PQC parameters. Speed up tests.

wolfSSL · Dec 2, 2024 · 04d2ecd · 04d2ecd
1 parent b2bf298
commit 04d2ecd
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 140 deletions.
diff --git a/.github/workflows/footprint.yml b/.github/workflows/footprint.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: make clean
         run: |
-          make keysclean && make -C tools/keytools clean && rm -f include/target.h
+          make keysclean && rm -f include/target.h
 
       - name: Install wolfSSL
         run: |
@@ -34,7 +34,7 @@ jobs:
 
       - name: Build key tools
         run: |
-          make -C tools/keytools
+          make keytools
 
       - name: Build wolfboot and test footprint
         run: |

diff --git a/.github/workflows/test-build-sim-tpm.yml b/.github/workflows/test-build-sim-tpm.yml
@@ -44,9 +44,9 @@ jobs:
         with:
           submodules: true
 
-      - name: make distclean
+      - name: make keysclean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config
         run: |

diff --git a/.github/workflows/test-sunnyday-simulator.yml b/.github/workflows/test-sunnyday-simulator.yml
@@ -29,7 +29,7 @@ jobs:
       #
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config (32 bit simulator)
         run: |
@@ -57,7 +57,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (ECC384)
         run: |
@@ -77,7 +77,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (ECC521)
         run: |
@@ -97,7 +97,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA2048)
         run: |
@@ -117,7 +117,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA3072)
         run: |
@@ -137,7 +137,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA4096)
         run: |
@@ -159,7 +159,7 @@ jobs:
       #
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config (32 bit simulator)
         run: |
@@ -187,7 +187,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (ECC384, FASTMATH)
         run: |
@@ -207,7 +207,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (ECC521, FASTMATH)
         run: |
@@ -227,7 +227,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA2048, FASTMATH)
         run: |
@@ -247,7 +247,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA3072, FASTMATH)
         run: |
@@ -267,7 +267,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA4096, FASTMATH)
         run: |
@@ -290,7 +290,7 @@ jobs:
       #
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config (64 bit simulator)
         run: |
@@ -318,7 +318,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (ECC384)
         run: |
@@ -338,7 +338,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (ECC521)
         run: |
@@ -358,7 +358,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA2048)
         run: |
@@ -378,7 +378,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA3072)
         run: |
@@ -398,7 +398,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA4096)
         run: |
@@ -420,7 +420,7 @@ jobs:
       #
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config (64 bit simulator)
         run: |
@@ -448,7 +448,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (ECC384, FASTMATH)
         run: |
@@ -468,7 +468,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (ECC521, FASTMATH)
         run: |
@@ -488,7 +488,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA2048, FASTMATH)
         run: |
@@ -508,7 +508,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA3072, FASTMATH)
         run: |
@@ -528,7 +528,7 @@ jobs:
 
       - name: Cleanup to change key type
         run: |
-          make -C tools/keytools clean && make keysclean && make -C tools/keytools
+          make keysclean
 
       - name: Build wolfboot.elf (RSA4096, FASTMATH)
         run: |
@@ -562,7 +562,7 @@ jobs:
       #
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config (64 bit simulator) Hybrid ML_DSA + ECC
         run: |

diff --git a/Makefile b/Makefile
@@ -204,7 +204,7 @@ include tools/test-renode.mk
 
 hal/$(TARGET).o:
 
-keytools_check: keytools FORCE
+keytools_check: keytools
 
 $(PRIVATE_KEY):
 	$(Q)$(MAKE) keytools_check
@@ -223,7 +223,6 @@ $(SECONDARY_PRIVATE_KEY): $(PRIVATE_KEY) keystore.der
 
 keytools:
 	@echo "Building key tools"
-	@$(MAKE) -C tools/keytools -s clean
 	@$(MAKE) -C tools/keytools -j
 
 tpmtools: include/target.h keys
@@ -281,7 +280,7 @@ wolfboot_stage1.bin: wolfboot.elf stage1/loader_stage1.bin
 
 wolfboot.elf: include/target.h $(LSCRIPT) $(OBJS) $(BINASSEMBLE) FORCE
 	$(Q)(test $(SIGN) = NONE) || (test $(FLASH_OTP_KEYSTORE) = 1) || (grep -q $(SIGN_ALG) src/keystore.c) || \
-		(echo "Key mismatch: please run 'make distclean' to remove all keys if you want to change algorithm" && false)
+		(echo "Key mismatch: please run 'make keysclean' to remove all keys if you want to change algorithm" && false)
 	@echo "\t[LD] $@"
 	@echo $(OBJS)
 	$(Q)$(LD) $(LDFLAGS) $(LSCRIPT_FLAGS) $(SECURE_LDFLAGS) $(LD_START_GROUP) $(OBJS) $(LIBS) $(LD_END_GROUP) -o $@

diff --git a/include/wolfboot/wolfboot.h b/include/wolfboot/wolfboot.h
@@ -145,10 +145,14 @@ extern "C" {
         #define KEYSTORE_PUBKEY_SIZE_ML_DSA  1952
     #elif ML_DSA_LEVEL == 5
         #define KEYSTORE_PUBKEY_SIZE_ML_DSA  2592
-    #else
-        #error "Invalid ML_DSA_LEVEL!"
     #endif
-#endif /* ML_DSA_LEVEL */
+#else
+    #ifdef SIGN_ML_DSA
+        #error "ML_DSA_LEVEL not defined"
+    #endif
+    /* Default to max size for keystore */
+    #define KEYSTORE_PUBKEY_SIZE_ML_DSA  2592
+#endif /* defined ML_DSA_LEVEL */
 
 /* Mask for key permissions */
 #define KEY_VERIFY_ALL         (0xFFFFFFFFU)

diff --git a/test-app/app_stm32f4.c b/test-app/app_stm32f4.c
@@ -78,6 +78,8 @@ static const char UPDATE='U';
 static const char ACK='#';
 static uint8_t msg[MSGSIZE];
 
+extern void flash_set_waitstates(void);
+
 
 #ifdef WOLFBOOT_NO_SIGN