Merge pull request #22 from johnkellyoxford/experimental

Experimental

Author: john-h-k

src/Backend/AESCryptoManager.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Security.Cryptography;
 
 namespace Encryption_App.Backend
@@ -23,20 +24,29 @@ public void EncryptBytes(string inputFile, string outFile, byte[] passwordBytes)
                 // Derives a key using PBKDF2 from the password and a salts
                 var key = new Rfc2898DeriveBytes(passwordBytes, saltBytes, 100000);
 
-
                 // Set actual IV and key
                 aes.Key = key.GetBytes(aes.KeySize / 8);
                 aes.IV = key.GetBytes(aes.BlockSize / 8);
 
-                using (var outFileStream = new FileStream(outFile, FileMode.Create))
+                using (var outFileStream = File.Create(outFile))
                 using (var cs = new CryptoStream(outFileStream, aes.CreateEncryptor(), CryptoStreamMode.Write))
-                using (var inFileStream = new FileStream(inputFile, FileMode.Create))
+                using (var inFile = new BinaryReader(File.OpenRead(inputFile)))
                 {
+                    while (true)
+                    {
+                        try
+                        {
+                            var data = (byte)inFile.ReadByte();
+                            cs.WriteByte(data);
+                        }
+                        catch (EndOfStreamException)
+                        {
+                            break;
+                        }
+                    }
 
-                    sbyte data;
-                    while ((data = (sbyte)inFileStream.ReadByte()) != -1)
-                        cs.WriteByte((byte)data);
                 }
+
             }
         }
 
@@ -45,42 +55,54 @@ public bool DecryptBytes(string inputFile, string outFile, byte[] passwordBytes)
 
             var saltBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
 
-            using (var aes = new AesManaged())
+            try
             {
+                using (var aes = new AesManaged())
+                {
 
-                // AESManaged properties
-                aes.KeySize = 256;
-                aes.BlockSize = 128;
-                aes.Padding = PaddingMode.PKCS7;
-                aes.Mode = CipherMode.CBC;
+                    // AESManaged properties
+                    aes.KeySize = 256;
+                    aes.BlockSize = 128;
+                    aes.Padding = PaddingMode.PKCS7;
+                    aes.Mode = CipherMode.CBC;
 
 
-                // Derives a key using PBKDF2 from the password and a salt
-                var key = new Rfc2898DeriveBytes(passwordBytes, saltBytes, 100000);
+                    // Derives a key using PBKDF2 from the password and a salts
+                    var key = new Rfc2898DeriveBytes(passwordBytes, saltBytes, 100000);
 
 
-                // Set actual IV and key
-                aes.Key = key.GetBytes(aes.KeySize / 8);
-                aes.IV = key.GetBytes(aes.BlockSize / 8);
+                    // Set actual IV and key
+                    aes.Key = key.GetBytes(aes.KeySize / 8);
+                    aes.IV = key.GetBytes(aes.BlockSize / 8);
 
-                try
-                {
-                    using (var outFileStream = new FileStream(outFile, FileMode.Create))
-                    using (var cs = new CryptoStream(outFileStream, aes.CreateEncryptor(), CryptoStreamMode.Write))
-                    using (var inFileStream = new FileStream(inputFile, FileMode.Create))
+                    using (var outFileStream = File.Create(outFile))
+                    using (var cs = new CryptoStream(outFileStream, aes.CreateDecryptor(), CryptoStreamMode.Write))
+                    using (var inFile = new BinaryReader(File.OpenRead(inputFile)))
                     {
+                        while (true)
+                        {
+                            try
+                            {
+                                var data = (byte)inFile.ReadByte();
+                                cs.WriteByte(data);
+                            }
+                            catch (EndOfStreamException)
+                            {
+                                break;
+                            }
+                        }
 
-                        sbyte data;
-                        while ((data = (sbyte)inFileStream.ReadByte()) != -1)
-                            cs.WriteByte((byte)data);
                     }
                 }
-                catch (CryptographicException)
-                {
-                    return false;
-                }
-                return true;
             }
+
+            catch (CryptographicException)
+            {
+                return false;
+            }
+
+            return true;
         }
     }
 }
+

src/UI/MainWindow.xaml.cs

@@ -20,7 +20,6 @@ public MainWindow()
             InitializeComponent();
             DropDown.ItemsSource = _dropDownItems;
             DropDown.SelectedIndex = 0;
-
         }
 
         private void MenuItem_Click(object sender, RoutedEventArgs e)
@@ -67,21 +66,24 @@ private void Encrypt_Click(object sender, RoutedEventArgs e)
         {
             var pwd = InpTxtBox.Text;
             var tempFilePath = FileTxtBox.Text;
+            Console.WriteLine(System.IO.Path.GetTempPath() + "tempdata.ini");
             var encryptor = new AesCryptoManager();
             encryptor.EncryptBytes(tempFilePath, System.IO.Path.GetTempPath() + "tempdata.ini", Encoding.UTF8.GetBytes(pwd));
-            File.Copy(System.IO.Path.GetTempPath() + "tempdata.ini", tempFilePath, true);
+            File.Copy(Path.GetTempPath() + "tempdata.ini", tempFilePath, true);
+
         }
 
         private void Decrypt_Click(object sender, RoutedEventArgs e)
         {
             var pwd = PwdTxtBox.Text;
             var outFilePath = DecryptFileLocBox.Text;
-
             var f = new FileInfo(outFilePath);
-
             var decryptor = new AesCryptoManager();
             var worked = decryptor.DecryptBytes(outFilePath, System.IO.Path.GetTempPath() + "tempdata.ini", Encoding.UTF8.GetBytes(pwd));
-            if (worked) { File.Copy(System.IO.Path.GetTempPath() + "tempdata.ini", outFilePath, true); }
+            if (worked)
+            {
+                File.Copy(Path.GetTempPath() + "tempdata.ini", outFilePath, true);
+            }
 
             MessageBox.Show(!worked ? "Wrong Password" : "Successfully Decrypted");
         }