Merge pull request #9291 from JacobBarthelmeh/csharp

Fixes for Ed25519 raw key import with C# wrapper

Author: dgarske

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

@@ -471,6 +471,7 @@ private static void ed25519_test()
         IntPtr key = IntPtr.Zero;
         byte[] privKey;
         byte[] pubKey;
+        uint pubKeySz;
 
         Console.WriteLine("\nStarting ED25519 tests...");
 
@@ -537,8 +538,33 @@ private static void ed25519_test()
         }
         Console.WriteLine("ED25519 Signature Verification test passed.");
 
+        /* test importing a raw public key */
+        ret = wolfcrypt.Ed25519ExportPublic(key, pubKey, out pubKeySz);
+        if (ret < 0 || pubKey == null) {
+            throw new Exception("Ed25519ExportPublic failed");
+        }
+        Console.WriteLine("ED25519 Export Raw Public test passed.");
+
+        if (importedPubKey != IntPtr.Zero) {
+            wolfcrypt.Ed25519FreeKey(importedPubKey);
+        }
+        ret = wolfcrypt.Ed25519ImportPublic(pubKey, pubKeySz, out importedPubKey);
+        if (importedPubKey == IntPtr.Zero) {
+            throw new Exception("Ed25519ImportPublic failed");
+        }
+        Console.WriteLine("ED25519 Import Raw Public test passed.");
+
         /* Cleanup */
-        if (key != IntPtr.Zero) wolfcrypt.Ed25519FreeKey(key);
+        if (key != IntPtr.Zero) {
+            wolfcrypt.Ed25519FreeKey(key);
+        }
+        if (importedPubKey != IntPtr.Zero) {
+            wolfcrypt.Ed25519FreeKey(importedPubKey);
+        }
+        if (importedPrivKey != IntPtr.Zero) {
+            wolfcrypt.Ed25519FreeKey(importedPrivKey);
+        }
+
     } /* END ed25519_test */
 
     private static void curve25519_test()

wrapper/CSharp/wolfSSL_CSharp/wolfCrypt.cs

@@ -2206,7 +2206,7 @@ public static int Ed25519ImportPublic(byte[] inMsg, uint inLen, out IntPtr key)
             try
             {
                 /* Allocate memory */
-                key = Marshal.AllocHGlobal(ED25519_PUB_KEY_SIZE);
+                key = wc_ed25519_new(IntPtr.Zero, INVALID_DEVID, IntPtr.Zero);
                 if (key == IntPtr.Zero)
                 {
                     throw new OutOfMemoryException("Failed to allocate memory for the key.");
@@ -2222,20 +2222,26 @@ public static int Ed25519ImportPublic(byte[] inMsg, uint inLen, out IntPtr key)
                 ret = wc_ed25519_import_public(inMsgPtr, inLen, key);
                 if (ret != 0)
                 {
+                    if (key != IntPtr.Zero) {
+                        wc_ed25519_delete(key, IntPtr.Zero);
+                        key = IntPtr.Zero;
+                    }
                     return ret;
                 }
             }
             catch (Exception ex)
             {
                 Console.WriteLine("Exception in EdImportPublic: " + ex.Message);
-
+                if (key != IntPtr.Zero) {
+                    wc_ed25519_delete(key, IntPtr.Zero);
+                    key = IntPtr.Zero;
+                }
                 return EXCEPTION_E;
             }
             finally
             {
                 /* Cleanup */
                 if (inMsgPtr != IntPtr.Zero) Marshal.FreeHGlobal(inMsgPtr);
-                if (key != IntPtr.Zero) Marshal.FreeHGlobal(key);
             }
 
             return ret;
@@ -2415,7 +2421,7 @@ public static IntPtr Curve25519PrivateKeyDecode(byte[] input)
 
             try
             {
-                key = wc_ed25519_new(IntPtr.Zero, INVALID_DEVID, IntPtr.Zero);
+                key = wc_curve25519_new(IntPtr.Zero, INVALID_DEVID, IntPtr.Zero);
                 if (key != IntPtr.Zero)
                 {
                     ret = wc_Ed25519PrivateKeyDecode(input, ref idx, key, (uint)input.Length);