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

Use native Rfc2898DeriveBytes for Pbkdf2 instead of CryptSharp implementation

Browse Source 
I've verified it generates the same results
This commit is contained in:
Łukasz Domeradzki
2024-06-02 21:54:45 +02:00
parent 13755d4d06
commit 25aabe7553
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ArchiSteamFarm/Helpers/ArchiCryptoHelper.cs
View File

@@ -124,18 +124,12 @@ public static class ArchiCryptoHelper {
throw new InvalidEnumArgumentException(nameof(hashingMethod), (int) hashingMethod, typeof(EHashingMethod));
}
switch (hashingMethod) {
case EHashingMethod.PlainText:
return password;
case EHashingMethod.SCrypt:
return SCrypt.ComputeDerivedKey(password, salt, SteamParentalSCryptIterations, SteamParentalSCryptBlocksCount, 1, null, hashLength);
case EHashingMethod.Pbkdf2:
using (HMACSHA256 hashAlgorithm = new(password)) {
return Pbkdf2.ComputeDerivedKey(hashAlgorithm, salt, SteamParentalPbkdf2Iterations, hashLength);
}
default:
throw new InvalidOperationException(nameof(hashingMethod));
}
return hashingMethod switch {
EHashingMethod.PlainText => password,
EHashingMethod.SCrypt => SCrypt.ComputeDerivedKey(password, salt, SteamParentalSCryptIterations, SteamParentalSCryptBlocksCount, 1, null, hashLength),
EHashingMethod.Pbkdf2 => Rfc2898DeriveBytes.Pbkdf2(password, salt, SteamParentalPbkdf2Iterations, HashAlgorithmName.SHA256, hashLength),
_ => throw new InvalidOperationException(nameof(hashingMethod))
};
}
internal static bool HasTransformation(this ECryptoMethod cryptoMethod) =>