Skip to content

Fixes for STM32 TrustZone benchmark #607

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

Merged
danielinux merged 3 commits into from
Oct 16, 2025
Merged

Fixes for STM32 TrustZone benchmark #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19e9d1e
Fix for "benchmark" command to support float with nano.specs. Increas…
dgarske Oct 13, 2025
4c1b39f
Fixes to support latest wolfSSL (disable KDF/PRF)
dgarske Oct 15, 2025
0d66d3e
Reverted change for H5 heap (not needed). Tracked issue down to a mis…
dgarske Oct 15, 2025
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ clean:
$(Q)rm -f tools/keytools/otp/otp-keystore-gen
$(Q)rm -f .stack_usage
$(Q)rm -f $(WH_NVM_BIN) $(WH_NVM_HEX)
$(Q)$(MAKE) -C test-app -s clean
$(Q)$(MAKE) -C test-app clean V=$(V)
$(Q)$(MAKE) -C tools/check_config -s clean
$(Q)$(MAKE) -C stage1 -s clean

Expand Down
9 changes: 9 additions & 0 deletions include/user_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,17 @@ extern int tolower(int c);
# define WOLFSSL_SP_NO_3072
# define WOLFSSL_SP_NO_4096
# define WOLFSSL_SP_2048
# define RSA_MIN_SIZE 2048
# define RSA_MAX_SIZE 2048
# endif
# if defined(WOLFBOOT_SIGN_RSA3072) || defined(WOLFBOOT_SIGN_SECONDARY_RSA3072)
# define FP_MAX_BITS (3072 * 2)
# define SP_INT_BITS 3072
# define WOLFSSL_SP_NO_2048
# define WOLFSSL_SP_NO_4096
# define WOLFSSL_SP_3072
# define RSA_MIN_SIZE 3072
# define RSA_MAX_SIZE 3072
# endif

# if defined(WOLFBOOT_SIGN_RSA4096) || defined(WOLFBOOT_SIGN_SECONDARY_RSA4096)
Expand All @@ -247,6 +251,8 @@ extern int tolower(int c);
# define WOLFSSL_SP_NO_2048
# define WOLFSSL_SP_NO_3072
# define WOLFSSL_SP_4096
# define RSA_MIN_SIZE 4096
# define RSA_MAX_SIZE 4096
# endif
# ifdef WOLFCRYPT_SECURE_MODE
# undef FP_MAX_BITS
Expand All @@ -255,6 +261,8 @@ extern int tolower(int c);
# define WOLFSSL_SP_2048
# define WOLFSSL_SP_3072
# define WOLFSSL_SP_4096
# define RSA_MIN_SIZE 2048
# define RSA_MAX_SIZE 4096
# endif
#else
# define NO_RSA
Expand Down Expand Up @@ -474,6 +482,7 @@ extern int tolower(int c);
#define NO_PKCS12
#define NO_PKCS8
#define NO_CHECK_PRIVATE_KEY
#define NO_KDF

#define BENCH_EMBEDDED
#define NO_CRYPT_TEST
Expand Down
3 changes: 2 additions & 1 deletion test-app/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ ifeq ($(TZEN),1)
APP_OBJS+=./wcs/wc_encrypt.o
APP_OBJS+=./wcs/wc_port.o
endif
CFLAGS+=-DWOLFBOOT_SECURE_CALLS -Wstack-usage=12944
CFLAGS+=-DWOLFBOOT_SECURE_CALLS -Wstack-usage=19184
LDFLAGS+=--specs=nosys.specs -u _printf_float
endif
else
APP_OBJS+=../hal/$(TARGET).o
Expand Down
1 change: 1 addition & 0 deletions test-app/wcs/user_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ extern int tolower(int c);
#define WOLFSSL_NO_SOCK
#define WOLFSSL_IGNORE_FILE_WARN
#define NO_ERROR_STRINGS
#define NO_KDF

#define BENCH_EMBEDDED

Expand Down