Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 22:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add --cryptkey, #267

Browse Source
This commit is contained in:
JustArchi
2016-06-28 09:24:32 +02:00
parent 5f0ce543ae
commit 4a5bff1b84
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ArchiSteamFarm/CryptoHelper.cs
View File

@@ -34,7 +34,16 @@ namespace ArchiSteamFarm {
ProtectedDataForCurrentUser
}
private static readonly byte[] EncryptionKey = Encoding.UTF8.GetBytes("ArchiSteamFarm");
private static byte[] EncryptionKey = Encoding.UTF8.GetBytes("ArchiSteamFarm");
internal static void SetEncryptionKey(string key) {
if (string.IsNullOrEmpty(key)) {
Logging.LogNullError(nameof(key));
return;
}
EncryptionKey = Encoding.UTF8.GetBytes(key);
}
internal static string Encrypt(ECryptoMethod cryptoMethod, string decrypted) {
if (string.IsNullOrEmpty(decrypted)) {
@@ -84,9 +93,9 @@ namespace ArchiSteamFarm {
key = sha256.ComputeHash(EncryptionKey);
}
byte[] data = Encoding.UTF8.GetBytes(decrypted);
byte[] encrypted = SteamKit2.CryptoHelper.SymmetricEncrypt(data, key);
return Convert.ToBase64String(encrypted);
byte[] encryptedData = Encoding.UTF8.GetBytes(decrypted);
encryptedData = SteamKit2.CryptoHelper.SymmetricEncrypt(encryptedData, key);
return Convert.ToBase64String(encryptedData);
} catch (Exception e) {
Logging.LogGenericException(e);
return null;
@@ -105,9 +114,9 @@ namespace ArchiSteamFarm {
key = sha256.ComputeHash(EncryptionKey);
}
byte[] data = Convert.FromBase64String(encrypted);
byte[] decrypted = SteamKit2.CryptoHelper.SymmetricDecrypt(data, key);
return Encoding.UTF8.GetString(decrypted);
byte[] decryptedData = Convert.FromBase64String(encrypted);
decryptedData = SteamKit2.CryptoHelper.SymmetricDecrypt(decryptedData, key);
return Encoding.UTF8.GetString(decryptedData);
} catch (Exception e) {
Logging.LogGenericException(e);
return null;

13
ArchiSteamFarm/Program.cs
View File

@@ -406,13 +406,20 @@ namespace ArchiSteamFarm {
break;
default:
if (arg.StartsWith("--", StringComparison.Ordinal)) {
Logging.LogGenericWarning("Unrecognized parameter: " + arg);
continue;
if (arg.StartsWith("--cryptkey=", StringComparison.Ordinal)) {
if (arg.Length > 11) {
CryptoHelper.SetEncryptionKey(arg.Substring(11));
}
} else {
Logging.LogGenericWarning("Unrecognized parameter: " + arg);
}
break;
}
if (Mode != EMode.Client) {
Logging.LogGenericWarning("Ignoring command because --client wasn't specified: " + arg);
continue;
break;
}
Logging.LogGenericInfo("Command sent: " + arg);