More peer review fixes (Use ML-DSA naming)

Author: dgarske

wrapper/CSharp/wolfCrypt-Test/wolfCrypt-Test.cs

@@ -843,6 +843,7 @@ private static void mldsa_test(wolfcrypt.MlDsaLevels level)
     {
         int ret = 0;
         IntPtr key = IntPtr.Zero;
+        IntPtr importKey = IntPtr.Zero;
         IntPtr heap = IntPtr.Zero;
         int devId = wolfcrypt.INVALID_DEVID;
         byte[] privateKey = null;
@@ -856,7 +857,7 @@ private static void mldsa_test(wolfcrypt.MlDsaLevels level)
 
             /* Generate Key */
             Console.WriteLine("Testing ML-DSA Key Generation...");
-            key = wolfcrypt.DilithiumMakeKey(heap, devId, level);
+            key = wolfcrypt.MlDsaMakeKey(heap, devId, level);
             if (key == IntPtr.Zero)
             {
                 ret = -1;
@@ -871,15 +872,15 @@ private static void mldsa_test(wolfcrypt.MlDsaLevels level)
             if (ret == 0)
             {
                 Console.WriteLine("Testing ML-DSA Key Export...");
-                ret = wolfcrypt.DilithiumExportPrivateKey(key, out privateKey);
+                ret = wolfcrypt.MlDsaExportPrivateKey(key, out privateKey);
                 if (ret != 0)
                 {
                     Console.Error.WriteLine($"Failed to export private key. Error code: {ret}");
                 }
             }
             if (ret == 0)
             {
-                ret = wolfcrypt.DilithiumExportPublicKey(key, out publicKey);
+                ret = wolfcrypt.MlDsaExportPublicKey(key, out publicKey);
                 if (ret != 0)
                 {
                     Console.Error.WriteLine($"Failed to export public key. Error code: {ret}");
@@ -890,19 +891,30 @@ private static void mldsa_test(wolfcrypt.MlDsaLevels level)
                 Console.WriteLine("ML-DSA Key Export test passed.");
             }
 
-            /* Import */
+            /* Import into a fresh key to test the full import workflow */
             if (ret == 0)
             {
                 Console.WriteLine("Testing ML-DSA Key Import...");
-                ret = wolfcrypt.DilithiumImportPrivateKey(privateKey, key);
+                /* Free the keygen key and create a fresh one for import */
+                wolfcrypt.MlDsaFreeKey(ref key);
+                importKey = wolfcrypt.MlDsaNew(heap, devId, level);
+                if (importKey == IntPtr.Zero)
+                {
+                    ret = -1;
+                    Console.Error.WriteLine("Failed to allocate key for import.");
+                }
+            }
+            if (ret == 0)
+            {
+                ret = wolfcrypt.MlDsaImportPrivateKey(privateKey, importKey);
                 if (ret != 0)
                 {
                     Console.Error.WriteLine($"Failed to import private key. Error code: {ret}");
                 }
             }
             if (ret == 0)
             {
-                ret = wolfcrypt.DilithiumImportPublicKey(publicKey, key);
+                ret = wolfcrypt.MlDsaImportPublicKey(publicKey, importKey);
                 if (ret != 0)
                 {
                     Console.Error.WriteLine($"Failed to import public key. Error code: {ret}");
@@ -913,11 +925,11 @@ private static void mldsa_test(wolfcrypt.MlDsaLevels level)
                 Console.WriteLine("ML-DSA Key Import test passed.");
             }
 
-            /* Sign */
+            /* Sign with imported key */
             if (ret == 0)
             {
                 Console.WriteLine("Testing ML-DSA Signature Creation...");
-                ret = wolfcrypt.DilithiumSignMsg(key, message, out signature);
+                ret = wolfcrypt.MlDsaSignMsg(importKey, message, out signature);
                 if (ret != 0)
                 {
                     Console.Error.WriteLine($"Failed to sign. Error code: {ret}");
@@ -928,11 +940,11 @@ private static void mldsa_test(wolfcrypt.MlDsaLevels level)
                 Console.WriteLine($"ML-DSA Signature Creation test passed. Signature Length: {signature.Length}");
             }
 
-            /* Verify */
+            /* Verify with imported key */
             if (ret == 0)
             {
                 Console.WriteLine("Testing ML-DSA Signature Verification...");
-                ret = wolfcrypt.DilithiumVerifyMsg(key, message, signature);
+                ret = wolfcrypt.MlDsaVerifyMsg(importKey, message, signature);
                 if (ret != 0)
                 {
                     Console.Error.WriteLine($"Failed to verify message. Error code: {ret}");
@@ -957,11 +969,11 @@ private static void mldsa_test(wolfcrypt.MlDsaLevels level)
         {
             if (key != IntPtr.Zero)
             {
-                ret = wolfcrypt.DilithiumFreeKey(ref key);
-                if (ret != 0)
-                {
-                    Console.Error.WriteLine($"Failed to free ML-DSA key. Error code: {ret}");
-                }
+                wolfcrypt.MlDsaFreeKey(ref key);
+            }
+            if (importKey != IntPtr.Zero)
+            {
+                wolfcrypt.MlDsaFreeKey(ref importKey);
             }
         }