Commit3

Author: NightRaven3142

src/Backend/AESCryptoManager.cs

@@ -16,12 +16,11 @@ 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))
@@ -61,19 +60,28 @@ public bool 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);
 
+                    }
                 }
-
+                catch (CryptographicException)
+                {
+                    return false;
+                }
+                return true;
             }
 
         }
+
+    }
     }
 }

src/EncryptionApp.csproj

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