Skip to content

Commit 21a4082

Browse files
bigbrettbigbrett
authored
Merge pull request #521 from danielinux/build-keytools-windows
Remove compile-time dependencies from key tools
2 parents 06bbed4 + fae36f2 commit 21a4082

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+574
-631
lines changed

‎.github/workflows/build-keytools-windows.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Build Windows Keytools executables
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches: [ '*' ]
9+
10+
jobs:
11+
build-windows:
12+
runs-on: windows-latest
13+
14+
steps:
15+
# Step 1: Checkout the repository
16+
- name: Checkout Code
17+
uses: actions/checkout@v3
18+
with:
19+
submodules: true
20+
21+
# Step 2: Setup MSBuild
22+
- name: Setup MSBuild
23+
uses: microsoft/setup-msbuild@v1
24+
25+
# Step 3: Build the solution
26+
- name: Build Solution
27+
shell: cmd
28+
run: |
29+
echo #define WOLFBOOT_SECTOR_SIZE 1024 > include\target.h
30+
MSBuild.exe tools\keytools\wolfBootKeyTools.sln /m /p:Configuration=Release /p:Platform="x64"
31+
32+
# Step 4: Upload executables as artifacts
33+
- name: Upload EXE Artifacts
34+
uses: actions/upload-artifact@v3
35+
with:
36+
name: windows-keytools
37+
path: |
38+
tools\keytools\x64\Release\*.exe

‎.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-powerfail-simulator.yml‎

