Skip to content

Commit 28518fb

Browse files
authored
Merge branch 'master' into update-flash-elf-tc3xx-integration
2 parents b1ea9e8 + 7c81d6a commit 28518fb

32 files changed

+252
-131
lines changed

.github/workflows/footprint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-24.04
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: true
1717

.github/workflows/test-build-kontron-vx3060-s2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
fsp_qemu_test:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v4
1111
with:
1212
submodules: true
1313
- name: install req

.github/workflows/test-configs.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,13 @@ jobs:
106106
config-file: ./config/examples/kinetis-k82f.config
107107

108108
library_test:
109+
uses: ./.github/workflows/test-build.yml
110+
with:
111+
arch: host
112+
config-file: ./config/examples/library.config
113+
make-args: test-lib
114+
115+
libwolfboot_test:
109116
uses: ./.github/workflows/test-build.yml
110117
with:
111118
arch: host

.github/workflows/test-cppcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: false
1717

.github/workflows/test-library.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: wolfBoot as Library test
2+
3+
on:
4+
push:
5+
branches: [ 'master', 'main', 'release/**' ]
6+
pull_request:
7+
branches: [ '*' ]
8+
9+
jobs:
10+
test-lib:
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
math: [SPMATH=1 WOLFBOOT_SMALL_STACK=0,
17+
SPMATH=1 WOLFBOOT_SMALL_STACK=1,
18+
SPMATHALL=1 WOLFBOOT_SMALL_STACK=0,
19+
SPMATHALL=1 WOLFBOOT_SMALL_STACK=1,
20+
SPMATH=0 SPMATHALL=0 WOLFBOOT_SMALL_STACK=0,
21+
SPMATH=0 SPMATHALL=0 WOLFBOOT_SMALL_STACK=1]
22+
asym: [ed25519, ecc256, ecc384, ecc521, rsa2048, rsa3072, rsa4096, ed448]
23+
hash: [sha256, sha384, sha3]
24+
steps:
25+
- uses: actions/checkout@v4
26+
with:
27+
submodules: true
28+
29+
- name: make clean
30+
run: |
31+
make keysclean && make -C tools/keytools clean && rm -f include/target.h
32+
33+
- name: Build test-lib
34+
env:
35+
ASYM: ${{ matrix.asym }}
36+
HASH: ${{ matrix.hash }}
37+
run: |
38+
cp config/examples/library.config .config
39+
make keytools
40+
./tools/keytools/keygen --${{ matrix.asym }} -g wolfboot_signing_private_key.der
41+
echo "Test" > test.bin
42+
./tools/keytools/sign --${{ matrix.asym }} --${{ matrix.hash }} test.bin wolfboot_signing_private_key.der 1
43+
# Convert asym and hash to upper case
44+
make test-lib SIGN=${ASYM^^} HASH=${HASH^^}
45+
46+
- name: Run test-lib
47+
run: |
48+
./test-lib test_v1_signed.bin
49+
./test-lib test_v1_signed.bin 2>&1 | grep "Firmware Valid"
50+
51+
- name: Run test-lib (expect failure)
52+
run: |
53+
# Corrupt signed binary
54+
truncate -s -1 test_v1_signed.bin
55+
echo "A" >> test_v1_signed.bin
56+
./test-lib test_v1_signed.bin
57+
./test-lib test_v1_signed.bin 2>&1 | grep "Failure"

.github/workflows/test-renode-fastmath.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-22.04
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: true
1717

.github/workflows/test-units.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: true
1717

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ jobs:
5353
uses: actions/checkout@v4
5454
with:
5555
repository: wolfssl/wolfHSM-examples
56+
# Make sure to update this when the wolfHSM submodule is updated!
57+
#ref: wolfHSM-v1.1.0
58+
ref: 3e03bd4d4a8439ed4a8a9577823c89e4c37eb9be
5659
path: wolfHSM-examples
5760

5861
- name: Build example POSIX TCP server

.github/workflows/test-x86-fsp-qemu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
fsp_qemu_test:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v4
1111
with:
1212
submodules: true
1313
- name: install req

.gitignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,15 @@ tools/tpm/pcr_extend
116116
tools/tpm/policy_create
117117
tools/tpm/policy_sign
118118
config/*.ld
119+
test-lib
119120

120121
# Elf preprocessing tools
121122
tools/squashelf/**
122123
!tools/squashelf/squashelf.c
123124
!tools/squashelf/Makefile
124125
!tools/squashelf/README.md
125126

126-
127-
128-
# Generated confiuguration file
127+
# Generated configuration file
129128
.config
130129
.vs
131130
*.filters
@@ -152,7 +151,7 @@ hal/x86_fsp_qemu_stage1.ld
152151

153152
debug/lauterbach
154153

155-
#cland cache
154+
#clangd cache
156155
.cache/*
157156

158157
#gcov files

0 commit comments

Comments
 (0)