Merge branch 'dev' of https://github.com/johnkellyoxford/EncryptionApp into dev

Author: john-h-k

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))
@@ -40,7 +39,7 @@ public void AES_Encrypt(string iF, string oF, byte[] passwordBytes)
 
         }
 
-        public void AES_Decrypt(string iF, string oF, byte[] passwordBytes)
+        public bool AES_Decrypt(string iF, string oF, byte[] passwordBytes)
         {
 
             byte[] saltBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
@@ -61,7 +60,6 @@ public void AES_Decrypt(string iF, string oF, byte[] passwordBytes)
                 AES.Key = key.GetBytes(AES.KeySize / 8);
                 AES.IV = key.GetBytes(AES.BlockSize / 8);
 
-
                 try
                 {
                     using (var inFile = File.OpenRead(iF))
@@ -77,10 +75,13 @@ public void AES_Decrypt(string iF, string oF, byte[] passwordBytes)
                 }
                 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>

src/UI/MainWindow.xaml.cs

@@ -79,7 +79,8 @@ private void Encrypt_Click(object sender, RoutedEventArgs e)
             string pwd = InpTxtBox.Text;
             string ofilePath = FileTxtBox.Text;
             AESCryptoManager encryptor = new AESCryptoManager();
-            encryptor.AES_Encrypt(ofilePath, @"D:\johnk\Documents\pnp.txt", Encoding.UTF8.GetBytes(pwd));
+            encryptor.AES_Encrypt(ofilePath, System.IO.Path.GetTempPath() + "tempdata.ini", Encoding.UTF8.GetBytes(pwd));
+            File.Copy(System.IO.Path.GetTempPath() + "tempdata.ini", ofilePath, true);
         }
 
         private void Decrypt_Click(object sender, RoutedEventArgs e)
@@ -90,8 +91,17 @@ private void Decrypt_Click(object sender, RoutedEventArgs e)
             FileInfo f = new FileInfo(ofilePath);
 
             AESCryptoManager decryptor = new AESCryptoManager();
+            bool worked = decryptor.AES_Decrypt(ofilePath, System.IO.Path.GetTempPath() + "tempdata.ini", Encoding.UTF8.GetBytes(pwd)); ;
+            if (worked) { File.Copy(System.IO.Path.GetTempPath() + "tempdata.ini", ofilePath, true); }
 
-            decryptor.AES_Decrypt(ofilePath, @"D:\johnk\Documents\btec.txt", Encoding.UTF8.GetBytes(pwd));
+            if (!worked)
+            {
+                MessageBox.Show("Wrong Password");
+            }
+            else
+            {
+                MessageBox.Show("Successfully Decrypted");
+            }
         }
     }
 }