typo fix, trim down struct, connect fd variable update

Author: JacobBarthelmeh

examples/posix/wh_posix_client/wh_posix_client_cfg.c

@@ -249,11 +249,9 @@ static int wh_PosixClient_ExampleTlsCommonConfig(void* conf)
 
     memset(&tccTls, 0, sizeof(posixTransportTlsClientContext));
 
-    /* Initialize TCP context fields that need specific values */
+    /* Initialize TLS context fields that need specific values */
     tccTls.state         = 0;
     tccTls.connect_fd_p1 = 0; /* Invalid fd */
-    tccTls.request_sent  = 0;
-    tccTls.buffer_offset = 0;
 
     tlsConfig.server_ip_string = WH_POSIX_SERVER_TCP_IPSTRING;
     tlsConfig.server_port      = WH_POSIX_SERVER_TCP_PORT;

examples/posix/wh_posix_server/wh_posix_server_cfg.c

@@ -304,9 +304,9 @@ wh_PosixServer_ExampleTlsContextSetup(posixTransportTlsServerContext* ctx)
         return WH_ERROR_ABORTED;
     }
 
-    /* Setup server for mutual authentication. It will try to verify the clients
-     * certificate so both the client and server authenticate the peer
-     * connecting with. */
+    /* Setup server for mutual authentication. It will try to verify the
+     * client's certificate so both the client and server authenticate the peer
+     * they are connecting to. */
     wolfSSL_CTX_set_verify(ctx->ssl_ctx, WOLFSSL_VERIFY_PEER, NULL);
 
     return WH_ERROR_OK;

port/posix/posix_transport_tls.c

@@ -127,6 +127,7 @@ int posixTransportTls_SendRequest(void* context, uint16_t size,
                     (void*)&ctx->tcpCtx, &ctx->connect_fd_p1) != WH_ERROR_OK) {
                 return WH_ERROR_NOTREADY;
             }
+            ctx->connect_fd_p1++;
 
             ctx->ssl = wolfSSL_new(ctx->ssl_ctx);
             if (!ctx->ssl) {
@@ -135,7 +136,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);
+            rc = wolfSSL_set_fd(ctx->ssl, ctx->connect_fd_p1 - 1);
             if (rc != WOLFSSL_SUCCESS) {
                 wolfSSL_free(ctx->ssl);
                 ctx->ssl = NULL;
@@ -157,16 +158,16 @@ int posixTransportTls_SendRequest(void* context, uint16_t size,
                      * send was in the TCP backlog waiting on the server. But
                      * if the server closes down the listen port then RST gets
                      * returned. Retry the TCP connect() */
-                     wolfSSL_free(ctx->ssl);
-                     ctx->ssl = NULL;
+                    wolfSSL_free(ctx->ssl);
+                    ctx->ssl = NULL;
 
-                     /* Close the failed socket fd and set state for retry */
-                     if (ctx->tcpCtx.connect_fd_p1 != 0) {
-                        close(ctx->tcpCtx.connect_fd_p1 - 1);
+                    /* Close the failed socket fd and set state for retry */
+                    if (ctx->tcpCtx.connect_fd_p1 != 0) {
                         ctx->tcpCtx.connect_fd_p1 = 0;
                     }
-                     ctx->tcpCtx.state = PTT_STATE_UNCONNECTED;
-                     return WH_ERROR_NOTREADY;
+                    ctx->connect_fd_p1 = 0;
+                    ctx->tcpCtx.state = PTT_STATE_UNCONNECTED;
+                    return WH_ERROR_NOTREADY;
 
                 }
 
@@ -347,7 +348,9 @@ int posixTransportTls_RecvRequest(void* context, uint16_t* out_size, void* data)
         ctx->client_addr  = client_addr;
 
         /* Make accepted socket non-blocking */
-        fcntl(ctx->accept_fd_p1 - 1, F_SETFL, O_NONBLOCK);
+        if (fcntl(ctx->accept_fd_p1 - 1, F_SETFL, O_NONBLOCK) != 0) {
+            return WH_ERROR_ABORTED;
+        }
 
         /* Create SSL object for this connection */
         ctx->ssl = wolfSSL_new(ctx->ssl_ctx);
@@ -378,7 +381,8 @@ int posixTransportTls_RecvRequest(void* context, uint16_t* out_size, void* data)
         }
     }
 
-    /* Read data from SSL connection */
+    /* Read data from SSL connection (also handles continuing on with
+     * handshake if not complete yet) */
     rc  = wolfSSL_read(ctx->ssl, data, PTTLS_PACKET_MAX_SIZE);
     err = wolfSSL_get_error(ctx->ssl, rc);
     if (rc > 0) {
@@ -423,7 +427,7 @@ int posixTransportTls_SendResponse(void* context, uint16_t size,
     }
     else {
         int err = wolfSSL_get_error(ctx->ssl, rc);
-        if (err == WOLFSSL_ERROR_WANT_READ || err == WOLFSSL_ERROR_WANT_WRITE) {
+        if ((NonBlockingError(err))) {
             return WH_ERROR_NOTREADY;
         }
         return WH_ERROR_ABORTED;

port/posix/posix_transport_tls.h

@@ -72,9 +72,6 @@ typedef struct {
     struct sockaddr_in   server_addr;
     pttlsClientState     state;
     int                  connect_fd_p1; /* fd plus 1 so 0 is invalid */
-    int                  request_sent;
-    uint16_t             buffer_offset;
-    uint8_t              buffer[PTTLS_BUFFER_SIZE];
 #ifndef WOLFHSM_CFG_NO_CRYPTO
     WOLFSSL_CTX* ssl_ctx;
     WOLFSSL*     ssl;

test/wh_test.c

@@ -243,11 +243,9 @@ static int whPosixClient_ExampleTlsCommonConfig(void* conf)
 
     memset(&tccTls, 0, sizeof(posixTransportTlsClientContext));
 
-    /* Initialize TCP context fields that need specific values */
+    /* Initialize TLS context fields that need specific values */
     tccTls.state         = 0;
     tccTls.connect_fd_p1 = 0; /* Invalid fd */
-    tccTls.request_sent  = 0;
-    tccTls.buffer_offset = 0;
 
     tlsConfig.server_ip_string = WH_POSIX_SERVER_TCP_IPSTRING;
     tlsConfig.server_port      = WH_POSIX_SERVER_TCP_PORT;