reformmated

Author: john-h-k

docs/HeaderSpec.md

@@ -2,36 +2,56 @@
 
 ## 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) }
+    {
+        -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="#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 |
+| <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>
 
+* The HMAC (Hash Message Authentication Code)
+
 ### <p id="KEYVERIFICATIONHASH">KEYVERIFICATIONHASH</p>
 
 ### <p id ="ENCRYPTMODE">ENCRYPTMODE</P>
+
+### <p id="IV">IV</p>

src/Backend/AESCryptoManager.cs

@@ -33,10 +33,7 @@ public void AES_Encrypt(string iF, string oF, byte[] passwordBytes)
                         cs.WriteByte((byte)data);
 
                 }
-
-
             }
-
         }
 
         public bool AES_Decrypt(string iF, string oF, byte[] passwordBytes)
@@ -79,8 +76,6 @@ public bool AES_Decrypt(string iF, string oF, byte[] passwordBytes)
                 }
                 return true;
             }
-
         }
-
     }
 }