Address Brett's comments

Author: AlexLanzano

port/posix/posix_timeout.c

@@ -56,14 +56,9 @@ int posixTimeout_Init(void* context, const void* config)
         return WH_ERROR_BADARGS;
     }
 
-    /* Already initialized? */
-    if (ctx->initialized) {
-        return WH_ERROR_OK;
-    }
-
     ctx->startUs   = 0;
     ctx->timeoutUs = (cfg != NULL) ? cfg->timeoutUs : 0;
-    ctx->started   = 0;
+    ctx->running   = 0;
 
     ctx->initialized = 1;
     return WH_ERROR_OK;
@@ -77,14 +72,9 @@ int posixTimeout_Cleanup(void* context)
         return WH_ERROR_BADARGS;
     }
 
-    /* Not initialized? */
-    if (!ctx->initialized) {
-        return WH_ERROR_OK;
-    }
-
     ctx->startUs     = 0;
     ctx->timeoutUs   = 0;
-    ctx->started     = 0;
+    ctx->running     = 0;
     ctx->initialized = 0;
 
     return WH_ERROR_OK;
@@ -99,7 +89,7 @@ int posixTimeout_Set(void* context, uint64_t timeoutUs)
     }
 
     if (!ctx->initialized) {
-        return WH_ERROR_NOTREADY;
+        return WH_ERROR_BADARGS;
     }
 
     ctx->timeoutUs = timeoutUs;
@@ -116,11 +106,11 @@ int posixTimeout_Start(void* context)
     }
 
     if (!ctx->initialized) {
-        return WH_ERROR_NOTREADY;
+        return WH_ERROR_BADARGS;
     }
 
     ctx->startUs = _getMonotonicTimeUs();
-    ctx->started = 1;
+    ctx->running = 1;
 
     return WH_ERROR_OK;
 }
@@ -134,11 +124,11 @@ int posixTimeout_Stop(void* context)
     }
 
     if (!ctx->initialized) {
-        return WH_ERROR_NOTREADY;
+        return WH_ERROR_BADARGS;
     }
 
     ctx->startUs = 0;
-    ctx->started = 0;
+    ctx->running = 0;
 
     return WH_ERROR_OK;
 }
@@ -153,11 +143,11 @@ int posixTimeout_Expired(void* context, int* expired)
     }
 
     if (!ctx->initialized) {
-        return WH_ERROR_NOTREADY;
+        return WH_ERROR_BADARGS;
     }
 
     /* Not started or no timeout configured = not expired */
-    if (!ctx->started || (ctx->timeoutUs == 0)) {
+    if (!ctx->running || (ctx->timeoutUs == 0)) {
         *expired = 0;
         return WH_ERROR_OK;
     }

port/posix/posix_timeout.h

@@ -43,7 +43,7 @@ typedef struct posixTimeoutConfig_t {
 typedef struct posixTimeoutContext_t {
     uint64_t startUs;     /* Snapshot of start time */
     uint64_t timeoutUs;   /* Configured timeout duration */
-    int      started;     /* 1 if timer is running, 0 otherwise */
+    int      running;     /* 1 if timer is running, 0 otherwise */
     int      initialized; /* 1 if initialized, 0 otherwise */
 } posixTimeoutContext;
 

test/wh_test.c

@@ -74,9 +74,6 @@ int whTest_Unit(void)
     /* Component Tests */
     WH_TEST_ASSERT(0 == whTest_Flash_RamSim());
     WH_TEST_ASSERT(0 == whTest_NvmFlash());
-#ifdef WOLFHSM_CFG_ENABLE_TIMEOUT
-    WH_TEST_ASSERT(0 == whTest_Timeout());
-#endif
 #ifdef WOLFHSM_CFG_LOGGING
     WH_TEST_ASSERT(0 == whTest_Log());
 #endif
@@ -124,6 +121,10 @@ int whTest_Unit(void)
 
 #endif /* !WOLFHSM_CFG_NO_CRYPTO */
 
+#if defined(WOLFHSM_CFG_ENABLE_TIMEOUT) && defined(WOLFHSM_CFG_TEST_POSIX)
+    WH_TEST_ASSERT(0 == whTest_TimeoutPosix());
+#endif
+
     return 0;
 }
 #endif /* WOLFHSM_CFG_ENABLE_CLIENT && WOLFHSM_CFG_ENABLE_SERVER */
@@ -157,6 +158,10 @@ int whTest_ClientConfig(whClientConfig* clientCfg)
     WH_TEST_RETURN_ON_FAIL(whTest_WolfCryptTestCfg(clientCfg));
 #endif /* WOLFHSM_CFG_TEST_WOLFCRYPTTEST */
 
+#if defined(WOLFHSM_CFG_ENABLE_TIMEOUT)
+    WH_TEST_RETURN_ON_FAIL(whTest_TimeoutClientConfig(clientCfg));
+#endif /* WOLFHSM_CFG_ENABLE_TIMEOUT */
+
     return WH_ERROR_OK;
 }