added sanitisation and refactored

Author: john-h-k

Encryption App.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.2016
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Encryption App", "src\Encryption App.csproj", "{701B9935-7BF8-4BA2-861A-7764761C1318}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EncryptionApp", "src\EncryptionApp.csproj", "{701B9935-7BF8-4BA2-861A-7764761C1318}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Backend/Encryptor.cs

@@ -16,11 +16,12 @@ public void AES_Encrypt(string iF, string oF, byte[] passwordBytes)
 
                 AES.KeySize = 256;
                 AES.BlockSize = 128;
+                AES.Padding = PaddingMode.PKCS7;
+                AES.Mode = CipherMode.CBC;
+
                 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))
@@ -60,17 +61,24 @@ public void AES_Decrypt(string iF, string oF, byte[] passwordBytes)
                 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))
+
+                try
                 {
+                    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);
+                        sbyte data;
+                        while ((data = (sbyte)cs.ReadByte()) != -1)
+                            outFile.WriteByte((byte)data);
 
+                    }
                 }
+                catch (CryptographicException)
+                {
 
+                }
             }
 
         }