Merge pull request #10 from johnkellyoxford/dev

New system

Author: john-h-k

README.md

@@ -15,4 +15,4 @@
 ## Updates
 * Add error handling if encryption/decryption fails
 
-"Copied this from John's cause why not" @nightraven3142
+"Copied this from John's cause why not" @nightraven3142

src/Backend/Encryptor.cs

@@ -10,63 +10,43 @@ namespace Encryption_App
 {
     class Encryptor
     {
-        private static readonly string cryptFileEnding;
+       public void SymEncrypt(string Data)
+       {
 
-        public byte[] SymEncrypt(byte[] data, byte[] pwd)
-        {
-            byte[] saltBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
+       }
 
-            using (var ms = new MemoryStream())
-            {
-                using (var AES = new AesManaged())
-                {
-                    AES.KeySize = 256;
-                    AES.BlockSize = 128;
-                    AES.Padding = PaddingMode.PKCS7;
-                    AES.Mode = CipherMode.CBC;
-
-                    var key = new Rfc2898DeriveBytes(pwd, saltBytes, 1000);
-                    AES.Key = key.GetBytes(AES.KeySize / 8);
-                    AES.IV = key.GetBytes(AES.BlockSize / 8);
-                    Console.WriteLine(Encoding.UTF8.GetString(AES.Key));
-                    Console.WriteLine(Encoding.UTF8.GetString(AES.IV));
-
-                    using (var cs = new CryptoStream(ms, AES.CreateEncryptor(), CryptoStreamMode.Write))
-                    {
-                        using (var bw = new BinaryWriter(cs))
-                        {
-                            bw.Write(data, 0, data.Length);
-                        }
-                    }
-                    return ms.ToArray();
-                }
-            }
-        }
+       public void SymEncrypt(byte[] bArray, byte[] pwdBytes)
+       {
+            byte[] encryptedBytes = null;
 
-        public byte[] SymDecrypt(byte[] data, byte[] pwd)
-        {
+            // Set your salt here, change it to meet your flavor:
+            // The salt bytes must be at least 8 bytes.
             byte[] saltBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
 
-            using (var ms = new MemoryStream())
+            using (MemoryStream ms = new MemoryStream())
             {
-                using (AesManaged AES = new AesManaged())
+                using (RijndaelManaged AES = new RijndaelManaged())
                 {
                     AES.KeySize = 256;
                     AES.BlockSize = 128;
-                    AES.Padding = PaddingMode.PKCS7;
-                    AES.Mode = CipherMode.CBC;
 
-                    var key = new Rfc2898DeriveBytes(pwd, saltBytes, 1000);
+                    var key = new Rfc2898DeriveBytes(pwdBytes, saltBytes, 1000);
                     AES.Key = key.GetBytes(AES.KeySize / 8);
                     AES.IV = key.GetBytes(AES.BlockSize / 8);
 
-                    using (var cs = new CryptoStream(ms, AES.CreateDecryptor(), CryptoStreamMode.Write))
+                    AES.Mode = CipherMode.CBC;
+
+                    using (var cs = new CryptoStream(ms, AES.CreateEncryptor(), CryptoStreamMode.Write))
                     {
-                        cs.Write(data, 0, data.Length);
+                        cs.Write(bArray, 0, bArray.Length);
+                        cs.Close();
                     }
-                    return ms.ToArray();
+                    encryptedBytes = ms.ToArray();
                 }
             }
+
+            
         }
+
     }
 }

src/Backend/tempoutfile.noedit

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -76,35 +77,51 @@ private void Button_Click(object sender, RoutedEventArgs e)
         private void Encrypt_Click(object sender, RoutedEventArgs e)
         {
             string pwd = InpTxtBox.Text;
-            string filePath = FileTxtBox.Text;
-            byte[] data = File.ReadAllBytes(filePath);
+            string ofilePath = FileTxtBox.Text;
             Encryptor encryptor = new Encryptor();
-            byte[] encryptedData = encryptor.SymEncrypt(data, Encoding.UTF8.GetBytes(pwd));
+            string filePath = encryptor.SymEncrypt(ofilePath, Encoding.UTF8.GetBytes(pwd));
+            byte[] encryptedData;
+            using (var br = new BinaryReader(File.OpenRead(filePath)))
+            {
+                encryptedData = br.ReadBytes((int)new FileInfo(filePath).Length);
+            }
 
-            using (var bw = new BinaryWriter(File.Create(filePath)))
+            if (encryptedData.Length == 0)
+            {
+                MessageBox.Show("Encryption Failed");
+            }
+            else
             {
-                bw.Write(encryptedData);
+                using (var bw = new BinaryWriter(File.Create(filePath)))
+                {
+                    bw.Write(encryptedData);
+                }
+                MessageBox.Show("Successfully Encrypted");
             }
+            File.Copy(@"C:\Users\johnk\source\repos\EncryptionApp\src\Backend\tempoutfile.noedit", ofilePath, true);
         }
 
         private void Decrypt_Click(object sender, RoutedEventArgs e)
         {
             string pwd = PwdTxtBox.Text;
-            string filePath = DecryptFileLocBox.Text;
+            string ofilePath = DecryptFileLocBox.Text;
             byte[] data;
 
-            FileInfo f = new FileInfo(filePath);
-
-            data = File.ReadAllBytes(filePath);
+            FileInfo f = new FileInfo(ofilePath);
 
             Encryptor encryptor = new Encryptor();
 
-            data = encryptor.SymDecrypt(data, Encoding.UTF8.GetBytes(pwd));
-
-            using (var bw = new BinaryWriter(File.Create(filePath)))
-            {
-                bw.Write(data);
-            }
+            string filePath = encryptor.SymDecrypt(ofilePath, Encoding.UTF8.GetBytes(pwd));
+
+            //if (data.Length == 0)
+            //{
+            //    MessageBox.Show("Decryption Failed");
+            //}
+            //else
+            //{
+            //    MessageBox.Show("Successfully Decrypted");
+            //}
+            File.Copy(@"C:\Users\johnk\source\repos\EncryptionApp\src\Backend\tempoutfile.noedit", ofilePath, true);
         }
     }
 }

src/UI/MainWindow.xaml.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Security.Cryptography;
+
+public class Class1
+{
+	public Class1()
+	{
+	}
+
+    public static void main()
+    {
+        var rng = new RNGCryptoServiceProvider();
+        byte[] salt = new byte[16];
+        salt = rng.GetBytes(salt);
+        var watch = System.Diagnostics.Stopwatch.StartNew();
+        var hasher = new Rfc2898DeriveBytes("HelloWorld12345", salt, 10000);
+        watch.Stop();
+        var elapsedMs = watch.ElapsedMilliseconds;
+        Console.WriteLine(elapsedMs);
+
+    }
+}