From c2768c39f65195dd0d87741198f6e09cb2c108e0 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Fri, 17 Oct 2025 14:35:49 -0600 Subject: [PATCH 1/4] add --test for example CI and adjust include path for example keys --- .github/workflows/build-and-run-examples.yml | 6 ++++++ examples/demo/client/wh_demo_client_crypto.c | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-run-examples.yml b/.github/workflows/build-and-run-examples.yml index 2b59d66ae..04d5fa8e0 100644 --- a/.github/workflows/build-and-run-examples.yml +++ b/.github/workflows/build-and-run-examples.yml @@ -54,6 +54,12 @@ jobs: cd examples/posix/wh_posix_client ./Build/wh_posix_client.elf --type ${{ matrix.transport }} + - name: Run POSIX demo test + if: matrix.transport == 'tcp' + run: | + cd examples/posix/wh_posix_client + ./Build/wh_posix_client.elf --type ${{ matrix.transport }} --test + # Optional: Kill the server process if it doesn't exit on its own - name: Cleanup POSIX server if: always() diff --git a/examples/demo/client/wh_demo_client_crypto.c b/examples/demo/client/wh_demo_client_crypto.c index 0b84327fa..cbb406f1a 100644 --- a/examples/demo/client/wh_demo_client_crypto.c +++ b/examples/demo/client/wh_demo_client_crypto.c @@ -128,7 +128,7 @@ int wh_DemoClient_CryptoRsaImport(whClientContext* clientContext) int keySz; int needEvict = 0; whKeyId keyId = WH_KEYID_ERASED; - char keyFile[] = "../../../demo/certs/rsa-2048-key.der"; + char keyFile[] = "../../demo/certs/rsa-2048-key.der"; const char plainString[] = "The quick brown fox jumps over the lazy dog."; char keyLabel[] = "baby's first key"; uint8_t keyBuf[2048]; @@ -330,11 +330,11 @@ int wh_DemoClient_CryptoCurve25519Import(whClientContext* clientContext) whKeyId keyIdBob = WH_KEYID_ERASED; whKeyId keyIdAlice = WH_KEYID_ERASED; #if 0 - char keyPairFileBob[] = "../../../demo/certs/curve25519_keyBob.der"; - char keyPairFileAlice[] = "../../../demo/certs/curve25519_keyAlice.der"; + char keyPairFileBob[] = "../../demo/certs/curve25519_keyBob.der"; + char keyPairFileAlice[] = "../../demo/certs/curve25519_keyAlice.der"; #else - char keyPairFileBob[] = "../../../demo/certs/curve25519_keyBob.der"; - char keyPairFileAlice[] = "../../../demo/certs/curve25519_keyAlice.der"; + char keyPairFileBob[] = "../../demo/certs/curve25519_keyBob.der"; + char keyPairFileAlice[] = "../../demo/certs/curve25519_keyAlice.der"; #endif char keyLabel[] = "baby's first key"; uint8_t keyBuf[256]; @@ -609,8 +609,8 @@ int wh_DemoClient_CryptoEccImport(whClientContext* clientContext) whKeyId keyIdBob = WH_KEYID_ERASED; word32 outLen; word32 sigLen; - char keyFileAlice[] = "../../../demo/certs/alice-ecc256-key.der"; - char keyFileBob[] = "../../../demo/certs/bob-ecc256-key.der"; + char keyFileAlice[] = "../../demo/certs/alice-ecc256-key.der"; + char keyFileBob[] = "../../demo/certs/bob-ecc256-key.der"; char keyLabel[] = "baby's first key"; ecc_key aliceKey[1]; ecc_key bobKey[1]; From 56f113880f57e80038dabd411eb85716c7e50def Mon Sep 17 00:00:00 2001 From: Brett Nicholas <7547222+bigbrett@users.noreply.github.com> Date: Tue, 21 Oct 2025 09:28:02 -0600 Subject: [PATCH 2/4] condense demo keyfile path, remove unused if 0 --- examples/demo/client/wh_demo_client_crypto.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/examples/demo/client/wh_demo_client_crypto.c b/examples/demo/client/wh_demo_client_crypto.c index cbb406f1a..4516cde37 100644 --- a/examples/demo/client/wh_demo_client_crypto.c +++ b/examples/demo/client/wh_demo_client_crypto.c @@ -128,7 +128,7 @@ int wh_DemoClient_CryptoRsaImport(whClientContext* clientContext) int keySz; int needEvict = 0; whKeyId keyId = WH_KEYID_ERASED; - char keyFile[] = "../../demo/certs/rsa-2048-key.der"; + char keyFile[] = "../certs/rsa-2048-key.der"; const char plainString[] = "The quick brown fox jumps over the lazy dog."; char keyLabel[] = "baby's first key"; uint8_t keyBuf[2048]; @@ -329,13 +329,8 @@ int wh_DemoClient_CryptoCurve25519Import(whClientContext* clientContext) word32 outLen; whKeyId keyIdBob = WH_KEYID_ERASED; whKeyId keyIdAlice = WH_KEYID_ERASED; - #if 0 - char keyPairFileBob[] = "../../demo/certs/curve25519_keyBob.der"; - char keyPairFileAlice[] = "../../demo/certs/curve25519_keyAlice.der"; - #else - char keyPairFileBob[] = "../../demo/certs/curve25519_keyBob.der"; - char keyPairFileAlice[] = "../../demo/certs/curve25519_keyAlice.der"; - #endif + char keyPairFileBob[] = "../certs/curve25519_keyBob.der"; + char keyPairFileAlice[] = "../certs/curve25519_keyAlice.der"; char keyLabel[] = "baby's first key"; uint8_t keyBuf[256]; uint8_t sharedOne[CURVE25519_KEYSIZE]; @@ -609,8 +604,8 @@ int wh_DemoClient_CryptoEccImport(whClientContext* clientContext) whKeyId keyIdBob = WH_KEYID_ERASED; word32 outLen; word32 sigLen; - char keyFileAlice[] = "../../demo/certs/alice-ecc256-key.der"; - char keyFileBob[] = "../../demo/certs/bob-ecc256-key.der"; + char keyFileAlice[] = "../certs/alice-ecc256-key.der"; + char keyFileBob[] = "../certs/bob-ecc256-key.der"; char keyLabel[] = "baby's first key"; ecc_key aliceKey[1]; ecc_key bobKey[1]; From c9df751da23c85a492dfc71ca19e9132541ea360 Mon Sep 17 00:00:00 2001 From: Brett Nicholas <7547222+bigbrett@users.noreply.github.com> Date: Tue, 21 Oct 2025 09:33:57 -0600 Subject: [PATCH 3/4] Revert "condense demo keyfile path, remove unused if 0" This reverts commit 56f113880f57e80038dabd411eb85716c7e50def. --- examples/demo/client/wh_demo_client_crypto.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/examples/demo/client/wh_demo_client_crypto.c b/examples/demo/client/wh_demo_client_crypto.c index 4516cde37..cbb406f1a 100644 --- a/examples/demo/client/wh_demo_client_crypto.c +++ b/examples/demo/client/wh_demo_client_crypto.c @@ -128,7 +128,7 @@ int wh_DemoClient_CryptoRsaImport(whClientContext* clientContext) int keySz; int needEvict = 0; whKeyId keyId = WH_KEYID_ERASED; - char keyFile[] = "../certs/rsa-2048-key.der"; + char keyFile[] = "../../demo/certs/rsa-2048-key.der"; const char plainString[] = "The quick brown fox jumps over the lazy dog."; char keyLabel[] = "baby's first key"; uint8_t keyBuf[2048]; @@ -329,8 +329,13 @@ int wh_DemoClient_CryptoCurve25519Import(whClientContext* clientContext) word32 outLen; whKeyId keyIdBob = WH_KEYID_ERASED; whKeyId keyIdAlice = WH_KEYID_ERASED; - char keyPairFileBob[] = "../certs/curve25519_keyBob.der"; - char keyPairFileAlice[] = "../certs/curve25519_keyAlice.der"; + #if 0 + char keyPairFileBob[] = "../../demo/certs/curve25519_keyBob.der"; + char keyPairFileAlice[] = "../../demo/certs/curve25519_keyAlice.der"; + #else + char keyPairFileBob[] = "../../demo/certs/curve25519_keyBob.der"; + char keyPairFileAlice[] = "../../demo/certs/curve25519_keyAlice.der"; + #endif char keyLabel[] = "baby's first key"; uint8_t keyBuf[256]; uint8_t sharedOne[CURVE25519_KEYSIZE]; @@ -604,8 +609,8 @@ int wh_DemoClient_CryptoEccImport(whClientContext* clientContext) whKeyId keyIdBob = WH_KEYID_ERASED; word32 outLen; word32 sigLen; - char keyFileAlice[] = "../certs/alice-ecc256-key.der"; - char keyFileBob[] = "../certs/bob-ecc256-key.der"; + char keyFileAlice[] = "../../demo/certs/alice-ecc256-key.der"; + char keyFileBob[] = "../../demo/certs/bob-ecc256-key.der"; char keyLabel[] = "baby's first key"; ecc_key aliceKey[1]; ecc_key bobKey[1]; From c7d712257ea0de7dbbe40fcd1e11e3d24de1b989 Mon Sep 17 00:00:00 2001 From: Brett Nicholas <7547222+bigbrett@users.noreply.github.com> Date: Tue, 21 Oct 2025 09:34:58 -0600 Subject: [PATCH 4/4] remove if 0 --- examples/demo/client/wh_demo_client_crypto.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/examples/demo/client/wh_demo_client_crypto.c b/examples/demo/client/wh_demo_client_crypto.c index cbb406f1a..3c14132aa 100644 --- a/examples/demo/client/wh_demo_client_crypto.c +++ b/examples/demo/client/wh_demo_client_crypto.c @@ -329,13 +329,8 @@ int wh_DemoClient_CryptoCurve25519Import(whClientContext* clientContext) word32 outLen; whKeyId keyIdBob = WH_KEYID_ERASED; whKeyId keyIdAlice = WH_KEYID_ERASED; - #if 0 char keyPairFileBob[] = "../../demo/certs/curve25519_keyBob.der"; char keyPairFileAlice[] = "../../demo/certs/curve25519_keyAlice.der"; - #else - char keyPairFileBob[] = "../../demo/certs/curve25519_keyBob.der"; - char keyPairFileAlice[] = "../../demo/certs/curve25519_keyAlice.der"; - #endif char keyLabel[] = "baby's first key"; uint8_t keyBuf[256]; uint8_t sharedOne[CURVE25519_KEYSIZE];