updating test case for TLS use and macro guards in posix client example

Author: JacobBarthelmeh

.github/workflows/build-and-run-examples.yml

@@ -26,22 +26,29 @@ jobs:
         repository: wolfssl/wolfssl
         path: wolfssl
 
+    - name: Set TLS Environment Variable
+      run: |
+        if [ "${{ matrix.transport }}" = "tls" ] || [ "${{ matrix.transport }}" = "psk" ]; then
+          echo "TLS=1" >> $GITHUB_ENV
+        else
+          echo "TLS=0" >> $GITHUB_ENV
+        fi
+
     # Build examples
     - name: Build POSIX server
       run: |
         if [ "${{ matrix.transport }}" = "dma" ]; then
           cd examples/posix/wh_posix_server && ${{ matrix.asan }} ${{ matrix.debug }} DMA=1 make -j WOLFSSL_DIR=../../../wolfssl
-        elif [ "${{ matrix.transport }}" = "tls" ]; then
-          cd examples/posix/wh_posix_server && ${{ matrix.asan }} ${{ matrix.debug }} TLS=1 make -j WOLFSSL_DIR=../../../wolfssl
         else
-          cd examples/posix/wh_posix_server && ${{ matrix.asan }} ${{ matrix.debug }} make -j WOLFSSL_DIR=../../../wolfssl
+          cd examples/posix/wh_posix_server && ${{ matrix.asan }} ${{ matrix.debug }} TLS=${{ env.TLS }} make -j WOLFSSL_DIR=../../../wolfssl
         fi
+
     - name: Build POSIX client
       run: |
         if [ "${{ matrix.transport }}" = "dma" ]; then
           cd examples/posix/wh_posix_client && ${{ matrix.asan }} ${{ matrix.debug }} DMA=1 make -j WOLFSSL_DIR=../../../wolfssl
         else
-          cd examples/posix/wh_posix_client && ${{ matrix.asan }} ${{ matrix.debug }} make -j WOLFSSL_DIR=../../../wolfssl
+          cd examples/posix/wh_posix_client && ${{ matrix.asan }} ${{ matrix.debug }} TLS=${{ env.TLS }} make -j WOLFSSL_DIR=../../../wolfssl
         fi
 
     # Start the server in the background

examples/posix/wh_posix_client/Makefile

@@ -112,7 +112,10 @@ DEF += -DWC_USE_DEVID=0x57444D41 -DWC_NO_DEFAULT_DEVID
 CFLAGS += -DWOLFHSM_CFG_DMA
 else
 DEF += -DWC_USE_DEVID=0x5748534D
+endif
 
+ifeq ($(TLS),1)
+CFLAGS += -DWOLFHSM_CFG_TLS
 endif
 
 #wolfCrypt test/benchmark source files

examples/posix/wh_posix_client/wh_posix_client.c

@@ -214,18 +214,18 @@ int main(int argc, char** argv)
         WOLFHSM_CFG_PRINTF("Using shared memory transport\n");
         wh_PosixClient_ExampleShmConfig(c_conf);
     }
-#ifndef WOLFHSM_CFG_NO_CRYPTO
+#ifdef WOLFHSM_CFG_TLS
     else if (strcmp(type, "tls") == 0) {
         WOLFHSM_CFG_PRINTF("Using TLS transport\n");
         wh_PosixClient_ExampleTlsConfig(c_conf);
     }
-#endif
-#if !defined(WOLFHSM_CFG_NO_CRYPTO) && !defined(NO_PSK)
+#if !defined(NO_PSK)
     else if (strcmp(type, "psk") == 0) {
         WOLFHSM_CFG_PRINTF("Using TLS PSK transport\n");
         wh_PosixClient_ExamplePskConfig(c_conf);
     }
