Merge pull request #310 from padelsbach/padelsbach/she-misc-fixers

Misc fixes in SHE server

Author: bigbrett

benchmark/bench_modules/wh_bench_mod_mldsa.c

@@ -714,7 +714,8 @@ static int _benchMlDsaSign(whClientContext* client, whBenchOpContext* ctx,
 
         /* Time only the sign operation */
         benchStartRet = wh_Bench_StartOp(ctx, id);
-        ret = wc_MlDsaKey_Sign(&key, sig, &localSigSz, msg, sizeof(msg), rng);
+        ret = wc_MlDsaKey_SignCtx(&key, NULL, 0, sig, &localSigSz, msg,
+                                  sizeof(msg), rng);
         benchStopRet = wh_Bench_StopOp(ctx, id);
 
         if (benchStartRet != 0) {
@@ -723,7 +724,7 @@ static int _benchMlDsaSign(whClientContext* client, whBenchOpContext* ctx,
             break;
         }
         if (ret != 0) {
-            WH_BENCH_PRINTF("Failed to wc_MlDsaKey_Sign %d\n", ret);
+            WH_BENCH_PRINTF("Failed to wc_MlDsaKey_SignCtx %d\n", ret);
             break;
         }
         if (benchStopRet != 0) {
@@ -844,8 +845,9 @@ static int _benchMlDsaVerify(whClientContext* client, whBenchOpContext* ctx,
 
         /* Time only the verify operation */
         benchStartRet = wh_Bench_StartOp(ctx, id);
-        ret = wc_MlDsaKey_Verify(&key, ml_dsa_44_sig, sizeof(ml_dsa_44_sig),
-                                 test_msg, sizeof(test_msg), &verified);
+        ret = wc_MlDsaKey_VerifyCtx(&key, ml_dsa_44_sig,
+                                    sizeof(ml_dsa_44_sig), NULL, 0, test_msg,
+                                    sizeof(test_msg), &verified);
         benchStopRet = wh_Bench_StopOp(ctx, id);
 
         if (benchStartRet != 0) {
@@ -854,7 +856,7 @@ static int _benchMlDsaVerify(whClientContext* client, whBenchOpContext* ctx,
             break;
         }
         if (ret != 0) {
-            WH_BENCH_PRINTF("Failed to wc_MlDsaKey_Verify %d\n", ret);
+            WH_BENCH_PRINTF("Failed to wc_MlDsaKey_VerifyCtx %d\n", ret);
             break;
         }
         if (benchStopRet != 0) {

src/wh_server_she.c

@@ -788,7 +788,7 @@ static int _ExportRamKey(whServerContext* server, uint16_t magic,
         /* set the counter, flags and ram key */
         memset(resp.messageTwo, 0, sizeof(resp.messageTwo));
         /* set count to 1 */
-        counter_val = (wh_Utils_htonl(1) << 4);
+        counter_val = wh_Utils_htonl(1 << 4);
         memcpy(resp.messageTwo, &counter_val, sizeof(uint32_t));
         keySz    = WH_SHE_KEY_SZ;
         ret      = wh_Server_KeystoreReadKey(
@@ -858,7 +858,7 @@ static int _ExportRamKey(whServerContext* server, uint16_t magic,
     if (ret == 0) {
         memset(resp.messageFour, 0, sizeof(resp.messageFour));
         /* set counter to 1, pad with 1 bit */
-        counter_val = (wh_Utils_htonl(1) << 4);
+        counter_val = wh_Utils_htonl(1 << 4);
         memcpy(resp.messageFour + WH_SHE_KEY_SZ, &counter_val,
                sizeof(uint32_t));
         resp.messageFour[WH_SHE_KEY_SZ + 3] |= 0x08;
@@ -1540,12 +1540,15 @@ static int _VerifyMac(whServerContext* server, uint16_t magic,
             ret = wc_AesCmacVerify_ex(server->she->sheCmac, mac, req.macLen,
                                       message, req.messageLen, tmpKey, keySz,
                                       NULL, server->devId);
-            /* only evaluate if key was found */
             if (ret == 0) {
                 resp.status = 0;
             }
             else {
+                /* Verify is allowed to fail, per SHE spec.
+                   Capture status in the response, but return success to ensure
+                   that the response is sent. */
                 resp.status = 1;
+                ret = 0;
             }
         }
         else {

test/wh_test_crypto.c

@@ -4228,15 +4228,17 @@ static int whTestCrypto_MlDsaWolfCrypt(whClientContext* ctx, int devId,
     }
 
     /* Sign message */
-    ret = wc_MlDsaKey_Sign(&key, sig, &sigSz, msg, sizeof(msg), rng);
+    ret = wc_MlDsaKey_SignCtx(&key, NULL, 0, sig, &sigSz, msg, sizeof(msg),
+                              rng);
     if (ret != 0) {
         WH_ERROR_PRINT("Failed to sign with ML DSA: %d\n", ret);
         wc_MlDsaKey_Free(&key);
         return ret;
     }
 
     /* Verify signature */
-    ret = wc_MlDsaKey_Verify(&key, sig, sigSz, msg, sizeof(msg), &verified);
+    ret = wc_MlDsaKey_VerifyCtx(&key, sig, sigSz, NULL, 0, msg, sizeof(msg),
+                                &verified);
     if (ret != 0) {
         WH_ERROR_PRINT("Failed to verify ML DSA signature: %d\n", ret);
         wc_MlDsaKey_Free(&key);
@@ -4250,7 +4252,8 @@ static int whTestCrypto_MlDsaWolfCrypt(whClientContext* ctx, int devId,
         /* Modify signature to ensure verification fails */
         sig[0] ^= 1;
 
-        ret = wc_MlDsaKey_Verify(&key, sig, sigSz, msg, sizeof(msg), &verified);
+        ret = wc_MlDsaKey_VerifyCtx(&key, sig, sigSz, NULL, 0, msg,
+                                    sizeof(msg), &verified);
         if (ret != 0) {
             WH_ERROR_PRINT("Failed to verify modified ML DSA signature: %d\n",
                            ret);
@@ -5042,8 +5045,9 @@ int whTestCrypto_MlDsaVerifyOnlyDma(whClientContext* ctx, int devId,
     /* Verify the message signature */
     if (ret == 0) {
         int verifyResult;
-        ret = wc_MlDsaKey_Verify(key, ml_dsa_44_sig, sizeof(ml_dsa_44_sig),
-                                 test_msg, sizeof(test_msg), &verifyResult);
+        ret = wc_MlDsaKey_VerifyCtx(key, ml_dsa_44_sig, sizeof(ml_dsa_44_sig),
+                                    NULL, 0, test_msg, sizeof(test_msg),
+                                    &verifyResult);
         if (ret != 0) {
             WH_ERROR_PRINT("Signature did not verify\n");
         }