replace windows with unix line endings

and remove BOM from config file
Stricted · Jan 23, 2016 · 25c810a · 25c810a
1 parent 51c3eca
commit 25c810a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/SPHDecode/Implementations/Cryptography.cs b/SPHDecode/Implementations/Cryptography.cs
@@ -90,15 +90,11 @@ private static byte[] AESHelper (byte[] data, bool decrypt = false)
             encryptor.IV = IV;
 
             MemoryStream ms = new MemoryStream();
-            CryptoStream cs;
+            CryptoStream cs = new CryptoStream(ms, encryptor.CreateEncryptor(), CryptoStreamMode.Write);
+
             if (decrypt)
-            {
                 cs = new CryptoStream(ms, encryptor.CreateDecryptor(), CryptoStreamMode.Write);
-            }
-            else {
-                cs = new CryptoStream(ms, encryptor.CreateEncryptor(), CryptoStreamMode.Write);
-            }
-
+
             cs.Write(data, 0, data.Length);
             cs.Close();
 

diff --git a/SPHDecode/Model/MainWindowModel.cs b/SPHDecode/Model/MainWindowModel.cs
@@ -72,6 +72,12 @@ private void OndstFileDialogExecute()
         private void OnencryptExecute()
         {
             string orig = File.ReadAllText(srcFile);
+            // remove BOM from utf-8 file
+            orig = orig.Replace("\ufeff", "");
+
+            // replace windows with unix line endings
+            orig = orig.Replace("\r\n", "\n").Replace("\r", "\n");
+
             byte[] encode = Cryptography.Encrypt(orig);
             if (Object.Equals(encode, null).Equals(false))
             {