update macro guards for handling WOLFHSM_CFG_NO_CRYPTO

Author: JacobBarthelmeh

examples/posix/wh_posix_client/wh_posix_client.c

@@ -211,7 +211,7 @@ int main(int argc, char** argv)
         wh_PosixClient_ExampleTlsConfig(c_conf);
     }
 #endif
-#ifndef NO_PSK
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && !defined(NO_PSK)
     else if (strcmp(type, "psk") == 0) {
         printf("Using TLS PSK transport\n");
         wh_PosixClient_ExamplePskConfig(c_conf);

examples/posix/wh_posix_client/wh_posix_client_cfg.h

@@ -7,7 +7,7 @@ int wh_PosixClient_ExampleTcpConfig(void* c_conf);
 #ifndef WOLFHSM_CFG_NO_CRYPTO
 int wh_PosixClient_ExampleTlsConfig(void* c_conf);
 #endif
-#ifndef NO_PSK
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && !defined(NO_PSK)
 int wh_PosixClient_ExamplePskConfig(void* c_conf);
 #endif
 int wh_PosixClient_ExampleSetupDmaMemory(void* ctx, void* c_conf);

examples/posix/wh_posix_server/wh_posix_server.c

@@ -355,7 +355,7 @@ int main(int argc, char** argv)
             return -1;
         }
     }
-#ifndef NO_PSK
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && !defined(NO_PSK)
     else if (strcmp(type, "psk") == 0) {
         printf("Using TLS PSK transport\n");
         rc = wh_PosixServer_ExamplePskConfig(s_conf);

examples/posix/wh_posix_server/wh_posix_server_cfg.h

@@ -9,7 +9,7 @@ int wh_PosixServer_ExampleTcpConfig(void* s_conf);
 #ifndef WOLFHSM_CFG_NO_CRYPTO
 int wh_PosixServer_ExampleTlsConfig(void* s_conf);
 #endif
-#ifndef NO_PSK
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && !defined(NO_PSK)
 int wh_PosixServer_ExamplePskConfig(void* s_conf);
 #endif
 int wh_PosixServer_ExampleNvmConfig(void* conf, const char* nvmInitFilePath);

port/posix/posix_transport_tls.c

@@ -106,11 +106,11 @@ extern int posixTransportTcp_HandleConnect(posixTransportTcpClientContext* c);
 int posixTransportTls_SendRequest(void* context, uint16_t size,
                                   const void* data)
 {
-    int err;
-    int rc;
 #ifndef WOLFHSM_CFG_NO_CRYPTO
     posixTransportTlsClientContext* ctx =
         (posixTransportTlsClientContext*)context;
+    int err;
+    int rc;
 
     if (!ctx || !data || size == 0) {
         return WH_ERROR_BADARGS;
@@ -159,10 +159,11 @@ int posixTransportTls_SendRequest(void* context, uint16_t size,
 int posixTransportTls_RecvResponse(void* context, uint16_t* out_size,
                                    void* data)
 {
-    int err;
 #ifndef WOLFHSM_CFG_NO_CRYPTO
     posixTransportTlsClientContext* ctx =
         (posixTransportTlsClientContext*)context;
+    int rc;
+    int err;
 
     if (!ctx || !data || !out_size) {
         return WH_ERROR_BADARGS;
@@ -181,8 +182,8 @@ int posixTransportTls_RecvResponse(void* context, uint16_t* out_size,
         wolfSSL_set_fd(ctx->ssl, ctx->connect_fd_p1 - 1);
     }
 
-    int rc = wolfSSL_read(ctx->ssl, data, PTTLS_PACKET_MAX_SIZE);
-    err    = wolfSSL_get_error(ctx->ssl, rc);
+    rc  = wolfSSL_read(ctx->ssl, data, PTTLS_PACKET_MAX_SIZE);
+    err = wolfSSL_get_error(ctx->ssl, rc);
     if (rc > 0) {
         *out_size = (uint16_t)rc;
         return WH_ERROR_OK;
@@ -276,6 +277,7 @@ int posixTransportTls_RecvRequest(void* context, uint16_t* out_size, void* data)
     posixTransportTlsServerContext* ctx =
         (posixTransportTlsServerContext*)context;
     int rc;
+    int err;
 
     if (!ctx || !data || !out_size) {
         return WH_ERROR_BADARGS;
@@ -339,8 +341,8 @@ int posixTransportTls_RecvRequest(void* context, uint16_t* out_size, void* data)
     }
 
     /* Read data from SSL connection */
-    rc      = wolfSSL_read(ctx->ssl, data, PTTLS_PACKET_MAX_SIZE);
-    int err = wolfSSL_get_error(ctx->ssl, rc);
+    rc  = wolfSSL_read(ctx->ssl, data, PTTLS_PACKET_MAX_SIZE);
+    err = wolfSSL_get_error(ctx->ssl, rc);
     if (rc > 0) {
         *out_size = (uint16_t)rc;
         return WH_ERROR_OK;