Address comments on #278

Author: AlexLanzano

src/wh_client.c

@@ -83,8 +83,8 @@ int wh_Client_Init(whClientContext* c, const whClientConfig* config)
 
 #ifdef WOLFHSM_CFG_ENABLE_TIMEOUT
     if (config->respTimeoutConfig != NULL) {
-        rc = wh_Timeout_Init(c->respTimeout, config->respTimeoutConfig);
-        if (rc != 0) {
+        rc = wh_Timeout_Init(&c->respTimeout, config->respTimeoutConfig);
+        if (rc != WH_ERROR_OK) {
             return rc;
         }
     }
@@ -208,16 +208,19 @@ int wh_Client_RecvResponse(whClientContext *c,
     return rc;
 }
 
-int wh_Client_RecvResponseTimeout(whClientContext *c,
+int wh_Client_RecvResponseBlockingWithTimeout(whClientContext *c,
         uint16_t *out_group, uint16_t *out_action,
-        uint16_t *out_size, void* data, whTimeoutCtx *timeout)
+        uint16_t *out_size, void* data)
 {
     int ret;
+    whTimeoutCtx* timeout;
 
-    if ((c == NULL) || (timeout == NULL)) {
+    if (c == NULL) {
         return WH_ERROR_BADARGS;
     }
 
+    timeout = &c->respTimeout;
+
     ret = wh_Timeout_Start(timeout);
     if (ret != WH_ERROR_OK) {
         return ret;

src/wh_client_crypto.c

@@ -170,8 +170,7 @@ static int _recvCryptoResponse(whClientContext* ctx,
     int ret;
 
 #ifdef WOLFHSM_CFG_ENABLE_TIMEOUT
-    ret = wh_Client_RecvResponseTimeout(ctx, group, action, size, data,
-                                        ctx->respTimeout);
+    ret = wh_Client_RecvResponseBlockingWithTimeout(ctx, group, action, size, data);
 #else
     do {
         ret = wh_Client_RecvResponse(ctx, group, action, size, data);

src/wh_timeout.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2025 wolfSSL Inc.
+ * Copyright (C) 2026 wolfSSL Inc.
  *
  * This file is part of wolfHSM.
  *

test/wh_test_timeout.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 wolfSSL Inc.
+ * Copyright (C) 2026 wolfSSL Inc.
  *
  * This file is part of wolfHSM.
  *

test/wh_test_timeout.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 wolfSSL Inc.
+ * Copyright (C) 2026 wolfSSL Inc.
  *
  * This file is part of wolfHSM.
  *

wolfhsm/wh_client.h

@@ -123,7 +123,7 @@ struct whClientContext_t {
     whClientCancelCb cancelCb;
 #endif
 #ifdef WOLFHSM_CFG_ENABLE_TIMEOUT
-    whTimeoutCtx respTimeout[1];
+    whTimeoutCtx respTimeout;
 #endif
 #ifdef WOLFHSM_CFG_DMA
     whClientDmaContext dma;
@@ -200,24 +200,21 @@ int wh_Client_SendRequest(whClientContext* c, uint16_t group, uint16_t action,
 int wh_Client_RecvResponse(whClientContext* c, uint16_t* out_group,
                            uint16_t* out_action, uint16_t* out_size,
                            void* data);
-#ifdef WOLFHSM_CFG_ENABLE_TIMEOUT
 /**
- * Receives a response from the server with a timeout window.
+ * Receives a response from the server with a timeout window. The timeout
+ * duration is specified by the respTimeout field in the client context.
  *
  * @param c The client context.
  * @param out_group Pointer to store the received group value.
  * @param out_action Pointer to store the received action value.
  * @param out_size Pointer to store the received size value.
  * @param data Pointer to store the received data.
- * @param timeout The timeout context to use.
  * @return 0 if successful, WH_ERROR_TIMEOUT on expiration, or a negative value
  * if an error occurred.
  */
-int wh_Client_RecvResponseTimeout(whClientContext* c, uint16_t* out_group,
-                                  uint16_t* out_action, uint16_t* out_size,
-                                  void* data, whTimeoutCtx* timeout);
-#endif /* WOLFHSM_CFG_ENABLE_TIMEOUT */
-
+int wh_Client_RecvResponseBlockingWithTimeout(whClientContext* c, uint16_t* out_group,
+                                              uint16_t* out_action, uint16_t* out_size,
+                                              void* data);
 
 /** Comm component functions */
 

wolfhsm/wh_timeout.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2025 wolfSSL Inc.
+ * Copyright (C) 2026 wolfSSL Inc.
  *
  * This file is part of wolfHSM.
  *