Merge pull request #36 from Devolutions/validate-signature-wrapper-cs…

…harp Validate cipher signature method in csharp wrapper
Devolutions · Oct 24, 2019 · 37f313d · 37f313d
2 parents 7e0e175 + a20c3fa
commit 37f313d
Show file tree

Hide file tree

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

diff --git a/wrappers/csharp/Enums.cs b/wrappers/csharp/Enums.cs
@@ -0,0 +1,9 @@
+namespace Devolutions.Cryptography
+{
+    enum DataType 
+    {
+        Key = 1,
+        Cipher = 2,
+        Hash = 3
+    }
+}
diff --git a/wrappers/csharp/GeneratePackage.py b/wrappers/csharp/GeneratePackage.py
@@ -130,7 +130,7 @@
     if rdm:
         define += ";RDM"
 
-    command= subprocess.Popen([csc_path,"-out:./" + folder + "/bin/Devolutions.Crypto.dll", "-debug:pdbonly" ,"-pdb:./" + folder + "/bin/Devolutions.Crypto.pdb", "-target:library", "-platform:anycpu", define ,"NativeError.cs", "Native.cs", "Native.Xamarin.cs", "ManagedError.cs", "Managed.cs", "KeyExchange.cs", "Utils.cs", "./" + folder + "/bin/AssemblyInfo.cs"], stdout=subprocess.PIPE)
+    command= subprocess.Popen([csc_path,"-out:./" + folder + "/bin/Devolutions.Crypto.dll", "-debug:pdbonly" ,"-pdb:./" + folder + "/bin/Devolutions.Crypto.pdb", "-target:library", "-platform:anycpu", define ,"NativeError.cs", "Native.cs", "Native.Xamarin.cs", "ManagedError.cs", "Managed.cs", "KeyExchange.cs", "Utils.cs", "Enums.cs", "./" + folder + "/bin/AssemblyInfo.cs"], stdout=subprocess.PIPE)
     output = command.stdout.read().decode('utf-8')
 
     print(output)
@@ -182,7 +182,7 @@
 
     print("Building Managed Library...")
     # TODO create universal library with lipo
-    command= subprocess.Popen(["csc", "-out:./macos/bin/Devolutions.Crypto.dll", "-debug:pdbonly" ,"-pdb:./macos/bin/Devolutions.Crypto.pdb", "-target:library", "-platform:anycpu", "-define:MAC" ,"NativeError.cs", "Native.cs", "Native.Xamarin.cs", "ManagedError.cs", "Managed.cs", "KeyExchange.cs", "Utils.cs", "./macos/bin/AssemblyInfo.cs"], stdout=subprocess.PIPE)
+    command= subprocess.Popen(["csc", "-out:./macos/bin/Devolutions.Crypto.dll", "-debug:pdbonly" ,"-pdb:./macos/bin/Devolutions.Crypto.pdb", "-target:library", "-platform:anycpu", "-define:MAC" ,"NativeError.cs", "Native.cs", "Native.Xamarin.cs", "ManagedError.cs", "Managed.cs", "KeyExchange.cs", "Utils.cs", "Enums.cs", "./macos/bin/AssemblyInfo.cs"], stdout=subprocess.PIPE)
     output = command.stdout.read().decode('utf-8')
 
     print(output)
@@ -256,7 +256,7 @@
 
     print("Building Managed Library...")
     # TODO create universal library with lipo
-    command= subprocess.Popen(["csc", "-out:./ios/bin/Devolutions.Crypto.dll", "-debug:pdbonly" ,"-pdb:./ios/bin/Devolutions.Crypto.pdb", "-target:library", "-platform:anycpu", "-define:IOS" ,"NativeError.cs", "Native.cs", "Native.Xamarin.cs", "ManagedError.cs", "Managed.cs", "KeyExchange.cs", "Utils.cs", "./ios/bin/AssemblyInfo.cs"], stdout=subprocess.PIPE)
+    command= subprocess.Popen(["csc", "-out:./ios/bin/Devolutions.Crypto.dll", "-debug:pdbonly" ,"-pdb:./ios/bin/Devolutions.Crypto.pdb", "-target:library", "-platform:anycpu", "-define:IOS" ,"NativeError.cs", "Native.cs", "Native.Xamarin.cs", "ManagedError.cs", "Managed.cs", "KeyExchange.cs", "Utils.cs", "Enums.cs", "./ios/bin/AssemblyInfo.cs"], stdout=subprocess.PIPE)
     output = command.stdout.read().decode('utf-8')
 
     print(output)
@@ -328,7 +328,7 @@
 
     print("Building Managed Library...")
 
