fix spelling in comments, make fd use more clear, update to macro guards

Author: JacobBarthelmeh

examples/posix/wh_posix_client/wh_posix_client.c

@@ -161,12 +161,12 @@ void Usage(const char* exeName)
     WOLFHSM_CFG_PRINTF("Usage: %s --type <type> --test\n", exeName);
     WOLFHSM_CFG_PRINTF("Example: %s --type tcp\n", exeName);
     WOLFHSM_CFG_PRINTF("type: tcp (default), shm");
-#ifndef WOLFHSM_CFG_NO_CRYPTO
+#ifdef WOLFHSM_CFG_TLS
     WOLFHSM_CFG_PRINTF(", tls");
-#endif
-#ifndef NO_PSK
+#if !defined(NO_PSK)
     WOLFHSM_CFG_PRINTF(", psk");
 #endif
+#endif /* WOLFHSM_CFG_TLS */
 #ifdef WOLFSSL_STATIC_MEMORY
     WOLFHSM_CFG_PRINTF(", dma");
 #endif

port/posix/posix_transport_tls.c

@@ -205,11 +205,13 @@ int posixTransportTls_SendRequest(void* context, uint16_t size,
          * is not listening yet, thats why we need to wait to set the fd in
          * wolfSSL until after the connect() has completed) */
         if (ctx->ssl == NULL) {
+            int fd;
+
             if (posixTransportTcp_GetConnectFd(
-                    (void*)&ctx->tcpCtx, &ctx->connect_fd_p1) != WH_ERROR_OK) {
+                    (void*)&ctx->tcpCtx, &fd) != WH_ERROR_OK) {
                 return WH_ERROR_NOTREADY;
             }
-            ctx->connect_fd_p1++;
+            ctx->connect_fd_p1 = fd + 1; /* follow +1 convetions, 0 is invalid */
 
             ctx->ssl = wolfSSL_new(ctx->ssl_ctx);
             if (!ctx->ssl) {
@@ -218,7 +220,7 @@ int posixTransportTls_SendRequest(void* context, uint16_t size,
             }
 
             /* Set the current socket file descriptor */
-            rc = wolfSSL_set_fd(ctx->ssl, ctx->connect_fd_p1 - 1);
+            rc = wolfSSL_set_fd(ctx->ssl, fd);
             if (rc != WOLFSSL_SUCCESS) {
                 wolfSSL_free(ctx->ssl);
                 ctx->ssl = NULL;

test/wh_test.h

@@ -25,7 +25,7 @@
  * WOLFHSM_CFG_TEST_POSIX : Run tests using POSIX transport
  *
  * WOLFHSM_CFG_TEST_CLIENT_ONLY : Run client-only tests connecting to a running
- *                                server. The default is using a TCP trasnport
+ *                                server. The default is using a TCP transport
  *                                connection. When another specific transports
  *                                are enabled then they will be used instead i.e
  *                                WOLFHSM_CFG_TLS will use TLS transport.