Merge pull request #14 from johnkellyoxford/dev

Dev

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

docs/HeaderSpec.md

@@ -0,0 +1,35 @@
+# Header specification
+
+## Header format
+
+* The items in the header are as followed (square brackets representing the start and end of the header, anything in braces is related to the previous option). Newlines and tabs are not true, but simply for formatting:
+
+```
+[
+-HMAC:(hash here, None)
+    { -HASHALGO:(PBKDF2, SHA256, bcrypt) }
+        { -ITERATIONS:(iterations here) }
+-KEYVERIFICATIONHASH:(hash here, None)
+    { -HASHALGO:(PBKDF2, SHA256, bcrypt) }
+        { -ITERATIONS:(iterations here) }
+-ENCRYPTMODE:(AES, RSA, etc)
+    {{-AESMODE:(ECB, CBC, CFB, CTR),
+      -ECCMODE:(different curves fo here)}
+      -KEYSIZE: (int)
+      -BLOCKSIZE: (int)
+    }
+    { -IV:(IV here) }
+]
+```
+
+## Header items
+
+| Argument      | Meaning       | Values|
+| ------------- |-------------| ----- |
+| <a href="#HMAC">HMAC</a> | The verification hash used to confirm the file hasn't changed | 128 - 512 bit byte array (16-64 bytes) |
+| [KEYVERIFICATIONHASH](#KEYVERIFICATIONHASH) | A hash of the key to verify if the password is correct | 128 - 512 bit byte array (16-64 bytes) |
+| [ENCRYPTMODE](#ENCRYPTMODE) | A byte representing the encryption type | A number in the table of [ENCRYPTMODE](#ENCRYPTMODE) page |
+
+### <p id="HMAC">HMAC</p>
+
+### KEYVERIFICATIONHASH

docs/ignore.txt

@@ -39,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 };
@@ -60,19 +60,28 @@ 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)
+                {
+                    return false;
+                }
+                return true;
             }
 
         }
+
+    }
     }
-}
+}

src/Backend/Encryptor.cs src/Backend/AESCryptoManager.cssrc/Backend/Encryptor.cs renamed to src/Backend/AESCryptoManager.cs

@@ -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/Encryption App.csproj src/EncryptionApp.csprojsrc/Encryption App.csproj renamed to src/EncryptionApp.csproj

@@ -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");
+            }
         }
     }
 }