Fixed formatting issues in Crypto.cs (again)

Author: John

Crypto.cs

@@ -18,45 +18,45 @@ public static class Crypto
 		public static uint rotr(uint n, int d) => (n >> d) | (n << (32 - d));
 
 		public static byte[] EncryptAndDigest(string aad, byte[] data) {
-            byte[] nonce = Utilities.RandomBytes(12);
-            byte[] aadBytes = Encoding.UTF8.GetBytes(aad);
-            byte[] aadHash = new SHA256Managed().ComputeHash(aadBytes);
-            var cipher = new GcmBlockCipher(new AesEngine());
-            var cParams = new AeadParameters(new KeyParameter(aadHash, 0, 16), 128, nonce, aadBytes);
-            cipher.Init(true, cParams);
-            byte[] ciphertext = new byte[cipher.GetOutputSize(data.Length)];
-            int retLen = cipher.ProcessBytes(data, 0, data.Length, ciphertext, 0);
-            cipher.DoFinal(ciphertext, retLen);
-
-            byte[] output = new byte[nonce.Length + ciphertext.Length];
-            Buffer.BlockCopy(nonce, 0, output, 0, nonce.Length);
-            Buffer.BlockCopy(ciphertext, 0, output, nonce.Length, ciphertext.Length);
-            return output;
-        }
-
-        public static byte[] DecryptAndVerify(string aad, byte[] data) {
-            byte[] nonce = new byte[12];
-            byte[] ciphertext = new byte[data.Length - 12];
-            Buffer.BlockCopy(data, 0, nonce, 0, nonce.Length);
-            Buffer.BlockCopy(data, nonce.Length, ciphertext, 0, ciphertext.Length);
-
-            byte[] aadBytes = Encoding.UTF8.GetBytes(aad);
-            byte[] aadHash = new SHA256Managed().ComputeHash(aadBytes);
-            var cipher = new GcmBlockCipher(new AesEngine());
-            var cParams = new AeadParameters(new KeyParameter(aadHash, 0, 16), 128, nonce, aadBytes);
-            cipher.Init(false, cParams);
-            byte[] plaintext = new byte[cipher.GetOutputSize(ciphertext.Length)];
-            int retLen = cipher.ProcessBytes(ciphertext, 0, ciphertext.Length, plaintext, 0);
-            cipher.DoFinal(plaintext, retLen);
-
-            return plaintext;
-        }
+			byte[] nonce = Utilities.RandomBytes(12);
+			byte[] aadBytes = Encoding.UTF8.GetBytes(aad);
+			byte[] aadHash = new SHA256Managed().ComputeHash(aadBytes);
+			var cipher = new GcmBlockCipher(new AesEngine());
+			var cParams = new AeadParameters(new KeyParameter(aadHash, 0, 16), 128, nonce, aadBytes);
+			cipher.Init(true, cParams);
+			byte[] ciphertext = new byte[cipher.GetOutputSize(data.Length)];
+			int retLen = cipher.ProcessBytes(data, 0, data.Length, ciphertext, 0);
+			cipher.DoFinal(ciphertext, retLen);
+
+			byte[] output = new byte[nonce.Length + ciphertext.Length];
+			Buffer.BlockCopy(nonce, 0, output, 0, nonce.Length);
+			Buffer.BlockCopy(ciphertext, 0, output, nonce.Length, ciphertext.Length);
+			return output;
+		}
+
+		public static byte[] DecryptAndVerify(string aad, byte[] data) {
+			byte[] nonce = new byte[12];
+			byte[] ciphertext = new byte[data.Length - 12];
+			Buffer.BlockCopy(data, 0, nonce, 0, nonce.Length);
+			Buffer.BlockCopy(data, nonce.Length, ciphertext, 0, ciphertext.Length);
+
+			byte[] aadBytes = Encoding.UTF8.GetBytes(aad);
+			byte[] aadHash = new SHA256Managed().ComputeHash(aadBytes);
+			var cipher = new GcmBlockCipher(new AesEngine());
+			var cParams = new AeadParameters(new KeyParameter(aadHash, 0, 16), 128, nonce, aadBytes);
+			cipher.Init(false, cParams);
+			byte[] plaintext = new byte[cipher.GetOutputSize(ciphertext.Length)];
+			int retLen = cipher.ProcessBytes(ciphertext, 0, ciphertext.Length, plaintext, 0);
+			cipher.DoFinal(plaintext, retLen);
+
+			return plaintext;
+		}
 
 		public static byte[] CalcProfileHash(byte[] data) {
 			byte[] pfData = new byte[data.Length - 0xC];
 			Buffer.BlockCopy(data, 0xC, pfData, 0, pfData.Length);
 
-			return FarmHash_Hash32(pfData);
+			return Hash32(pfData);
 		}
 
 		private static uint Mur(uint a, uint h) {
@@ -71,7 +71,7 @@ private static uint Mur(uint a, uint h) {
 			return h * 5 + C3;
 		}
 
-		public static byte[] FarmHash_Hash32(byte[] data) {
+		public static byte[] Hash32(byte[] data) {
 			// Taken from https://github.com/google/farmhash/blob/master/src/farmhash.cc
 
 			uint size = (uint)data.Length;