-    command = subprocess.Popen(["csc", "-out:./android/bin/Devolutions.Crypto.dll", "-debug:pdbonly" ,"-pdb:./android/bin/Devolutions.Crypto.pdb", "-target:library", "-platform:anycpu", "-define:ANDROID" ,"NativeError.cs", "Native.cs", "Native.Xamarin.cs", "ManagedError.cs", "Managed.cs", "KeyExchange.cs", "Utils.cs", "./android/bin/AssemblyInfo.cs"], stdout=subprocess.PIPE)
+    command = subprocess.Popen(["csc", "-out:./android/bin/Devolutions.Crypto.dll", "-debug:pdbonly" ,"-pdb:./android/bin/Devolutions.Crypto.pdb", "-target:library", "-platform:anycpu", "-define:ANDROID" ,"NativeError.cs", "Native.cs", "Native.Xamarin.cs", "ManagedError.cs", "Managed.cs", "KeyExchange.cs", "Utils.cs", "Enums.cs", "./android/bin/AssemblyInfo.cs"], stdout=subprocess.PIPE)
     output = command.stdout.read().decode('utf-8')
 
     print(output)   
@@ -385,7 +385,7 @@
 
     print("Building Managed Library...")
 
-    command= subprocess.Popen(["csc", "-out:./linux/bin/Devolutions.Crypto.dll", "-debug:pdbonly" ,"-pdb:./linux/bin/Devolutions.Crypto.pdb", "-target:library", "-platform:anycpu", "-define:LINUX" ,"NativeError.cs", "Native.cs", "Native.Xamarin.cs", "ManagedError.cs", "Managed.cs", "KeyExchange.cs", "Utils.cs", "./linux/bin/AssemblyInfo.cs"], stdout=subprocess.PIPE)
+    command= subprocess.Popen(["csc", "-out:./linux/bin/Devolutions.Crypto.dll", "-debug:pdbonly" ,"-pdb:./linux/bin/Devolutions.Crypto.pdb", "-target:library", "-platform:anycpu", "-define:LINUX" ,"NativeError.cs", "Native.cs", "Native.Xamarin.cs", "ManagedError.cs", "Managed.cs", "KeyExchange.cs", "Utils.cs", "Enums.cs", "./linux/bin/AssemblyInfo.cs"], stdout=subprocess.PIPE)
     output = command.stdout.read().decode('utf-8')
 
     print(output)

diff --git a/wrappers/csharp/Utils.cs b/wrappers/csharp/Utils.cs
@@ -5,6 +5,21 @@ namespace Devolutions.Cryptography
 
     public static partial class Utils
     {
+        public static bool ValidateCiphertextSignature(byte[] data)
+        {
+            if(data == null)
+            {
+                return false;
+            }
+
+            if(data.Length >= 8)
+            {
+                return data[0] == '\xD' && data[1] == '\xC' && data[2] == (int)DataType.Cipher && data[3] == 0 && data[4] == 0 && data[5] == 0;
+            }
+
+            return false;
+        }
+
         public static byte[] StringToByteArray(string data)
         {
             if (data == null)

diff --git a/...d/Devolutions.Crypto.Android/Devolutions.Crypto.Android/Devolutions.Crypto.Android.csproj b/...d/Devolutions.Crypto.Android/Devolutions.Crypto.Android/Devolutions.Crypto.Android.csproj
@@ -67,6 +67,9 @@
     </Compile>
     <Compile Include="..\..\..\..\Utils.cs">
       <Link>Utils.cs</Link>
+    </Compile>
+	<Compile Include="..\..\..\..\Enums.cs">
+      <Link>Enums.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>

diff --git a/...arp/nuget/iOS/Devolutions.Crypto.iOS/Devolutions.Crypto.iOS/Devolutions.Crypto.iOS.csproj b/...arp/nuget/iOS/Devolutions.Crypto.iOS/Devolutions.Crypto.iOS/Devolutions.Crypto.iOS.csproj
@@ -62,6 +62,9 @@
     </Compile>
     <Compile Include="..\..\..\..\Utils.cs">
       <Link>Utils.cs</Link>
+    </Compile>
+	<Compile Include="..\..\..\..\Enums.cs">
+      <Link>Enums.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>

diff --git a/.../macOS/Modern/Devolutions.Crypto.Mac/Devolutions.Crypto.Mac/Devolutions.Crypto.Mac.csproj b/.../macOS/Modern/Devolutions.Crypto.Mac/Devolutions.Crypto.Mac/Devolutions.Crypto.Mac.csproj
@@ -56,6 +56,9 @@
     <Compile Include="..\..\..\..\..\Utils.cs">
       <Link>Utils.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\..\..\Enums.cs">
+      <Link>Enums.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ObjcBindingApiDefinition Include="ApiDefinition.cs" />