Skip to content

Commit 4ab374d

Browse files
add SHE test with client only TLS
1 parent 19c8802 commit 4ab374d

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/build-and-test-clientonly.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ jobs:
3535
- name: Build POSIX server
3636
run: |
3737
cd examples/posix/wh_posix_server
38-
if [ "${{ matrix.transport }}" = "tcp" ]; then
39-
make -j SHE=1 WOLFSSL_DIR=../../../wolfssl
40-
else
41-
make -j WOLFSSL_DIR=../../../wolfssl
42-
fi
38+
make -j SHE=1 WOLFSSL_DIR=../../../wolfssl
4339
4440
# Start the server in the background
4541
- name: Run POSIX server
@@ -57,7 +53,7 @@ jobs:
5753
if [ "${{ matrix.transport }}" = "tcp" ]; then
5854
make -j CLIENT_ONLY_TCP=1 SHE=1 ASAN=1 WOLFSSL_DIR=../wolfssl && make run
5955
else
60-
make -j CLIENT_ONLY_TLS=1 ASAN=1 WOLFSSL_DIR=../wolfssl && make run
56+
make -j CLIENT_ONLY_TLS=1 SHE=1 ASAN=1 WOLFSSL_DIR=../wolfssl && make run
6157
fi
6258
6359
# Optional: Kill the server process if it doesn't exit on its own

test/wh_test_she.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,8 @@ int whTest_SheServerConfig(whServerConfig* config)
461461
#endif /* WOLFHSM_CFG_ENABLE_SERVER */
462462

463463
#if defined(WOLFHSM_CFG_TEST_POSIX) && defined(WOLFHSM_CFG_ENABLE_CLIENT) && \
464-
!defined(WOLFHSM_CFG_TEST_CLIENT_ONLY_TCP)
464+
!defined(WOLFHSM_CFG_TEST_CLIENT_ONLY_TCP) && \
465+
!defined(WOLFHSM_CFG_TEST_CLIENT_ONLY_TLS)
465466
static void* _whClientTask(void* cf)
466467
{
467468
WH_TEST_ASSERT(0 == whTest_SheClientConfig(cf));

wolfhsm/wh_settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
#error "wolfHSM requires wolfCrypt built without NO_RNG"
234234
#endif
235235

236-
#if defined WOLFHSM_CFG_SHE_EXTENSION
236+
#if defined(WOLFHSM_CFG_SHE_EXTENSION)
237237
#if defined(NO_AES) || \
238238
!defined(WOLFSSL_CMAC) || \
239239
!defined(WOLFSSL_AES_DIRECT) || \

0 commit comments

Comments
 (0)