aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaelTheShifter <[email protected]>2016-07-05 08:41:13 -0400
committerMichaelTheShifter <[email protected]>2016-07-05 08:41:13 -0400
commita0b001b25f001d1df767987528980704d3d40347 (patch)
tree1ecffeff1107f263d3f3914642398d7f27d49cd9
parentb5a5e0eb8a29e7eb858b6db6f8f7a60a2b2ae90c (diff)
downloadshiftos-c-_theultimatehacker-a0b001b25f001d1df767987528980704d3d40347.tar.gz
shiftos-c-_theultimatehacker-a0b001b25f001d1df767987528980704d3d40347.tar.bz2
shiftos-c-_theultimatehacker-a0b001b25f001d1df767987528980704d3d40347.zip
Change Lua encryption key to be the old one.
-rw-r--r--source/WindowsFormsApplication1/API.cs27
-rw-r--r--source/WindowsFormsApplication1/Engine/Lua_Interp.cs4
2 files changed, 29 insertions, 2 deletions
diff --git a/source/WindowsFormsApplication1/API.cs b/source/WindowsFormsApplication1/API.cs
index 9c8c69c..f952a18 100644
--- a/source/WindowsFormsApplication1/API.cs
+++ b/source/WindowsFormsApplication1/API.cs
@@ -474,6 +474,33 @@ namespace ShiftOS
}
}
+ public static string Encrypt_old(string plainText)
+ {
+ byte[] plainTextBytes = Encoding.UTF8.GetBytes(plainText);
+ using (PasswordDeriveBytes password = new PasswordDeriveBytes(passPhrase, null))
+ {
+ byte[] keyBytes = password.GetBytes(keysize / 8);
+ using (RijndaelManaged symmetricKey = new RijndaelManaged())
+ {
+ symmetricKey.Mode = CipherMode.CBC;
+ using (ICryptoTransform encryptor = symmetricKey.CreateEncryptor(keyBytes, initVectorBytes))
+ {
+ using (MemoryStream memoryStream = new MemoryStream())
+ {
+ using (CryptoStream cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
+ {
+ cryptoStream.Write(plainTextBytes, 0, plainTextBytes.Length);
+ cryptoStream.FlushFinalBlock();
+ byte[] cipherTextBytes = memoryStream.ToArray();
+ return Convert.ToBase64String(cipherTextBytes);
+ }
+ }
+ }
+ }
+ }
+ }
+
+
/// <summary>
/// Decrypts an encrypted string.
/// </summary>
diff --git a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs
index 21acb3c..88a51a3 100644
--- a/source/WindowsFormsApplication1/Engine/Lua_Interp.cs
+++ b/source/WindowsFormsApplication1/Engine/Lua_Interp.cs
@@ -399,8 +399,8 @@ end");
mod.get_codepoints = new Func<int>(() => GetCP());
mod.buy_upgrade = new Func<string, bool>((id) => BuyUPG(id));
mod.time = new Func<string>(() => API.GetTime());
- mod.encrypt = new Func<string, string>((raw) => API.Encryption.Encrypt(raw));
- mod.decrypt = new Func<string, string>((raw) => API.Encryption.Decrypt(raw));
+ mod.encrypt = new Func<string, string>((raw) => API.Encryption.Encrypt_old(raw));
+ mod.decrypt = new Func<string, string>((raw) => API.Encryption.Decrypt_old(raw));
mod.fread = new Func<string, string>((filepath) => SafeFileRead(filepath));
mod.terminal = new Action<string>((command) =>
{