Working encryption test ft. weird newline bug.

Author: SoulessAdam

Main.cs

@@ -112,7 +112,10 @@ private void button2_Click(object sender, EventArgs e)
         private void debugBtn_Click(object sender, EventArgs e)
         {
             Aes.setEncryptKey(System.Text.Encoding.UTF8.GetBytes("SIXTEENCHARACTRS"));
-            outputTxt.AppendText("[DEBUG ENCRYPT] <<< " + Convert.ToBase64String(Aes.encryptOutgoing("Test Message")) + "" +Environment.NewLine);
+            Aes.setDecryptKey(System.Text.Encoding.UTF8.GetBytes("SIXTEENCHARACTRS"));
+            var b = Aes.encryptOutgoing("Test Message");
+            //outputTxt.AppendText("[DEBUG ENCRYPT] <<< " + "Message: " + Convert.ToBase64String(b[1]) + $" Key: SIXTEENCHARACTRS IV: {Convert.ToBase64String(b[0])}" +Environment.NewLine);
+            outputTxt.AppendText($"[TESTING DECRYPT] {Aes.decryptIncoming(b)} {Environment.NewLine}");
         }
     }
-}
+}

Modules/Encryption.cs

@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography;
+using System.Security.Cryptography;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace UDP_UI.Modules
 {
@@ -26,31 +22,69 @@ public AesModule()
                 _encrypt.KeySize = 128;
             }
 
-            public void setEncryptKey(byte[] key) {
+            public void setEncryptKey(byte[] key)
+            {
                 _encrypt.Key = key;
             }
 
-            public void setDecryptKey(byte[] key) {
+            public void setDecryptKey(byte[] key)
+            {
                 _decrypt.Key = key;
             }
 
-            public byte[] encryptOutgoing(string text)
+            public string encryptOutgoing(string text)
             {
                 _encrypt.GenerateIV();
                 byte[] buff;
-                using(var encryptor = _encrypt.CreateEncryptor()){
-                    using (var memStream = new MemoryStream()) {
-                        using (var csEncrypt = new CryptoStream(memStream, encryptor, CryptoStreamMode.Write)) {
+                using (var encryptor = _encrypt.CreateEncryptor())
+                {
+                    using (var memStream = new MemoryStream())
+                    {
+                        using (var csEncrypt = new CryptoStream(memStream, encryptor, CryptoStreamMode.Write))
+                        {
                             using (var bw = new BinaryWriter(csEncrypt, Encoding.UTF8))
                             {
                                 bw.Write(text);
                                 bw.Close();
                                 buff = memStream.ToArray();
-                                return _encrypt.IV.Concat(buff).ToArray();
+                                
                             }
                         }
                     }
                 }
+                return $"{Convert.ToBase64String(_encrypt.IV)}*{Convert.ToBase64String(buff)}";
+            }
+
+            public string decryptIncoming(string IVCipher_Base64)
+            {
+                string[] parsed = parseBase64(IVCipher_Base64);
+                string IV_Base64 = parsed[0];
+                string Cipher_Base64 = parsed[1];
+                byte[] IV = System.Convert.FromBase64String(IV_Base64);
+                byte[] Cipher = System.Convert.FromBase64String(Cipher_Base64);
+                _decrypt.IV = IV;
+
+                string output;
+                using (var decryptor = _decrypt.CreateDecryptor()) {
+                    using (MemoryStream ms = new MemoryStream(Cipher)) {
+                        using (CryptoStream cs = new CryptoStream(ms, decryptor, CryptoStreamMode.Read)) {
+                            using (StreamReader sr = new StreamReader(cs)) {
+                                output = sr.ReadToEnd();
+                            }
+                        }
+                    }
+                }
+
+
+                return output;
+            }
+
+            public string[] parseBase64(string b64)
+            {
+                var sides = b64.Split("*");
+                var IV = sides[0];
+                var Cipher = sides[1];  
+                return new string[] {IV, Cipher};
             }
         }
     }