warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Cleanup

Browse source
This commit is contained in:
Kamron Batman 2026-08-09 00:10:56 -07:00
parent 8605ddf713
commit 42e50419d4
No known key found for this signature in database
GPG key ID: 7D81DF26D9A5D94A
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Projects/UOContent/Accounting/Security/PBKDF2PasswordProtection.cs
View file

@ -22,24 +22,24 @@ namespace Server.Accounting.Security;
public class PBKDF2PasswordProtection : IPasswordProtection
{
private const ushort m_MinIterations = 1024;
private const ushort m_MaxIterations = 1536;
private const int m_SaltSize = 8;
private const int m_HashSize = 32;
private const int m_OutputSize = 2 + m_SaltSize + m_HashSize;
private const ushort MinIterations = 1024;
private const ushort MaxIterations = 1536;
private const int SaltSize = 8;
private const int HashSize = 32;
private const int OutputSize = 2 + SaltSize + HashSize;
public static readonly IPasswordProtection Instance = new PBKDF2PasswordProtection();
public string EncryptPassword(string plainPassword)
{
Span<byte> output = stackalloc byte[m_OutputSize];
Span<byte> output = stackalloc byte[OutputSize];
var iterations = RandomNumberGenerator.GetInt32(m_MinIterations, m_MaxIterations + 1);
var iterations = RandomNumberGenerator.GetInt32(MinIterations, MaxIterations + 1);
BinaryPrimitives.WriteUInt16LittleEndian(output[..2], (ushort)iterations);
var salt = output.Slice(2, m_SaltSize);
var salt = output.Slice(2, SaltSize);
RandomNumberGenerator.Fill(salt);
var hash = output.Slice(2 + m_SaltSize, m_HashSize);
var hash = output.Slice(2 + SaltSize, HashSize);
Rfc2898DeriveBytes.Pbkdf2(plainPassword, salt, hash, iterations, HashAlgorithmName.SHA256);
return output.ToHexString();
@ -47,15 +47,15 @@ public class PBKDF2PasswordProtection : IPasswordProtection
public bool ValidatePassword(string encryptedPassword, string plainPassword)
{
Span<byte> encryptedBytes = stackalloc byte[m_OutputSize];
Span<byte> encryptedBytes = stackalloc byte[OutputSize];
encryptedPassword.GetBytes(encryptedBytes);
var iterations = BinaryPrimitives.ReadUInt16LittleEndian(encryptedBytes[..2]);
var salt = encryptedBytes.Slice(2, m_SaltSize);
var salt = encryptedBytes.Slice(2, SaltSize);
Span<byte> hash = stackalloc byte[m_HashSize];
Span<byte> hash = stackalloc byte[HashSize];
Rfc2898DeriveBytes.Pbkdf2(plainPassword, salt, hash, iterations, HashAlgorithmName.SHA256);
return hash.SequenceEqual(encryptedBytes[(m_SaltSize + 2)..]);
return hash.SequenceEqual(encryptedBytes[(SaltSize + 2)..]);
}
}

2
Projects/UOContent/Accounting/Security/PasswordWorker.cs
View file

@ -2,7 +2,7 @@
* ModernUO *
* Copyright 2019-2026 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: PasswordWorker.cs *
* File: PasswordWorker.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *