Move crypto affinity test to separate file. Add CB test to crypto affinity test

Author: AlexLanzano

.gitignore

@@ -9,6 +9,7 @@ tools/testcertgen/*.der
 *.code-workspace
 .vscode
 compile_commands.json
+.cache
 
 # Static analysis
 tools/static-analysis/reports/

test/wh_test.c

@@ -42,6 +42,7 @@
 #include "wh_test_log.h"
 #include "wh_test_lock.h"
 #include "wh_test_posix_threadsafe_stress.h"
+#include "wh_test_crypto_affinity.h"
 
 #if defined(WOLFHSM_CFG_CERTIFICATE_MANAGER)
 #include "wh_test_cert.h"
@@ -92,6 +93,7 @@ int whTest_Unit(void)
 #ifndef WOLFHSM_CFG_NO_CRYPTO
     /* Crypto Tests */
     WH_TEST_ASSERT(0 == whTest_Crypto());
+    WH_TEST_ASSERT(0 == whTest_CryptoAffinity());
 
 #if defined(WOLFHSM_CFG_SERVER_IMG_MGR) && !defined(WOLFHSM_CFG_NO_CRYPTO)
     /* Image Manager Tests */

test/wh_test_clientserver.c

@@ -399,85 +399,6 @@ static int _testDma(whServerContext* server, whClientContext* client)
 #endif /* WOLFHSM_CFG_DMA && WOLFHSM_CFG_ENABLE_CLIENT && \
           WOLFHSM_CFG_ENABLE_SERVER */
 
-#if defined(WOLFHSM_CFG_ENABLE_CLIENT) && defined(WOLFHSM_CFG_ENABLE_SERVER) && \
-    !defined(WOLFHSM_CFG_NO_CRYPTO)
-/* Helper function to test crypto affinity switching. Client and server must be
- * already initialized. The configDevId parameter indicates what devId was
- * configured at server init time. */
-static int _testCryptoAffinity(whServerContext* server, whClientContext* client)
-{
-    int32_t  server_rc   = 0;
-    uint32_t affinity    = 0;
-
-    /* Test 1: Set SW affinity - should always succeed */
-    WH_TEST_RETURN_ON_FAIL(
-        wh_Client_SetCryptoAffinityRequest(client, WH_CRYPTO_AFFINITY_SW));
-    WH_TEST_RETURN_ON_FAIL(wh_Server_HandleRequestMessage(server));
-    WH_TEST_RETURN_ON_FAIL(
-        wh_Client_SetCryptoAffinityResponse(client, &server_rc, &affinity));
-    WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
-    WH_TEST_ASSERT_RETURN(affinity == WH_CRYPTO_AFFINITY_SW);
-
-    /* Verify server devId is now INVALID_DEVID */
-    WH_TEST_ASSERT_RETURN(server->crypto->devId == INVALID_DEVID);
-
-    /* Test 2: Set HW affinity */
-    WH_TEST_RETURN_ON_FAIL(
-        wh_Client_SetCryptoAffinityRequest(client, WH_CRYPTO_AFFINITY_HW));
-    WH_TEST_RETURN_ON_FAIL(wh_Server_HandleRequestMessage(server));
-    WH_TEST_RETURN_ON_FAIL(
-        wh_Client_SetCryptoAffinityResponse(client, &server_rc, &affinity));
-
-    if (server->crypto->configDevId != INVALID_DEVID) {
-        /* HW was configured, should succeed */
-        WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
-        WH_TEST_ASSERT_RETURN(affinity == WH_CRYPTO_AFFINITY_HW);
-        WH_TEST_ASSERT_RETURN(server->crypto->devId == server->crypto->configDevId);
-    }
-    else {
-#ifdef WOLF_CRYPTO_CB
-        /* HW was not configured, should fail with BADCONFIG */
-        WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_BADCONFIG);
-#else
-        /* HW crypto was not enabled, should fail with NOTIMPL */
-        WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_NOTIMPL);
-#endif
-        WH_TEST_ASSERT_RETURN(affinity == WH_CRYPTO_AFFINITY_SW);
-        WH_TEST_ASSERT_RETURN(server->crypto->devId == INVALID_DEVID);
-    }
-
-    /* Test 3: Invalid affinity value - should return BADARGS */
-    WH_TEST_RETURN_ON_FAIL(
-        wh_Client_SetCryptoAffinityRequest(client, 0xFF));
-    WH_TEST_RETURN_ON_FAIL(wh_Server_HandleRequestMessage(server));
-    WH_TEST_RETURN_ON_FAIL(
-        wh_Client_SetCryptoAffinityResponse(client, &server_rc, &affinity));
-    WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_BADARGS);
-
-    /* Test 4: Switch back to SW */
-    WH_TEST_RETURN_ON_FAIL(
-        wh_Client_SetCryptoAffinityRequest(client, WH_CRYPTO_AFFINITY_SW));
-    WH_TEST_RETURN_ON_FAIL(wh_Server_HandleRequestMessage(server));
-    WH_TEST_RETURN_ON_FAIL(
-        wh_Client_SetCryptoAffinityResponse(client, &server_rc, &affinity));
-    WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
-    WH_TEST_ASSERT_RETURN(affinity == WH_CRYPTO_AFFINITY_SW);
-    WH_TEST_ASSERT_RETURN(server->crypto->devId == INVALID_DEVID);
-
-    /* Test 5: Test blocking API */
-    WH_TEST_RETURN_ON_FAIL(wh_Client_SetCryptoAffinityRequest(client,
-        WH_CRYPTO_AFFINITY_SW));
-    WH_TEST_RETURN_ON_FAIL(wh_Server_HandleRequestMessage(server));
-    WH_TEST_RETURN_ON_FAIL(wh_Client_SetCryptoAffinityResponse(client,
-        &server_rc, &affinity));
-    WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
-    WH_TEST_ASSERT_RETURN(affinity == WH_CRYPTO_AFFINITY_SW);
-
-    return WH_ERROR_OK;
-}
-#endif /* WOLFHSM_CFG_ENABLE_CLIENT && WOLFHSM_CFG_ENABLE_SERVER &&
-          !WOLFHSM_CFG_NO_CRYPTO */
-
 #ifdef WOLFHSM_CFG_ENABLE_CLIENT
 static int _testClientCounter(whClientContext* client)
 {
@@ -1205,11 +1126,6 @@ int whTest_ClientServerSequential(whTestNvmBackendType nvmType)
     /* Test custom registered callbacks */
     WH_TEST_RETURN_ON_FAIL(_testCallbacks(server, client));
 
-#ifndef WOLFHSM_CFG_NO_CRYPTO
-    /* Test crypto affinity switching */
-    WH_TEST_RETURN_ON_FAIL(_testCryptoAffinity(server, client));
-#endif /* !WOLFHSM_CFG_NO_CRYPTO */
-
 #ifdef WOLFHSM_CFG_DMA
     /* Test DMA callbacks and address allowlisting */
     WH_TEST_RETURN_ON_FAIL(_testDma(server, client));