Merge branch 'main' into fix/f_4041

Author: bigbrett

.github/workflows/build-and-test-refactor.yml

@@ -53,6 +53,10 @@ jobs:
     - name: Build and test refactor DMA ASAN LMS verify-only XMSS full
       run: cd test-refactor/posix && make clean && make -j DMA=1 ASAN=1 LMS_VERIFY_ONLY=1 WOLFSSL_DIR=../../wolfssl && make run
 
+    # Build and test with ML-DSA in verify-only mode
+    - name: Build and test refactor DMA ASAN MLDSA verify-only
+      run: cd test-refactor/posix && make clean && make -j DMA=1 ASAN=1 MLDSA_VERIFY_ONLY=1 WOLFSSL_DIR=../../wolfssl && make run
+
     # Build and test ASAN build, with wolfCrypt tests enabled.
     - name: Build and test refactor ASAN TESTWOLFCRYPT
       run: cd test-refactor/posix && make clean && make -j ASAN=1 TESTWOLFCRYPT=1 WOLFSSL_DIR=../../wolfssl && make run
@@ -73,6 +77,19 @@ jobs:
     - name: Build and test refactor ASAN SHE
       run: cd test-refactor/posix && make clean && make -j SHE=1 ASAN=1 WOLFSSL_DIR=../../wolfssl && make run
 
+    # Build and test with per-client crypto affinity enabled (runs the crypto
+    # affinity unit test, gated behind WOLFHSM_CFG_CRYPTO_AFFINITY)
+    - name: Build and test refactor CRYPTO_AFFINITY ASAN
+      run: cd test-refactor/posix && make clean && make -j CRYPTO_AFFINITY=1 ASAN=1 WOLFSSL_DIR=../../wolfssl && make run
+
+    # Build and test crypto affinity alongside DMA (exercises HW-devId path)
+    - name: Build and test refactor CRYPTO_AFFINITY DMA ASAN
+      run: cd test-refactor/posix && make clean && make -j CRYPTO_AFFINITY=1 DMA=1 ASAN=1 WOLFSSL_DIR=../../wolfssl && make run
+
+    # Build and test with global SHE keys (all SHE slots shared across clients)
+    - name: Build and test refactor ASAN SHE_GLOBAL
+      run: cd test-refactor/posix && make clean && make -j SHE_GLOBAL=1 ASAN=1 WOLFSSL_DIR=../../wolfssl && make run
+
     # Build and test with DEBUG=1
     - name: Build and test refactor with DEBUG
       run: cd test-refactor/posix && make clean && make -j DEBUG=1 WOLFSSL_DIR=../../wolfssl && make run
@@ -85,6 +102,10 @@ jobs:
     - name: Build and test refactor with THREADSAFE and everything
       run: cd test-refactor/posix && make clean && make -j THREADSAFE=1 DMA=1 SHE=1 ASAN=1 WOLFSSL_DIR=../../wolfssl && make run
 
+    # Same, with global SHE keys
+    - name: Build and test refactor with THREADSAFE and everything and SHE_GLOBAL
+      run: cd test-refactor/posix && make clean && make -j THREADSAFE=1 DMA=1 SHE_GLOBAL=1 ASAN=1 WOLFSSL_DIR=../../wolfssl && make run
+
     # Build and test in multithreaded mode with everything enabled and wolfCrypt tests
     - name: Build and test refactor with THREADSAFE and TESTWOLFCRYPT and everything
       run: cd test-refactor/posix && make clean && make -j THREADSAFE=1 TESTWOLFCRYPT=1 DMA=1 SHE=1 ASAN=1 WOLFSSL_DIR=../../wolfssl && make run

.github/workflows/build-and-test.yml

@@ -53,6 +53,10 @@ jobs:
     - name: Build and test DMA ASAN LMS verify-only XMSS full
       run: cd test && make clean && make -j DMA=1 ASAN=1 LMS_VERIFY_ONLY=1 WOLFSSL_DIR=../wolfssl && make run
 
+    # Build and test with ML-DSA in verify-only mode
+    - name: Build and test DMA ASAN MLDSA verify-only
+      run: cd test && make clean && make -j DMA=1 ASAN=1 MLDSA_VERIFY_ONLY=1 WOLFSSL_DIR=../wolfssl && make run
+
     # Build and test ASAN build, with wolfCrypt tests enabled.
     - name: Build and test ASAN TESTWOLFCRYPT
       run: cd test && make clean && make -j ASAN=1 TESTWOLFCRYPT=1 WOLFSSL_DIR=../wolfssl && make run
@@ -73,6 +77,10 @@ jobs:
     - name: Build and test ASAN SHE
       run: cd test && make clean && make -j SHE=1 ASAN=1 WOLFSSL_DIR=../wolfssl && make run
 
+    # Build and test with global SHE keys (all SHE slots shared across clients)
+    - name: Build and test ASAN SHE_GLOBAL
+      run: cd test && make clean && make -j SHE_GLOBAL=1 ASAN=1 WOLFSSL_DIR=../wolfssl && make run
+
     # Build and test with per-client crypto affinity enabled (runs the crypto
     # affinity unit test, gated behind WOLFHSM_CFG_CRYPTO_AFFINITY)
     - name: Build and test CRYPTO_AFFINITY ASAN
@@ -94,6 +102,10 @@ jobs:
     - name: Build and test with THREADSAFE and everything
       run: cd test && make clean && make -j THREADSAFE=1 DMA=1 SHE=1 ASAN=1 WOLFSSL_DIR=../wolfssl && make run
 
+    # Same, with global SHE keys
+    - name: Build and test with THREADSAFE and everything and SHE_GLOBAL
+      run: cd test && make clean && make -j THREADSAFE=1 DMA=1 SHE_GLOBAL=1 ASAN=1 WOLFSSL_DIR=../wolfssl && make run
+
     # Build and test in multithreaded mode with everything enabled and wolfCrypt tests
     - name: Build and test with THREADSAFE and TESTWOLFCRYPT and everything
       run: cd test && make clean && make -j THREADSAFE=1 TESTWOLFCRYPT=1 DMA=1 SHE=1 ASAN=1 WOLFSSL_DIR=../wolfssl && make run

benchmark/README.md

@@ -192,5 +192,4 @@ typedef enum BenchModuleIdx {
 
 ## Notes
 
-- Ensure the `MAX_BENCH_OPS` value in `wh_bench_ops.h` is large enough to accommodate all benchmark modules
 - For throughput calculations, you need to specify the data size using `wh_Bench_SetDataSize()`