Update MapleAESEncryption - fix depreciated AesManaged

lastbattle · Oct 16, 2024 · 84c773d · 84c773d
1 parent 6d49049
commit 84c773d
Showing 1 changed file with 66 additions and 65 deletions.
diff --git a/MapleLib/MapleCryptoLib/MapleAESEncryption.cs b/MapleLib/MapleCryptoLib/MapleAESEncryption.cs
@@ -21,73 +21,74 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 namespace MapleLib.MapleCryptoLib
 {
 
-	/// <summary>
-	/// Class to handle the AES Encryption routines
-	/// </summary>
-	public class MapleAESEncryption
-	{
+    /// <summary>
+    /// Class to handle the AES Encryption routines
+    /// </summary>
+    public class MapleAESEncryption
+    {
 
-		/// <summary>
-		/// Encrypt data using MapleStory's AES algorithm
-		/// </summary>
-		/// <param name="IV">IV to use for encryption</param>
-		/// <param name="data">Data to encrypt</param>
-		/// <param name="length">Length of data</param>
-		/// <returns>Crypted data</returns>
-		public static byte[] AesCrypt(byte[] IV, byte[] data, int length)
-		{
-			return AesCrypt(IV, data, length, MapleCryptoConstants.GetTrimmedUserKey(ref MapleCryptoConstants.UserKey_WzLib));
-		}
+        /// <summary>
+        /// Encrypt data using MapleStory's AES algorithm
+        /// </summary>
+        /// <param name="IV">IV to use for encryption</param>
+        /// <param name="data">Data to encrypt</param>
+        /// <param name="length">Length of data</param>
+        /// <returns>Crypted data</returns>
+        public static byte[] AesCrypt(byte[] IV, byte[] data, int length)
+        {
+            return AesCrypt(IV, data, length, MapleCryptoConstants.GetTrimmedUserKey(ref MapleCryptoConstants.UserKey_WzLib));
+        }
 
-		/// <summary>
-		/// Encrypt data using MapleStory's AES method
-		/// </summary>
-		/// <param name="IV">IV to use for encryption</param>
-		/// <param name="data">data to encrypt</param>
-		/// <param name="length">length of data</param>
-		/// <param name="key">the AES key to use</param>
-		/// <returns>Crypted data</returns>
-		public static byte[] AesCrypt(byte[] IV, byte[] data, int length, byte[] key)
-		{
-            AesManaged crypto = new AesManaged
+        /// <summary>
+        /// Encrypt data using MapleStory's AES method
+        /// </summary>
+        /// <param name="IV">IV to use for encryption</param>
+        /// <param name="data">data to encrypt</param>
+        /// <param name="length">length of data</param>
+        /// <param name="key">the AES key to use</param>
+        /// <returns>Crypted data</returns>
+        public static byte[] AesCrypt(byte[] IV, byte[] data, int length, byte[] key)
+        {
+            using (Aes aes = Aes.Create())
             {
-                KeySize = 256, //in bits
-                Key = key,
-                Mode = CipherMode.ECB // Should be OFB, but this works too
-            };
+                aes.KeySize = 256; // in bits
+                aes.Key = key;
+                aes.Mode = CipherMode.ECB; // Should be OFB, but this works too
 
-			using (MemoryStream memStream = new MemoryStream())
-			{
-				using (CryptoStream cryptoStream = new CryptoStream(memStream, crypto.CreateEncryptor(), CryptoStreamMode.Write))
-				{
-					int remaining = length;
-					int llength = 0x5B0;
-					int start = 0;
-					while (remaining > 0)
-					{
-						byte[] myIV = MapleCrypto.MultiplyBytes(IV, 4, 4);
-						if (remaining < llength)
-						{
-							llength = remaining;
-						}
-						for (int x = start; x < (start + llength); x++)
-						{
-							if ((x - start) % myIV.Length == 0)
-							{
-								cryptoStream.Write(myIV, 0, myIV.Length);
-								byte[] newIV = memStream.ToArray();
-								Array.Copy(newIV, myIV, myIV.Length);
-								memStream.Position = 0;
-							}
-							data[x] ^= myIV[(x - start) % myIV.Length];
-						}
-						start += llength;
-						remaining -= llength;
-						llength = 0x5B4;
-					}
-				}
-			}
-			return data;
-		}
-	}
+                using (MemoryStream memStream = new MemoryStream())
+                {
+                    using (ICryptoTransform encryptor = aes.CreateEncryptor())
+                    using (CryptoStream cryptoStream = new CryptoStream(memStream, encryptor, CryptoStreamMode.Write))
+                    {
+                        int remaining = length;
+                        int llength = 0x5B0;
+                        int start = 0;
+                        while (remaining > 0)
+                        {
+                            byte[] myIV = MapleCrypto.MultiplyBytes(IV, 4, 4);
+                            if (remaining < llength)
+                            {
+                                llength = remaining;
+                            }
+                            for (int x = start; x < (start + llength); x++)
+                            {
+                                if ((x - start) % myIV.Length == 0)
+                                {
+                                    cryptoStream.Write(myIV, 0, myIV.Length);
+                                    byte[] newIV = memStream.ToArray();
+                                    Array.Copy(newIV, myIV, myIV.Length);
+                                    memStream.Position = 0;
+                                }
+                                data[x] ^= myIV[(x - start) % myIV.Length];
+                            }
+                            start += llength;
+                            remaining -= llength;
+                            llength = 0x5B4;
+                        }
+                    }
+                }
+                return data;
+            }
+        }
+    }
 }