Added more to test in order to hit more lines in wh_utils.c

Author: jackctj117

test/wh_test_crypto.c

@@ -95,6 +95,113 @@ static uint16_t* cancelSeqP;
           WOLFHSM_CFG_ENABLE_SERVER && WOLFHSM_CFG_CANCEL_API */
 #endif /* WOLFHSM_CFG_IS_TEST_SERVER */
 
+/*
+ * Utility function tests
+ * These test the basic utility functions in wh_utils.c
+ */
+#include "wolfhsm/wh_utils.h"
+
+static int whTest_Utils(void)
+{
+    int ret = 0;
+    uint16_t val16, swap16;
+    uint32_t val32, swap32;
+    uint64_t val64, swap64;
+    uint8_t buffer[32];
+    int i;
+
+    printf("Testing utility functions...\n");
+
+    /* Test Swap16 */
+    val16 = 0x1234;
+    swap16 = wh_Utils_Swap16(val16);
+    if (swap16 != 0x3412) {
+        printf("Failed wh_Utils_Swap16: expected 0x3412, got 0x%04x\n", swap16);
+        return WH_ERROR_ABORTED;
+    }
+    /* Verify double swap returns original */
+    if (wh_Utils_Swap16(swap16) != val16) {
+        printf("Failed wh_Utils_Swap16 double swap\n");
+        return WH_ERROR_ABORTED;
+    }
+
+    /* Test Swap32 */
+    val32 = 0x12345678ul;
+    swap32 = wh_Utils_Swap32(val32);
+    if (swap32 != 0x78563412ul) {
+        printf("Failed wh_Utils_Swap32: expected 0x78563412, got 0x%08x\n", 
+               (unsigned int)swap32);
+        return WH_ERROR_ABORTED;
+    }
+    /* Verify double swap returns original */
+    if (wh_Utils_Swap32(swap32) != val32) {
+        printf("Failed wh_Utils_Swap32 double swap\n");
+        return WH_ERROR_ABORTED;
+    }
+
+    /* Test Swap64 */
+    val64 = 0x123456789ABCDEF0ull;
+    swap64 = wh_Utils_Swap64(val64);
+    if (swap64 != 0xF0DEBC9A78563412ull) {
+        printf("Failed wh_Utils_Swap64: expected 0xF0DEBC9A78563412, got 0x%016llx\n",
+               (unsigned long long)swap64);
+        return WH_ERROR_ABORTED;
+    }
+    /* Verify double swap returns original */
+    if (wh_Utils_Swap64(swap64) != val64) {
+        printf("Failed wh_Utils_Swap64 double swap\n");
+        return WH_ERROR_ABORTED;
+    }
+
+    /* Test htonl and ntohl (network byte order conversion) */
+    val32 = 0x12345678ul;
+    swap32 = wh_Utils_htonl(val32);
+    /* Result depends on endianness, but ntohl should reverse it */
+    if (wh_Utils_ntohl(swap32) != val32) {
+        printf("Failed wh_Utils_htonl/ntohl round trip\n");
+        return WH_ERROR_ABORTED;
+    }
+
+    /* Test memeqzero with all zeros */
+    memset(buffer, 0, sizeof(buffer));
+    ret = wh_Utils_memeqzero(buffer, sizeof(buffer));
+    if (ret != 1) {
+        printf("Failed wh_Utils_memeqzero: expected 1 for all zeros, got %d\n", ret);
+        return WH_ERROR_ABORTED;
+    }
+
+    /* Test memeqzero with non-zero byte at various positions 
+     * Note: memeqzero checks from the end backwards and stops at index 1,
+     * so it doesn't check buffer[0] */
+    for (i = 1; i < (int)sizeof(buffer); i++) {
+        memset(buffer, 0, sizeof(buffer));
+        buffer[i] = 0x42;
+        ret = wh_Utils_memeqzero(buffer, sizeof(buffer));
+        if (ret != 0) {
+            printf("Failed wh_Utils_memeqzero: expected 0 with non-zero byte at pos %d, got %d\n",
+                   i, ret);
+            return WH_ERROR_ABORTED;
+        }
+    }
+
+    /* Test memeqzero with size 0 and 1 */
+    ret = wh_Utils_memeqzero(buffer, 0);
+    if (ret != 1) {
+        printf("Failed wh_Utils_memeqzero: expected 1 for size 0, got %d\n", ret);
+        return WH_ERROR_ABORTED;
+    }
+
+    memset(buffer, 0, sizeof(buffer));
+    ret = wh_Utils_memeqzero(buffer, 1);
+    if (ret != 1) {
+        printf("Failed wh_Utils_memeqzero: expected 1 for single zero byte, got %d\n", ret);
+        return WH_ERROR_ABORTED;
+    }
+
+    printf("Utility function tests passed\n");
+    return WH_ERROR_OK;
+}
+
 #if defined(WOLFHSM_CFG_TEST_VERBOSE) && defined(WOLFHSM_CFG_ENABLE_CLIENT)
 static int whTest_ShowNvmAvailable(whClientContext* ctx)
 {
@@ -3719,6 +3826,9 @@ static int wh_ClientServer_MemThreadTest(void)
     defined(WOLFHSM_CFG_ENABLE_SERVER)
 int whTest_Crypto(void)
 {
+    /* Test utility functions first (no setup required) */
+    WH_TEST_RETURN_ON_FAIL(whTest_Utils());
+    
     printf("Testing crypto: (pthread) mem...\n");
     WH_TEST_RETURN_ON_FAIL(wh_ClientServer_MemThreadTest());
     return 0;