Network/Security: AES key generation

Arcidev · May 22, 2015 · 9091eaf · 9091eaf
1 parent 9176238
commit 9091eaf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Client/Security/AesEncryptor.cs b/Client/Security/AesEncryptor.cs
@@ -12,8 +12,9 @@ public static class AesEncryptor
     {
         private static Aes aes;
         private static byte[] ivec = { 255, 254, 253, 252, 251, 250, 249, 248, 60, 61, 62, 63, 64, 65, 66, 67 };
+        private static byte[] key = new byte[16];
 
-        public static string Key { get; private set; }
+        public static byte[] Key { get { return key; } }
 
         // Incializes AES instance
         public static void Inicialize()
@@ -22,9 +23,13 @@ public static void Inicialize()
                 aes.Clear();
 
             aes = Aes.Create();
+            using (var rng = new RNGCryptoServiceProvider())
+            {
+                rng.GetBytes(key);
+            }
+
             aes.IV = ivec;
-            Key = "yayayaIamLordeya";
-            aes.Key = System.Text.Encoding.ASCII.GetBytes(Key);
+            aes.Key = key;
             aes.Padding = PaddingMode.Zeros;
         }
 

diff --git a/Client/Security/RsaEncryptor.cs b/Client/Security/RsaEncryptor.cs
@@ -49,12 +49,12 @@ public static void Inicialize()
         }
 
         // Encrypts data
-        public static byte[] Encrypt(string toEncrypt)
+        public static byte[] Encrypt(byte[] toEncrypt)
         {
             if (rsa == null)
                 return null;
 
-            return rsa.Encrypt(System.Text.Encoding.ASCII.GetBytes(toEncrypt), false);
+            return rsa.Encrypt(toEncrypt, false);
         }
 
         // Clears allocated resources