Merge pull request #20 from johnkellyoxford/dev

Dev

Author: john-h-k

README.md

@@ -1,5 +1,7 @@
 # EncryptorAppVS
 
+Master: [![Build status](https://ci.appveyor.com/api/projects/status/lspd6npm0sbwtscm?svg=true)](https://ci.appveyor.com/project/johnkellyoxford/encryptionapp)
+
 ## Documentation:
 
 ## Right now
@@ -17,4 +19,3 @@
 ## Updates
 * Add error handling if encryption/decryption fails
 
-"Copied this from John's cause why not" @nightraven3142

docs/HeaderSpec.md

@@ -2,36 +2,47 @@
 
 ## 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:
+* At the start of the header, it is marked by 5 null characters (byte value 0000 0000), and then the following ASCII string: "BEGIN ENCRYPTION HEADER STRING"
+
+* The end of the header is marked by the following ASCII string "END ENCRYPTION HEADER STRING", and followed by 5 null characters (byte value 0000 0000)
+
+* 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). All whitespace 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) }
+    {
+        -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)
+    {
+        -AESMODE:(ECB, CBC, CFB, CTR),
+        -ECCMODE:(different curves fo here),
+        -KEYSIZE:(int),
+        -BLOCKSIZE:(int)
     }
-    { -IV:(IV here) }
+
+-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) |
-| <a href="#KEYVERIFICATIONHASH">KEYVERIFICATIONHASH</a> | A hash of the key to verify if the password is correct | 128 - 512 bit byte array (16-64 bytes) |
-| <a href="#ENCRYPTMODE">ENCRYPTMODE</a>                 | A byte representing the encryption type | A string in the table of <a href="#ENCRYPTMODE">ENCRYPTMODE</a> page, and the (undefined ATM -- TODO) enumeration |
+* Subitems are in the hyperlinks
+
+| 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)                                                                            |
+| <a href="#ENCRYPTMODE">ENCRYPTMODE</a>                 | A byte representing the encryption type                       | A string in the table of <a href="#ENCRYPTMODE">ENCRYPTMODE</a> page, and the (undefined ATM -- TODO) enumeration |
+| <a href="IV">IV</a>                                    | The initialization vector used to start the encryption        | 128 - 512 bit byte array (16-64 bytes)                                                                            |
+
 
 ### <p id="HMAC">HMAC</p>
 
-### <p id="KEYVERIFICATIONHASH">KEYVERIFICATIONHASH</p>
+The HMAC (Hash Message Authentication Code) is a hash that is used to verify the message hasn't been tampered with. The HMAC is the hashed value of the encrypted message. The receiver can re-hash the received message to verify the message hasn't been tampered with. **IMPORTANT: HMAC construction MUST be actual HMAC algorithm, not just hashing. See [this](https://en.wikipedia.org/wiki/HMAC#Implementation) for details ****
 
 ### <p id ="ENCRYPTMODE">ENCRYPTMODE</P>
+
+### <p id="IV">IV</p>

src/Backend/AESCryptoManager.cs

@@ -6,7 +6,7 @@ namespace Encryption_App
 {
     class AESCryptoManager
     {
-        public void AES_Encrypt(string iF, string oF, byte[] passwordBytes)
+        public void EncryptBytes(string iF, string oF, byte[] passwordBytes)
         {
 
             byte[] saltBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
@@ -33,13 +33,10 @@ public void AES_Encrypt(string iF, string oF, byte[] passwordBytes)
                         cs.WriteByte((byte)data);
 
                 }
-
-
             }
-
         }
 
-        public bool AES_Decrypt(string iF, string oF, byte[] passwordBytes)
+        public bool DecryptBytes(string iF, string oF, byte[] passwordBytes)
         {
 
             byte[] saltBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
@@ -79,8 +76,6 @@ public bool AES_Decrypt(string iF, string oF, byte[] passwordBytes)
                 }
                 return true;
             }
-
         }
-
     }
 }

