Skip to content

Commit 9f78389

Browse files
committed
Remove stack restriction on H5 cmake build
+ added includes for pkcs11_test_ecc.c
1 parent 85279da commit 9f78389

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

test-app/CMakeLists.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,16 @@ if(BUILD_TEST_APPS)
139139
wcs/wolfcrypt_secure.c
140140
)
141141
if(WOLFCRYPT_TZ)
142-
target_sources(image PRIVATE
142+
set(WOLFSSL_TZ_TEST_SOURCES
143143
../lib/wolfssl/wolfcrypt/src/logging.c
144144
../lib/wolfssl/wolfcrypt/test/test.c
145145
../lib/wolfssl/wolfcrypt/benchmark/benchmark.c
146146
)
147+
target_sources(image PRIVATE ${WOLFSSL_TZ_TEST_SOURCES})
148+
if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
149+
set_source_files_properties(${WOLFSSL_TZ_TEST_SOURCES}
150+
PROPERTIES COMPILE_OPTIONS "-Wno-stack-usage")
151+
endif()
147152
endif()
148153
endif()
149154
endif()
@@ -193,7 +198,7 @@ if(BUILD_TEST_APPS)
193198

194199
if(WOLFCRYPT_TZ_PKCS11)
195200
list(APPEND TEST_APP_COMPILE_DEFINITIONS WOLFBOOT_PKCS11_APP SECURE_PKCS11)
196-
target_sources(image PRIVATE
201+
set(WOLFSSL_PKCS11_SOURCES
197202
wcs/pkcs11_stub.c
198203
wcs/pkcs11_test_ecc.c
199204
../lib/wolfssl/wolfcrypt/src/ecc.c
@@ -220,6 +225,11 @@ if(BUILD_TEST_APPS)
220225
../lib/wolfssl/wolfcrypt/src/wc_encrypt.c
221226
../lib/wolfssl/wolfcrypt/src/wc_port.c
222227
)
228+
target_sources(image PRIVATE ${WOLFSSL_PKCS11_SOURCES})
229+
if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
230+
set_source_files_properties(${WOLFSSL_PKCS11_SOURCES}
231+
PROPERTIES COMPILE_OPTIONS "-Wno-stack-usage")
232+
endif()
223233
if(SPMATH AND NOT NO_ASM)
224234
list(APPEND TEST_APP_COMPILE_DEFINITIONS WOLFSSL_HAVE_SP_RSA WOLFSSL_HAVE_SP_ECC WOLFSSL_SP_ARM_CORTEX_M_ASM)
225235
target_sources(image PRIVATE ../lib/wolfssl/wolfcrypt/src/sp_cortexm.c)

test-app/wcs/pkcs11_test_ecc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@
2222

2323
#include "user_settings.h"
2424
#include <wolfssl/wolfcrypt/settings.h>
25+
#include <wolfssl/wolfcrypt/types.h>
2526
#include <wolfssl/wolfcrypt/wc_pkcs11.h>
27+
#include <wolfssl/wolfcrypt/ecc.h>
2628
#include <wolfssl/wolfcrypt/asn_public.h>
2729
#include <wolfssl/wolfcrypt/error-crypt.h>
2830
#include <wolfssl/wolfcrypt/logging.h>
31+
#include <wolfssl/wolfcrypt/random.h>
2932

3033
#define wolfBoot_printf(...) do{}while(0)
3134

0 commit comments

Comments
 (0)