Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update wolfssl #509

Merged
merged 7 commits into from
Oct 11, 2024
Merged

Update wolfssl #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f5ad04
Updated submodule 'wolfssl' to latest master
danielinux Oct 9, 2024
c115ed3
Updated footprint limits
danielinux Oct 9, 2024
b65879f
Update to wolfssl with PR 8053
danielinux Oct 9, 2024
2f78ffd
New ECC curve spec size (fixes SMALL_STACK + ECC)
danielinux Oct 11, 2024
ab6b1bb
Fix qemu-fsp build dep
danielinux Oct 11, 2024
855b968
Activate debug in sim_tpm tests
danielinux Oct 11, 2024
8386a50
Added NO_WOLFSSL_MALLOC
danielinux Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-x86-fsp-qemu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: install req
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends -y -q nasm gcc-multilib qemu-system-x86 swtpm
sudo apt-get install --no-install-recommends -y -q nasm gcc-multilib qemu-system-x86 swtpm uuid-dev
- name: setup git
run: |
git config --global user.email "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion config/examples/sim-tpm-keystore.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TARGET=sim
SIGN?=ECC256
HASH?=SHA256
SPI_FLASH=0
DEBUG=0
DEBUG=1
WOLFTPM=1

# sizes should be multiple of system page size
Expand Down
2 changes: 1 addition & 1 deletion config/examples/sim-tpm-measured.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TARGET=sim
SIGN?=ECC256
HASH?=SHA256
SPI_FLASH=0
DEBUG=0
DEBUG=1
WOLFTPM=1

# sizes should be multiple of system page size
Expand Down
2 changes: 1 addition & 1 deletion config/examples/sim-tpm-seal.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TARGET=sim
SIGN?=ECC256
HASH?=SHA256
SPI_FLASH=0
DEBUG=0
DEBUG=1
WOLFTPM=1

# sizes should be multiple of system page size
Expand Down
2 changes: 1 addition & 1 deletion config/examples/sim-tpm.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TARGET=sim
SIGN?=ECC256
HASH?=SHA256
SPI_FLASH=0
DEBUG=0
DEBUG=1
WOLFTPM=1
# enable offloading of asymmetric verify to TPM
WOLFBOOT_TPM_VERIFY?=1
Expand Down
1 change: 1 addition & 0 deletions include/user_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ extern int tolower(int c);
# define WOLFSSL_SP_NO_DYN_STACK
# endif
# if !defined(SECURE_PKCS11)
# define NO_WOLFSSL_MEMORY
# define WOLFSSL_NO_MALLOC
# endif
#else
Expand Down
2 changes: 1 addition & 1 deletion lib/wolfssl
Open in desktop
Submodule wolfssl updated 1187 files
6 changes: 3 additions & 3 deletions src/xmalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ struct xmalloc_slot {
/* SP MATH */
#ifdef WOLFBOOT_SIGN_ECC256
#define MP_SCHEME "SP ECC256"
#define MP_CURVE_SPECS_SIZE (76)
#define MP_CURVE_SPECS_SIZE (72)
#ifdef WOLFSSL_SP_ARM_CORTEX_M_ASM
#define MP_POINT_SIZE (196)
#define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 18 * 8)
Expand All @@ -85,7 +85,7 @@ struct xmalloc_slot {
#endif /* WOLFBOOT_SIGN_ECC256 */
#ifdef WOLFBOOT_SIGN_ECC384
#define MP_SCHEME "SP ECC384"
#define MP_CURVE_SPECS_SIZE (108)
#define MP_CURVE_SPECS_SIZE (104)
#ifdef WOLFSSL_SP_ARM_CORTEX_M_ASM
#define MP_POINT_SIZE (292)
#define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 18 * 12)
Expand All @@ -101,7 +101,7 @@ struct xmalloc_slot {
#endif /* WOLFBOOT_SIGN_ECC384 */
#ifdef WOLFBOOT_SIGN_ECC521
#define MP_SCHEME "SP ECC521"
#define MP_CURVE_SPECS_SIZE (148)
#define MP_CURVE_SPECS_SIZE (144)
#ifdef WOLFSSL_SP_ARM_CORTEX_M_ASM
#define MP_POINT_SIZE (412)
#define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 18 * 17)
Expand Down
12 changes: 6 additions & 6 deletions tools/test.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,23 +991,23 @@ test-size-all:
make clean
make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13480
make keysclean
make test-size SIGN=RSA2048 LIMIT=11124
make test-size SIGN=RSA2048 LIMIT=11212
make clean
make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=11696
make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=11788
make keysclean
make test-size SIGN=RSA4096 LIMIT=11408
make test-size SIGN=RSA4096 LIMIT=11500
make clean
make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=11984
make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=12076
make keysclean
make test-size SIGN=ECC384 LIMIT=17504
make clean
make test-size SIGN=ECC384 NO_ASM=1 LIMIT=14872
make keysclean
make test-size SIGN=ED448 LIMIT=13408
make keysclean
make test-size SIGN=RSA3072 LIMIT=11264
make test-size SIGN=RSA3072 LIMIT=11352
make clean
make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=11804
make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=11892
make keysclean
make test-size SIGN=LMS LMS_LEVELS=2 LMS_HEIGHT=5 LMS_WINTERNITZ=8 \
WOLFBOOT_SMALL_STACK=0 IMAGE_SIGNATURE_SIZE=2644 \
Expand Down
Loading