...

[GitHub/Stricted/SpeedportHybridControl.git] / SpeedportHybridControl.Implementations / Cryptography.cs

diff --git a/SpeedportHybridControl.Implementations/Cryptography.cs b/SpeedportHybridControl.Implementations/Cryptography.cs
index 1fccf90fbf3c2632b97884444278586d0f818d73..7fda3fe938e92e3d809f6e1f8ce88301b1375b01 100644 (file)
--- a/SpeedportHybridControl.Implementations/Cryptography.cs
+++ b/SpeedportHybridControl.Implementations/Cryptography.cs
@@ -5,8 +5,8 @@ using System.Text;
 
 namespace SpeedportHybridControl.Implementations {
        public static class Cryptography {
-               private static string EncryptionKey = "FD25B8d0afB9DDB";
-               private static byte[] salt = new byte[] { 82, 9, 106, 213, 48, 54, 165, 56, 191, 64, 163, 158, 129 };
+               private static string KEY = "8E16A57381AFDA47856682CEBE85DCF5982F59321AE28B2822C1C9E1FC481C50";
+               private static string IV = "7CD37E78623793D4C4BB81DB73B08522";
 
                public static string Encrypt (string clearText) {
                        byte[] clearBytes = Encoding.Unicode.GetBytes(clearText);
@@ -17,9 +17,13 @@ namespace SpeedportHybridControl.Implementations {
                                        return result;
                                }
 
-                               Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(EncryptionKey, salt);
-                               encryptor.Key = pdb.GetBytes(32);
-                               encryptor.IV = pdb.GetBytes(16);
+                               encryptor.KeySize = 256;
+                               encryptor.BlockSize = 128;
+                               encryptor.Mode = CipherMode.CBC;
+                               encryptor.Padding = PaddingMode.PKCS7;
+                               encryptor.Key = util.HexToByte(KEY);
+                               encryptor.IV = util.HexToByte(IV);
+
                                using (MemoryStream ms = new MemoryStream()) {
                                        using (CryptoStream cs = new CryptoStream(ms, encryptor.CreateEncryptor(), CryptoStreamMode.Write)) {
                                                cs.Write(clearBytes, 0, clearBytes.Length);
@@ -41,9 +45,13 @@ namespace SpeedportHybridControl.Implementations {
                                        return result;
                                }
 
-                               Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(EncryptionKey, salt);
-                               encryptor.Key = pdb.GetBytes(32);
-                               encryptor.IV = pdb.GetBytes(16);
+                               encryptor.KeySize = 256;
+                               encryptor.BlockSize = 128;
+                               encryptor.Mode = CipherMode.CBC;
+                               encryptor.Padding = PaddingMode.PKCS7;
+                               encryptor.Key = util.HexToByte(KEY);
+                               encryptor.IV = util.HexToByte(IV);
+                               
                                using (MemoryStream ms = new MemoryStream()) {
                                        using (CryptoStream cs = new CryptoStream(ms, encryptor.CreateDecryptor(), CryptoStreamMode.Write)) {
                                                cs.Write(cipherBytes, 0, cipherBytes.Length);