Commit2

Author: NightRaven3142

src/Backend/Encryptor.cs

@@ -35,7 +35,14 @@ public byte[] SymEncrypt(byte[] data, byte[] pwd)
                     {
                         using (var bw = new BinaryWriter(cs))
                         {
-                            bw.Write(data, 0, data.Length);
+                           try
+                           {
+                                bw.Write(data, 0, data.Length);
+                            }
+                           catch(Exception ex)
+                            {
+                                return null;
+                            }
                         }
                     }
                     return ms.ToArray();
@@ -53,7 +60,7 @@ public byte[] SymDecrypt(byte[] data, byte[] pwd)
                 {
                     AES.KeySize = 256;
                     AES.BlockSize = 128;
-                    AES.Padding = PaddingMode.PKCS7;
+                    AES.Padding = PaddingMode.None;
                     AES.Mode = CipherMode.CBC;
 
                     var key = new Rfc2898DeriveBytes(pwd, saltBytes, 1000);
@@ -62,7 +69,14 @@ public byte[] SymDecrypt(byte[] data, byte[] pwd)
 
                     using (var cs = new CryptoStream(ms, AES.CreateDecryptor(), CryptoStreamMode.Write))
                     {
-                        cs.Write(data, 0, data.Length);
+                        try
+                        {
+                            cs.Write(data, 0, data.Length);
+                       }
+                        catch(Exception ex)
+                       {
+                            return null;
+                        }
                     }
                     return ms.ToArray();
                 }

src/UI/MainWindow.xaml.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -81,9 +82,17 @@ private void Encrypt_Click(object sender, RoutedEventArgs e)
             Encryptor encryptor = new Encryptor();
             byte[] encryptedData = encryptor.SymEncrypt(data, Encoding.UTF8.GetBytes(pwd));
 
-            using (var bw = new BinaryWriter(File.Create(filePath)))
+            if (encryptedData.Length == 0)
             {
-                bw.Write(encryptedData);
+              MessageBox.Show("Encryption Failed");
+             }
+          else
+         {
+                using (var bw = new BinaryWriter(File.Create(filePath)))
+                {
+                    bw.Write(encryptedData);
+               }
+                MessageBox.Show("Successfully Encrypted");
             }
         }
 
@@ -100,10 +109,19 @@ private void Decrypt_Click(object sender, RoutedEventArgs e)
             Encryptor encryptor = new Encryptor();
 
             data = encryptor.SymDecrypt(data, Encoding.UTF8.GetBytes(pwd));
+            Debug.Write("Stuff");
 
-            using (var bw = new BinaryWriter(File.Create(filePath)))
+            if (data.Length == 0)
             {
-                bw.Write(data);
+              MessageBox.Show("Decryption Failed");
+            }
+            else
+            {
+                using (var bw = new BinaryWriter(File.Create(filePath)))
+                {
+                    bw.Write(data);
+                }
+                MessageBox.Show("Successfully Decrypted");
             }
         }
     }