Skip to content

Commit 04d2ecd

Browse files
danielinuxdanielinux
committed
Remove dependency from PQC parameters. Speed up tests.
1 parent b2bf298 commit 04d2ecd

File tree

12 files changed

+72
-140
lines changed

12 files changed

+72
-140
lines changed

‎.github/workflows/footprint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
2323
- name: make clean
2424
run: |
25-
make keysclean && make -C tools/keytools clean && rm -f include/target.h
25+
make keysclean && rm -f include/target.h
2626
2727
- name: Install wolfSSL
2828
run: |
@@ -34,7 +34,7 @@ jobs:
3434
3535
- name: Build key tools
3636
run: |
37-
make -C tools/keytools
37+
make keytools
3838
3939
- name: Build wolfboot and test footprint
4040
run: |

‎.github/workflows/test-build-sim-tpm.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
with:
4545
submodules: true
4646

47-
- name: make distclean
47+
- name: make keysclean
4848
run: |
49-
make distclean
49+
make keysclean
5050
5151
- name: Select config
5252
run: |

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
#
3030
- name: make clean
3131
run: |
32-
make distclean
32+
make keysclean
3333
3434
- name: Select config (32 bit simulator)
3535
run: |
@@ -57,7 +57,7 @@ jobs:
5757
5858
- name: Cleanup to change key type
5959
run: |
60-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
60+
make keysclean
6161
6262
- name: Build wolfboot.elf (ECC384)
6363
run: |
@@ -77,7 +77,7 @@ jobs:
7777
7878
- name: Cleanup to change key type
7979
run: |
80-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
80+
make keysclean
8181
8282
- name: Build wolfboot.elf (ECC521)
8383
run: |
@@ -97,7 +97,7 @@ jobs:
9797
9898
- name: Cleanup to change key type
9999
run: |
100-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
100+
make keysclean
101101
102102
- name: Build wolfboot.elf (RSA2048)
103103
run: |
@@ -117,7 +117,7 @@ jobs:
117117
118118
- name: Cleanup to change key type
119119
run: |
120-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
120+
make keysclean
121121
122122
- name: Build wolfboot.elf (RSA3072)
123123
run: |
@@ -137,7 +137,7 @@ jobs:
137137
138138
- name: Cleanup to change key type
139139
run: |
140-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
140+
make keysclean
141141
142142
- name: Build wolfboot.elf (RSA4096)
143143
run: |
@@ -159,7 +159,7 @@ jobs:
159159
#
160160
- name: make clean
161161
run: |
162-
make distclean
162+
make keysclean
163163
164164
- name: Select config (32 bit simulator)
165165
run: |
@@ -187,7 +187,7 @@ jobs:
187187
188188
- name: Cleanup to change key type
189189
run: |
190-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
190+
make keysclean
191191
192192
- name: Build wolfboot.elf (ECC384, FASTMATH)
193193
run: |
@@ -207,7 +207,7 @@ jobs:
207207
208208
- name: Cleanup to change key type
209209
run: |
210-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
210+
make keysclean
211211
212212
- name: Build wolfboot.elf (ECC521, FASTMATH)
213213
run: |
@@ -227,7 +227,7 @@ jobs:
227227
228228
- name: Cleanup to change key type
229229
run: |
230-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
230+
make keysclean
231231
232232
- name: Build wolfboot.elf (RSA2048, FASTMATH)
233233
run: |
@@ -247,7 +247,7 @@ jobs:
247247
248248
- name: Cleanup to change key type
249249
run: |
250-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
250+
make keysclean
251251
252252
- name: Build wolfboot.elf (RSA3072, FASTMATH)
253253
run: |
@@ -267,7 +267,7 @@ jobs:
267267
268268
- name: Cleanup to change key type
269269
run: |
270-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
270+
make keysclean
271271
272272
- name: Build wolfboot.elf (RSA4096, FASTMATH)
273273
run: |
@@ -290,7 +290,7 @@ jobs:
290290
#
291291
- name: make clean
292292
run: |
293-
make distclean
293+
make keysclean
294294
295295
- name: Select config (64 bit simulator)
296296
run: |
@@ -318,7 +318,7 @@ jobs:
318318
319319
- name: Cleanup to change key type
320320
run: |
321-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
321+
make keysclean
322322
323323
- name: Build wolfboot.elf (ECC384)
324324
run: |
@@ -338,7 +338,7 @@ jobs:
338338
339339
- name: Cleanup to change key type
340340
run: |
341-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
341+
make keysclean
342342
343343
- name: Build wolfboot.elf (ECC521)
344344
run: |
@@ -358,7 +358,7 @@ jobs:
358358
359359
- name: Cleanup to change key type
360360
run: |
361-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
361+
make keysclean
362362
363363
- name: Build wolfboot.elf (RSA2048)
364364
run: |
@@ -378,7 +378,7 @@ jobs:
378378
379379
- name: Cleanup to change key type
380380
run: |
381-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
381+
make keysclean
382382
383383
- name: Build wolfboot.elf (RSA3072)
384384
run: |
@@ -398,7 +398,7 @@ jobs:
398398
399399
- name: Cleanup to change key type
400400
run: |
401-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
401+
make keysclean
402402
403403
- name: Build wolfboot.elf (RSA4096)
404404
run: |
@@ -420,7 +420,7 @@ jobs:
420420
#
421421
- name: make clean
422422
run: |
423-
make distclean
423+
make keysclean
424424
425425
- name: Select config (64 bit simulator)
426426
run: |
@@ -448,7 +448,7 @@ jobs:
448448
449449
- name: Cleanup to change key type
450450
run: |
451-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
451+
make keysclean
452452
453453
- name: Build wolfboot.elf (ECC384, FASTMATH)
454454
run: |
@@ -468,7 +468,7 @@ jobs:
468468
469469
- name: Cleanup to change key type
470470
run: |
471-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
471+
make keysclean
472472
473473
- name: Build wolfboot.elf (ECC521, FASTMATH)
474474
run: |
@@ -488,7 +488,7 @@ jobs:
488488
489489
- name: Cleanup to change key type
490490
run: |
491-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
491+
make keysclean
492492
493493
- name: Build wolfboot.elf (RSA2048, FASTMATH)
494494
run: |
@@ -508,7 +508,7 @@ jobs:
508508
509509
- name: Cleanup to change key type
510510
run: |
511-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
511+
make keysclean
512512
513513
- name: Build wolfboot.elf (RSA3072, FASTMATH)
514514
run: |
@@ -528,7 +528,7 @@ jobs:
528528
529529
- name: Cleanup to change key type
530530
run: |
531-
make -C tools/keytools clean && make keysclean && make -C tools/keytools
531+
make keysclean
532532
533533
- name: Build wolfboot.elf (RSA4096, FASTMATH)
534534
run: |
@@ -562,7 +562,7 @@ jobs:
562562
#
563563
- name: make clean
564564
run: |
565-
make distclean
565+
make keysclean
566566
567567
- name: Select config (64 bit simulator) Hybrid ML_DSA + ECC
568568
run: |

