From 2c9d015f3846fda7b022a249f8c107c736b3669c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Domeradzki?= <JustArchi@JustArchi.net>
Date: Wed, 7 Aug 2024 03:02:04 +0200
Subject: [PATCH] Fix @xPaw breaking changes

How could you!
---
 ArchiSteamFarm.Tests/ArchiCryptoHelper.cs   | 55 +++++++++++++++++++++
 ArchiSteamFarm/Helpers/ArchiCryptoHelper.cs | 19 +++++--
 2 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 ArchiSteamFarm.Tests/ArchiCryptoHelper.cs

diff --git a/ArchiSteamFarm.Tests/ArchiCryptoHelper.cs b/ArchiSteamFarm.Tests/ArchiCryptoHelper.cs
new file mode 100644
index 000000000..07263d878
--- /dev/null
+++ b/ArchiSteamFarm.Tests/ArchiCryptoHelper.cs
@@ -0,0 +1,55 @@
+// ----------------------------------------------------------------------------------------------
+//     _                _      _  ____   _                           _____
+//    / \    _ __  ___ | |__  (_)/ ___| | |_  ___   __ _  _ __ ___  |  ___|__ _  _ __  _ __ ___
+//   / _ \  | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_  / _` || '__|| '_ ` _ \
+//  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
+// /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
+// ----------------------------------------------------------------------------------------------
+// |
+// Copyright 2015-2024 Łukasz "JustArchi" Domeradzki
+// Contact: JustArchi@JustArchi.net
+// |
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// |
+// http://www.apache.org/licenses/LICENSE-2.0
+// |
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using static ArchiSteamFarm.Helpers.ArchiCryptoHelper;
+
+namespace ArchiSteamFarm.Tests;
+
+#pragma warning disable CA1812 // False positive, the class is used during MSTest
+[TestClass]
+internal sealed class ArchiCryptoHelper {
+	private const string TestPassword = "a2o41PuPdZNDLw9AT6dZt5pLVC23MN9O7NfKI4a0MWJgWWIAVGt3naYiIA0BhPel";
+
+	[DataRow(ECryptoMethod.PlainText)]
+	[DataRow(ECryptoMethod.AES)]
+	[DataTestMethod]
+	internal async Task CanEncryptDecrypt(ECryptoMethod cryptoMethod) {
+		if (!Enum.IsDefined(cryptoMethod)) {
+			throw new InvalidEnumArgumentException(nameof(cryptoMethod), (int) cryptoMethod, typeof(ECryptoMethod));
+		}
+
+		string? encrypted = Encrypt(cryptoMethod, TestPassword);
+
+		Assert.IsNotNull(encrypted);
+
+		string? decrypted = await Decrypt(cryptoMethod, encrypted).ConfigureAwait(false);
+
+		Assert.IsNotNull(decrypted);
+		Assert.AreEqual(TestPassword, decrypted);
+	}
+}
+#pragma warning restore CA1812 // False positive, the class is used during MSTest
diff --git a/ArchiSteamFarm/Helpers/ArchiCryptoHelper.cs b/ArchiSteamFarm/Helpers/ArchiCryptoHelper.cs
index ae86e29d5..04c6ed023 100644
--- a/ArchiSteamFarm/Helpers/ArchiCryptoHelper.cs
+++ b/ArchiSteamFarm/Helpers/ArchiCryptoHelper.cs
@@ -241,11 +241,24 @@ public static class ArchiCryptoHelper {
 
 		try {
 			byte[] key = SHA256.HashData(EncryptionKey);
-
 			byte[] encryptedData = Encoding.UTF8.GetBytes(text);
-			encryptedData = CryptoHelper.SymmetricEncrypt(encryptedData, key);
+			byte[] iv = RandomNumberGenerator.GetBytes(16);
 
-			return Convert.ToBase64String(encryptedData);
+			using Aes aes = Aes.Create();
+
+			aes.BlockSize = 128;
+			aes.KeySize = 256;
+			aes.Key = key;
+
+			byte[] cryptedIv = aes.EncryptEcb(iv, PaddingMode.None);
+			byte[] cipherText = aes.EncryptCbc(encryptedData, iv);
+
+			byte[] output = new byte[cryptedIv.Length + cipherText.Length];
+
+			Array.Copy(cryptedIv, 0, output, 0, cryptedIv.Length);
+			Array.Copy(cipherText, 0, output, cryptedIv.Length, cipherText.Length);
+
+			return Convert.ToBase64String(output);
 		} catch (Exception e) {
 			ASF.ArchiLogger.LogGenericException(e);