Merge pull request #86 from bigbrett/ml-dsa-DMA-support

ML-DSA DMA support
wolfSSL · Dec 2, 2024 · 6ce59d6 · 6ce59d6
2 parents 6515aa5 + 109355f
commit 6ce59d6
Show file tree

Hide file tree

Showing 12 changed files with 2,067 additions and 178 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
-.DS_Store
-Build/
-*.o
-*.a
-*.la
-
+.DS_Store
+Build/
+*.o
+*.a
+*.la
+**/.gdb_history
+
diff --git a/src/wh_client.c b/src/wh_client.c
@@ -1211,14 +1211,12 @@ int wh_Client_KeyCacheDma32Request(whClientContext* c, uint32_t flags,
     packet->keyCacheDma32Req.key.addr = keyAddr;
     packet->keyCacheDma32Req.key.sz   = keySz;
 
-    /* Copy label if provided */
+    /* Copy label if provided, truncate if necessary */
     if (labelSz > 0) {
         if (labelSz > WH_NVM_LABEL_LEN) {
-            memcpy(packet->keyCacheDma32Req.label, label, WH_NVM_LABEL_LEN);
-        }
-        else {
-            memcpy(packet->keyCacheDma32Req.label, label, labelSz);
+            labelSz = WH_NVM_LABEL_LEN;
         }
+        memcpy(packet->keyCacheDma32Req.label, label, labelSz);
     }
 
     return wh_Client_SendRequest(c, WH_MESSAGE_GROUP_KEY, WH_KEY_CACHE_DMA32,
@@ -1377,14 +1375,12 @@ int wh_Client_KeyCacheDma64Request(whClientContext* c, uint32_t flags,
     packet->keyCacheDma64Req.key.addr = keyAddr;
     packet->keyCacheDma64Req.key.sz   = keySz;
 
-    /* Copy label if provided */
+    /* Copy label if provided, truncate if necessary */
     if (labelSz > 0) {
         if (labelSz > WH_NVM_LABEL_LEN) {
-            memcpy(packet->keyCacheDma64Req.label, label, WH_NVM_LABEL_LEN);
-        }
-        else {
-            memcpy(packet->keyCacheDma64Req.label, label, labelSz);
+            labelSz = WH_NVM_LABEL_LEN;
         }
+        memcpy(packet->keyCacheDma64Req.label, label, labelSz);
     }
 
     return wh_Client_SendRequest(c, WH_MESSAGE_GROUP_KEY, WH_KEY_CACHE_DMA64,