src/Backend/CryptoManager.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Encryption_App.Backend
+{
+    abstract class CryptoManager
+    {
+        public abstract byte[] EncryptBytes();
+
+        public abstract bool DecryptBytes();
+    }
+}

src/Backend/MessageAuthenticator.cs

@@ -0,0 +1,88 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+
+namespace Encryption_App
+{
+    class MessageAuthenticator
+    {
+        public byte[] CreateHMAC(byte[] data, byte[] key)
+        {
+            byte[] hashKey;
+
+            using (var hmac = new HMACSHA384(key))
+            {
+                hashKey = hmac.ComputeHash(data);
+            }
+
+            return hashKey;
+        }
+
+        public byte[] CreateHMAC(byte[] data, byte[] key, Type TypeOfHash)
+        {
+            HMAC hmac;
+            if (TypeOfHash.IsSubclassOf(typeof(HMAC)))
+            {
+                hmac = (HMAC)Activator.CreateInstance(TypeOfHash);
+            }
+            else
+            {
+                throw new ArgumentException("TypeOfHash is not a derivative of \"System.Security.Cryptorgaphy.HMAC\"");
+            }
+
+            byte[] hashKey;
+
+            using (hmac)
+            {
+                hashKey = hmac.ComputeHash(data);
+            }
+
+            return hashKey;
+        }
+
+        public bool VerifyHMAC(byte[] data, byte[] key, byte[] hash)
+        {
+            byte[] hashKey;
+
+            using (var hmac = new HMACSHA384(key))
+            {
+                hashKey = hmac.ComputeHash(data);
+            }
+
+            if (data.SequenceEqual(hash))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool VerifyHMAC(byte[] data, byte[] key, byte[] hash, Type TypeOfHash)
+        {
+            HMAC hmac;
+            if (TypeOfHash.IsSubclassOf(typeof(HMAC)))
+            {
+                hmac = (HMAC)Activator.CreateInstance(TypeOfHash);
+            }
+            else
+            {
+                throw new ArgumentException("TypeOfHash is not a derivative of \"System.Security.Cryptorgaphy.HMAC\"");
+            }
+
+            byte[] hashKey;
+
+            using (hmac)
+            {
+                hashKey = hmac.ComputeHash(data);
+            }
+
+            if (data.SequenceEqual(hash))
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}

src/EncryptionApp.csproj

@@ -60,7 +60,9 @@
       <SubType>Designer</SubType>
     </Page>
     <Compile Include="Backend\AESCryptoManager.cs" />
-    <Compile Include="UI\App.xaml.cs" >
+    <Compile Include="Backend\CryptoManager.cs" />
+    <Compile Include="Backend\MessageAuthenticator.cs" />
+    <Compile Include="UI\App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
@@ -97,4 +99,4 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

src/UI/MainWindow.xaml.cs

@@ -79,7 +79,7 @@ private void Encrypt_Click(object sender, RoutedEventArgs e)
             string pwd = InpTxtBox.Text;
             string ofilePath = FileTxtBox.Text;
             AESCryptoManager encryptor = new AESCryptoManager();
-            encryptor.AES_Encrypt(ofilePath, System.IO.Path.GetTempPath() + "tempdata.ini", Encoding.UTF8.GetBytes(pwd));
+            encryptor.EncryptBytes(ofilePath, System.IO.Path.GetTempPath() + "tempdata.ini", Encoding.UTF8.GetBytes(pwd));
             File.Copy(System.IO.Path.GetTempPath() + "tempdata.ini", ofilePath, true);
         }
 
@@ -91,7 +91,7 @@ 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)); ;
+            bool worked = decryptor.DecryptBytes(ofilePath, System.IO.Path.GetTempPath() + "tempdata.ini", Encoding.UTF8.GetBytes(pwd)); ;
             if (worked) { File.Copy(System.IO.Path.GetTempPath() + "tempdata.ini", ofilePath, true); }
 
             if (!worked)