‎Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ include tools/test-renode.mk
204204

205205
hal/$(TARGET).o:
206206

207-
keytools_check: keytools FORCE
207+
keytools_check: keytools
208208

209209
$(PRIVATE_KEY):
210210
$(Q)$(MAKE) keytools_check
@@ -223,7 +223,6 @@ $(SECONDARY_PRIVATE_KEY): $(PRIVATE_KEY) keystore.der
223223

224224
keytools:
225225
@echo "Building key tools"
226-
@$(MAKE) -C tools/keytools -s clean
227226
@$(MAKE) -C tools/keytools -j
228227

229228
tpmtools: include/target.h keys
@@ -281,7 +280,7 @@ wolfboot_stage1.bin: wolfboot.elf stage1/loader_stage1.bin
281280

282281
wolfboot.elf: include/target.h $(LSCRIPT) $(OBJS) $(BINASSEMBLE) FORCE
283282
$(Q)(test $(SIGN) = NONE) || (test $(FLASH_OTP_KEYSTORE) = 1) || (grep -q $(SIGN_ALG) src/keystore.c) || \
284-
(echo "Key mismatch: please run 'make distclean' to remove all keys if you want to change algorithm" && false)
283+
(echo "Key mismatch: please run 'make keysclean' to remove all keys if you want to change algorithm" && false)
285284
@echo "\t[LD] $@"
286285
@echo $(OBJS)
287286
$(Q)$(LD) $(LDFLAGS) $(LSCRIPT_FLAGS) $(SECURE_LDFLAGS) $(LD_START_GROUP) $(OBJS) $(LIBS) $(LD_END_GROUP) -o $@

‎include/wolfboot/wolfboot.h‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,14 @@ extern "C" {
145145
#define KEYSTORE_PUBKEY_SIZE_ML_DSA 1952
146146
#elif ML_DSA_LEVEL == 5
147147
#define KEYSTORE_PUBKEY_SIZE_ML_DSA 2592
148-
#else
149-
#error "Invalid ML_DSA_LEVEL!"
150148
#endif
151-
#endif /* ML_DSA_LEVEL */
149+
#else
150+
#ifdef SIGN_ML_DSA
151+
#error "ML_DSA_LEVEL not defined"
152+
#endif
153+
/* Default to max size for keystore */
154+
#define KEYSTORE_PUBKEY_SIZE_ML_DSA 2592
155+
#endif /* defined ML_DSA_LEVEL */
152156

153157
/* Mask for key permissions */
154158
#define KEY_VERIFY_ALL (0xFFFFFFFFU)

‎test-app/app_stm32f4.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ static const char UPDATE='U';
7878
static const char ACK='#';
7979
static uint8_t msg[MSGSIZE];
8080

81+
extern void flash_set_waitstates(void);
82+
8183

8284
#ifdef WOLFBOOT_NO_SIGN
8385

0 commit comments

Comments
 (0)