fixed all

Author: john-h-k

src/Backend/AESCryptoManager.cs

@@ -24,26 +24,27 @@ 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);
 
-                long len = new FileInfo(inputFile).Length;
-
                 using (var outFileStream = File.Create(outFile))
                 using (var cs = new CryptoStream(outFileStream, aes.CreateEncryptor(), CryptoStreamMode.Write))
-                using (var inFile = File.OpenRead(inputFile))
+                using (var inFile = new BinaryReader(File.OpenRead(inputFile)))
                 {
-
-                    using (var br = new BinaryReader(inFile))
+                    while (true)
                     {
-
-                        sbyte data;
-                        while ((data = (sbyte)inFile.ReadByte()) != -1)
-                            cs.WriteByte((byte)data);
-
+                        try
+                        {
+                            var data = (byte)inFile.ReadByte();
+                            cs.WriteByte(data);
+                        }
+                        catch (EndOfStreamException)
+                        {
+                            break;
+                        }
                     }
+
                 }
 
             }
@@ -74,23 +75,24 @@ public bool DecryptBytes(string inputFile, string outFile, byte[] passwordBytes)
                     aes.Key = key.GetBytes(aes.KeySize / 8);
                     aes.IV = key.GetBytes(aes.BlockSize / 8);
 
-                    long len = new FileInfo(inputFile).Length;
-
                     using (var outFileStream = File.Create(outFile))
-                    using (var cs = new CryptoStream(outFileStream, aes.CreateEncryptor(), CryptoStreamMode.Write))
-                    using (var inFile = File.OpenRead(inputFile))
+                    using (var cs = new CryptoStream(outFileStream, aes.CreateDecryptor(), CryptoStreamMode.Write))
+                    using (var inFile = new BinaryReader(File.OpenRead(inputFile)))
                     {
-
-                        using (var br = new BinaryReader(inFile))
+                        while (true)
                         {
-
-                            sbyte data;
-                            while ((data = (sbyte)inFile.ReadByte()) != -1)
-                                cs.WriteByte((byte)data);
-
+                            try
+                            {
+                                var data = (byte)inFile.ReadByte();
+                                cs.WriteByte(data);
+                            }
+                            catch (EndOfStreamException)
+                            {
+                                break;
+                            }
                         }
-                    }
 
+                    }
                 }
             }
 

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)
@@ -84,7 +83,6 @@ private void Decrypt_Click(object sender, RoutedEventArgs e)
             if (worked)
             {
                 File.Copy(Path.GetTempPath() + "tempdata.ini", outFilePath, true);
-                Console.WriteLine("yay");
             }
 
             MessageBox.Show(!worked ? "Wrong Password" : "Successfully Decrypted");