Merge pull request #30 from Devolutions/fix-branch

added methods to the csharp wrapper
Devolutions · Oct 3, 2019 · 274d165 · 274d165
2 parents e339213 + c4b5ce9
commit 274d165
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/devolutionscrypto/Cargo.toml b/devolutionscrypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "devolutionscrypto"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["Philippe Dugre <[email protected]>", "Mathieu Morrissette <[email protected]>"]
 edition = "2018"
 readme = "../README.md"

diff --git a/wrappers/csharp/GeneratePackage.py b/wrappers/csharp/GeneratePackage.py
@@ -119,7 +119,7 @@
         dllpath = "./" + folder + "/bin/DevolutionsCrypto-" + arch["name"] + ".dll"
 
         if rdm:
-            dllpath = "./rdm/bin/" + arch["name"] + "/DevolutionsCrypto-" + arch["name"] + ".dll"
+            dllpath = "./rdm/bin/" + arch["name"] + "/DevolutionsCrypto.dll"
 
         shutil.copy("../../devolutionscrypto/target/" + arch["value"] + "/release/devolutionscrypto.dll", dllpath)
 

diff --git a/wrappers/csharp/Managed.cs b/wrappers/csharp/Managed.cs
@@ -5,6 +5,21 @@ namespace Devolutions.Cryptography
 
     public static class Managed
     {
+        public static byte[] DeriveKey(byte[] password, byte[] salt = null, uint iterations = 10000)
+        {
+            return Native.DeriveKey(password, salt, iterations);
+        }
+
+        public static byte[] DeriveKey(string password, byte[] salt = null, uint iterations = 10000)
+        {
+            return Native.DeriveKey(Utils.StringToByteArray(password), salt, iterations);
+        }
+
+        public static byte[] GenerateKey(uint keySize)
+        {
+            return Native.GenerateKey(keySize);
+        }
+
         /***************************************************************
          * 
          *                       Encrypt