Lines changed: 13 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
- name: make clean
1919
run: |
20-
make distclean
20+
make keysclean
2121
2222
- name: Select config
2323
run: |
@@ -63,16 +63,12 @@ jobs:
6363
# TEST with NVM_FLASH_WRITEONCE enabled
6464
- name: make clean
6565
run: |
66-
make distclean
66+
make keysclean
6767
6868
- name: Select config with NVM_FLASH_WRITEONCE
6969
run: |
7070
cp config/examples/sim-nvm-writeonce.config .config
7171
72-
- name: Build tools
73-
run: |
74-
make -C tools/keytools && make -C tools/bin-assemble
75-
7672
- name: Build wolfboot.elf
7773
run: |
7874
make clean && make test-sim-internal-flash-with-update
@@ -109,16 +105,12 @@ jobs:
109105
# TEST with NVM_FLASH_WRITEONCE AND FLAGS_HOME enabled
110106
- name: make clean
111107
run: |
112-
make distclean
108+
make keysclean
113109
114110
- name: Select config with NVM_FLASH_WRITEONCE and FLAGS_HOME
115111
run: |
116112
cp config/examples/sim-nvm-writeonce-flags-home.config .config
117113
118-
- name: Build tools
119-
run: |
120-
make -C tools/keytools && make -C tools/bin-assemble
121-
122114
- name: Build wolfboot.elf
123115
run: |
124116
make clean && make test-sim-internal-flash-with-update
@@ -155,16 +147,12 @@ jobs:
155147
# TEST with NVM_FLASH_WRITEONCE AND FLAGS_HOME AND FLAGS_INVERT enabled
156148
- name: make clean
157149
run: |
158-
make distclean
150+
make keysclean
159151
160152
- name: Select config with NVM_FLASH_WRITEONCE and FLAGS_HOME and FLAGS_INVERT
161153
run: |
162154
cp config/examples/sim-nvm-writeonce-flags-home-invert.config .config
163155
164-
- name: Build tools
165-
run: |
166-
make -C tools/keytools && make -C tools/bin-assemble
167-
168156
- name: Build wolfboot.elf
169157
run: |
170158
make clean && make test-sim-external-flash-with-update
@@ -201,16 +189,12 @@ jobs:
201189
# TEST with DELTA updates
202190
- name: make clean
203191
run: |
204-
make distclean
192+
make keysclean
205193
206194
- name: Select config with DELTA updates
207195
run: |
208196
cp config/examples/sim-delta-update.config .config
209197
210-
- name: Build tools
211-
run: |
212-
make -C tools/keytools && make -C tools/bin-assemble
213-
214198
- name: Build wolfboot.elf
215199
run: |
216200
make clean && make test-sim-internal-flash-with-delta-update
@@ -254,16 +238,12 @@ jobs:
254238
# TEST with encryption (aes128)
255239
- name: make clean
256240
run: |
257-
make distclean
241+
make keysclean
258242
259243
- name: Select config with encrypted updates
260244
run: |
261245
cp config/examples/sim-encrypt-update.config .config
262246
263-
- name: Build tools
264-
run: |
265-
make -C tools/keytools && make -C tools/bin-assemble
266-
267247
- name: Build wolfboot.elf
268248
run: |
269249
make clean && make test-sim-external-flash-with-enc-update
@@ -299,15 +279,11 @@ jobs:
299279
# TEST with encryption (aes128) and delta updates
300280
- name: make clean
301281
run: |
302-
make distclean
282+
make keysclean
303283
- name: Select config with encrypted updates
304284
run: |
305285
cp config/examples/sim-encrypt-delta-update.config .config
306286
307-
- name: Build tools
308-
run: |
309-
make -C tools/keytools && make -C tools/bin-assemble
310-
311287
- name: Build wolfboot.elf
312288
run: |
313289
make clean && make test-sim-external-flash-with-enc-delta-update
@@ -336,16 +312,12 @@ jobs:
336312
# TEST with encryption (aes128) and NVM_FLASH_WRITEONCE
337313
- name: make clean
338314
run: |
339-
make distclean
315+
make keysclean
340316
341317
- name: Select config with encrypted updates
342318
run: |
343319
cp config/examples/sim-encrypt-nvm-writeonce-update.config .config
344320
345-
- name: Build tools
346-
run: |
347-
make -C tools/keytools && make -C tools/bin-assemble
348-
349321
- name: Build wolfboot.elf
350322
run: |
351323
make clean && make test-sim-external-flash-with-enc-update
@@ -463,15 +435,11 @@ jobs:
463435
# TEST with encryption (aes128) and NVM_FLASH_WRITEONCE and DELTA updates
464436
- name: make clean
465437
run: |
466-
make distclean
438+
make keysclean
467439
- name: Select config with encrypted updates
468440
run: |
469441
cp config/examples/sim-encrypt-delta-nvm-writeonce-update.config .config
470442
471-
- name: Build tools
472-
run: |
473-
make -C tools/keytools && make -C tools/bin-assemble
474-
475443
- name: Build wolfboot.elf
476444
run: |
477445
make clean && make test-sim-external-flash-with-enc-delta-update
@@ -499,15 +467,11 @@ jobs:
499467
# TEST with backup disabled
500468
- name: make clean
501469
run: |
502-
make distclean
470+
make keysclean
503471
- name: Select config with backup disabled
504472
run: |
505473
cp config/examples/sim-nobackup.config .config
506474
507-
- name: Build tools
508-
run: |
509-
make -C tools/keytools && make -C tools/bin-assemble
510-
511475
- name: Build wolfboot.elf
512476
run: |
513477
make clean && make test-sim-internal-flash-with-update
@@ -527,15 +491,11 @@ jobs:
527491
# TEST with backup disabled + NVM_FLASH_WRITEONCE
528492
- name: make clean
529493
run: |
530-
make distclean
494+
make keysclean
531495
- name: Select config with backup disabled + NVM WRITEONCE
532496
run: |
533497
cp config/examples/sim-nobackup-nvm-writeonce.config .config
534498
535-
- name: Build tools
536-
run: |
537-
make -C tools/keytools && make -C tools/bin-assemble
538-
539499
- name: Build wolfboot.elf
540500
run: |
541501
make clean && make test-sim-internal-flash-with-update
@@ -555,15 +515,11 @@ jobs:
555515
# TEST with backup disabled + FLAGS_HOME
556516
- name: make clean
557517
run: |
558-
make distclean
518+
make keysclean
559519
- name: Select config with backup disabled + FLAGS_HOME
560520
run: |
561521
cp config/examples/sim-nobackup-flags-home.config .config
562522
563-
- name: Build tools
564-
run: |
565-
make -C tools/keytools && make -C tools/bin-assemble
566-
567523
- name: Build wolfboot.elf
568524
run: |
569525
make clean && make test-sim-internal-flash-with-update
@@ -584,16 +540,12 @@ jobs:
584540
# TEST with FLASH_MULTI_SECTOR_ERASE
585541
- name: make clean
586542
run: |
587-
make distclean
543+
make keysclean
588544
589545
- name: Select config
590546
run: |
591547
cp config/examples/sim.config .config
592548
593-
- name: Build tools
594-
run: |
595-
make -C tools/keytools && make -C tools/bin-assemble
596-
597549
- name: Build wolfboot.elf (FLASH_MULTI_SECTOR_ERASE=1)
598550
run: |
599551
make clean && make test-sim-internal-flash-with-update FLASH_MULTI_SECTOR_ERASE=1

‎.github/workflows/test-renode-nrf52.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
# SIGN=NONE TEST
2424

2525
- name: Renode Tests SIGN=NONE
26-
run: ./tools/renode/docker-test.sh "SIGN=NONE"
26+
run: ./tools/renode/docker-test.sh "SIGN=NONE V=1"
2727

2828

2929
# ECC256 TEST
3030
- name: Renode Tests ECC256
31-
run: ./tools/renode/docker-test.sh "SIGN=ECC256"
31+
run: ./tools/renode/docker-test.sh "SIGN=ECC256 V=1"
3232

3333
# ECC384 TEST
3434
- name: Renode Tests ECC384

0 commit comments

Comments
 (0)