Merge pull request #11 from johnkellyoxford/dev

new system v2

Author: john-h-k

src/Backend/Encryptor.cs

@@ -1,52 +1,78 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.IO;
 using System.Security.Cryptography;
 
 namespace Encryption_App
 {
-    class Encryptor
+    class AESCryptoManager
     {
-       public void SymEncrypt(string Data)
-       {
+        public void AES_Encrypt(string iF, string oF, byte[] passwordBytes)
+        {
 
-       }
+            byte[] saltBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
+
+            using (var AES = new AesManaged())
+            {
+
+                AES.KeySize = 256;
+                AES.BlockSize = 128;
+                var key = new Rfc2898DeriveBytes(passwordBytes, saltBytes, 100000);
+                AES.Key = key.GetBytes(AES.KeySize / 8);
+                AES.IV = key.GetBytes(AES.BlockSize / 8);
+                AES.Padding = PaddingMode.PKCS7;
+                AES.Mode = CipherMode.CBC;
+
+                using (var outFile = File.Create(oF))
+                using (var cs = new CryptoStream(outFile, AES.CreateEncryptor(), CryptoStreamMode.Write))
+                using (var inFile = File.OpenRead(iF))
+                using (var br = new BinaryReader(inFile))
+                {
+
+                    sbyte data;
+                    while ((data = (sbyte)inFile.ReadByte()) != -1)
+                        cs.WriteByte((byte)data);
+
+                }
+
+
+            }
+
+        }
 
-       public void SymEncrypt(byte[] bArray, byte[] pwdBytes)
-       {
-            byte[] encryptedBytes = null;
+        public void AES_Decrypt(string iF, string oF, byte[] passwordBytes)
+        {
 
-            // Set your salt here, change it to meet your flavor:
-            // The salt bytes must be at least 8 bytes.
             byte[] saltBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
 
-            using (MemoryStream ms = new MemoryStream())
+            using (var AES = new AesManaged())
             {
-                using (RijndaelManaged AES = new RijndaelManaged())
-                {
-                    AES.KeySize = 256;
-                    AES.BlockSize = 128;
 
-                    var key = new Rfc2898DeriveBytes(pwdBytes, saltBytes, 1000);
-                    AES.Key = key.GetBytes(AES.KeySize / 8);
-                    AES.IV = key.GetBytes(AES.BlockSize / 8);
+                // AESManaged properties
+                AES.KeySize = 256;
+                AES.BlockSize = 128;
+                AES.Padding = PaddingMode.PKCS7;
+                AES.Mode = CipherMode.CBC;
+
+                var key = new Rfc2898DeriveBytes(passwordBytes, saltBytes, 100000);
+
 
-                    AES.Mode = CipherMode.CBC;
+                // Set actual IV and key
+                AES.Key = key.GetBytes(AES.KeySize / 8);
+                AES.IV = key.GetBytes(AES.BlockSize / 8);
+
+                using (var inFile = File.OpenRead(iF))
+                using (var cs = new CryptoStream(inFile, AES.CreateDecryptor(), CryptoStreamMode.Read))
+                using (var outFile = File.Create(oF))
+                {
+
+                    sbyte data;
+                    while ((data = (sbyte)cs.ReadByte()) != -1)
+                        outFile.WriteByte((byte)data);
 
-                    using (var cs = new CryptoStream(ms, AES.CreateEncryptor(), CryptoStreamMode.Write))
-                    {
-                        cs.Write(bArray, 0, bArray.Length);
-                        cs.Close();
-                    }
-                    encryptedBytes = ms.ToArray();
                 }
+
             }
 
-            
         }
-
     }
-}
+}

src/Encryption App.csproj

@@ -59,11 +59,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Compile Include="Backend\Encryptor.cs" />
     <Compile Include="UI\App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Backend\Encryptor.cs" />
     <Compile Include="UI\MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>

src/Program.cs

@@ -78,50 +78,20 @@ private void Encrypt_Click(object sender, RoutedEventArgs e)
         {
             string pwd = InpTxtBox.Text;
             string ofilePath = FileTxtBox.Text;
-            Encryptor encryptor = new Encryptor();
-            string filePath = encryptor.SymEncrypt(ofilePath, Encoding.UTF8.GetBytes(pwd));
-            byte[] encryptedData;
-            using (var br = new BinaryReader(File.OpenRead(filePath)))
-            {
-                encryptedData = br.ReadBytes((int)new FileInfo(filePath).Length);
-            }
-
-            if (encryptedData.Length == 0)
-            {
-                MessageBox.Show("Encryption Failed");
-            }
-            else
-            {
-                using (var bw = new BinaryWriter(File.Create(filePath)))
-                {
-                    bw.Write(encryptedData);
-                }
-                MessageBox.Show("Successfully Encrypted");
-            }
-            File.Copy(@"C:\Users\johnk\source\repos\EncryptionApp\src\Backend\tempoutfile.noedit", ofilePath, true);
+            AESCryptoManager encryptor = new AESCryptoManager();
+            encryptor.AES_Encrypt(ofilePath, @"D:\johnk\Documents\pnp.txt", Encoding.UTF8.GetBytes(pwd));
         }
 
         private void Decrypt_Click(object sender, RoutedEventArgs e)
         {
             string pwd = PwdTxtBox.Text;
             string ofilePath = DecryptFileLocBox.Text;
-            byte[] data;
 
             FileInfo f = new FileInfo(ofilePath);
 
-            Encryptor encryptor = new Encryptor();
-
-            string filePath = encryptor.SymDecrypt(ofilePath, Encoding.UTF8.GetBytes(pwd));
+            AESCryptoManager decryptor = new AESCryptoManager();
 
-            //if (data.Length == 0)
-            //{
-            //    MessageBox.Show("Decryption Failed");
-            //}
-            //else
-            //{
-            //    MessageBox.Show("Successfully Decrypted");
-            //}
-            File.Copy(@"C:\Users\johnk\source\repos\EncryptionApp\src\Backend\tempoutfile.noedit", ofilePath, true);
+            decryptor.AES_Decrypt(ofilePath, @"D:\johnk\Documents\btec.txt", Encoding.UTF8.GetBytes(pwd));
         }
     }
 }