-#endif
+#endif /* !NO_PSK */
+#endif /* WOLFHSM_CFG_TLS */
 #ifdef WOLFSSL_STATIC_MEMORY
     else if (strcmp(type, "dma") == 0) {
         WOLFHSM_CFG_PRINTF("Using DMA with shared memory transport\n");

examples/posix/wh_posix_client/wh_posix_client_cfg.c

@@ -10,29 +10,29 @@
 
 #include "port/posix/posix_transport_shm.h"
 #include "port/posix/posix_transport_tcp.h"
-#ifndef WOLFHSM_CFG_NO_CRYPTO
+#ifdef WOLFHSM_CFG_TLS
 #include "port/posix/posix_transport_tls.h"
 #endif
 
 #include <string.h>
 
 posixTransportShmClientContext tccShm;
 posixTransportTcpClientContext tccTcp;
-#ifndef WOLFHSM_CFG_NO_CRYPTO
+#ifdef WOLFHSM_CFG_TLS
 posixTransportTlsClientContext tccTls;
 #endif
 
 posixTransportShmConfig shmConfig;
 posixTransportTcpConfig tcpConfig;
-#ifndef WOLFHSM_CFG_NO_CRYPTO
+#ifdef WOLFHSM_CFG_TLS
 posixTransportTlsConfig tlsConfig;
 #endif
 
 whCommClientConfig c_comm;
 
 whTransportClientCb shmCb = POSIX_TRANSPORT_SHM_CLIENT_CB;
 whTransportClientCb tcpCb = PTT_CLIENT_CB;
-#ifndef WOLFHSM_CFG_NO_CRYPTO
+#ifdef WOLFHSM_CFG_TLS
 whTransportClientCb tlsCb = PTTLS_CLIENT_CB;
 #endif
 
@@ -135,7 +135,7 @@ int wh_PosixClient_ExampleTcpConfig(void* conf)
     return WH_ERROR_OK;
 }
 
-#if !defined(WOLFHSM_CFG_NO_CRYPTO) && !defined(NO_TLS)
+#if defined(WOLFHSM_CFG_TLS)
 /* client configuration setup example for TLS transport */
 #undef USE_CERT_BUFFERS_2048
 #define USE_CERT_BUFFERS_2048
@@ -212,7 +212,7 @@ int wh_PosixClient_ExamplePskConfig(void* conf)
     return WH_ERROR_OK;
 }
 #endif /* NO_PSK */
-#endif /* WOLFHSM_CFG_NO_CRYPTO */
+#endif /* WOLFHSM_CFG_TLS */
 
 
 /* client configuration setup example for transport */

examples/posix/wh_posix_client/wh_posix_client_cfg.h

@@ -4,11 +4,11 @@
 int wh_PosixClient_ExampleShmDmaConfig(void* c_conf);
 int wh_PosixClient_ExampleShmConfig(void* c_conf);
 int wh_PosixClient_ExampleTcpConfig(void* c_conf);
-#ifndef WOLFHSM_CFG_NO_CRYPTO
+#ifdef WOLFHSM_CFG_TLS
 int wh_PosixClient_ExampleTlsConfig(void* c_conf);
-#endif
-#if !defined(WOLFHSM_CFG_NO_CRYPTO) && !defined(NO_PSK)
+#if !defined(NO_PSK)
 int wh_PosixClient_ExamplePskConfig(void* c_conf);
-#endif
+#endif /* !NO_PSK */
+#endif /* WOLFHSM_CFG_TLS */
 int wh_PosixClient_ExampleSetupDmaMemory(void* ctx, void* c_conf);
-#endif /* WH_POSIX_CLIENT_CFG_H */
+#endif /* WH_POSIX_CLIENT_CFG_H */

examples/posix/wh_posix_server/wh_posix_server.c

@@ -283,7 +283,7 @@ static void Usage(const char* exeName)
     WOLFHSM_CFG_PRINTF(", psk");
 #endif
 #endif /* !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_TLS) */
-#ifdef WOLFSSL_CFG_DMA
+#ifdef WOLFHSM_CFG_DMA
     WOLFHSM_CFG_PRINTF(", dma");
 #endif
     WOLFHSM_CFG_PRINTF("\n");
@@ -384,7 +384,7 @@ int main(int argc, char** argv)
     }
 #endif /* !defined(NO_PSK) */
 #endif /* !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_TLS) */
-#ifdef WOLFSSL_CFG_DMA
+#ifdef WOLFHSM_CFG_DMA
     else if (strcmp(type, "dma") == 0) {
         WOLFHSM_CFG_PRINTF("Using DMA with shared memory transport\n");
         rc = wh_PosixServer_ExampleShmDmaConfig(s_conf);
@@ -393,7 +393,7 @@ int main(int argc, char** argv)
             return -1;
         }
     }
-#endif /* WOLFSSL_CFG_DMA */
+#endif /* WOLFHSM_CFG_DMA */
     else {
         WOLFHSM_CFG_PRINTF("Invalid server type: %s\n", type);
         return -1;

examples/posix/wh_posix_server/wh_posix_server_cfg.c

@@ -36,7 +36,7 @@ whTransportServerCb tlsCb = PTTLS_SERVER_CB;
 posixTransportTlsServerContext tscTls;
 #endif
 
-#ifdef WOLFSSL_CFG_DMA
+#ifdef WOLFHSM_CFG_DMA
 whTransportServerCb            dmaCb = POSIX_TRANSPORT_SHM_SERVER_CB;
 posixTransportShmServerContext tscDma;
 whServerDmaConfig              dmaConfig;