Mirrors/KeyKeeper
1
0
Fork 0
mirror of https://github.com/KeyKeeperApp/KeyKeeper.git synced 2026-04-17 18:16:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

make salt field optional in CompositeKey so it can be set later by the callee

Browse Source
This commit is contained in:
Slavasil
2025-12-02 19:20:46 +03:00
parent 4fbebbbf80
commit f8ddcddc6f
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/KeyKeeper/PasswordStore/Crypto/CompositeKey.cs
View File

@@ -7,22 +7,39 @@ namespace KeyKeeper.PasswordStore.Crypto;
public class CompositeKey
{
public string Password { get; }
public byte[] Salt { get; }
public byte[]? Salt
{
get { return salt; }
set
{
if (salt == null)
salt = value;
}
}
public CompositeKey(string password, byte[] salt)
private byte[]? salt;
public bool CanComputeHash
{
get { return salt != null; }
}
public CompositeKey(string password, byte[]? salt)
{
if (password == null)
throw new ArgumentNullException("password");
Password = password;
if (salt == null || salt.Length < FileFormatConstants.MIN_MASTER_SALT_LEN ||
salt.Length > FileFormatConstants.MAX_MASTER_SALT_LEN)
if (salt != null && (salt.Length < FileFormatConstants.MIN_MASTER_SALT_LEN ||
salt.Length > FileFormatConstants.MAX_MASTER_SALT_LEN))
throw new ArgumentException("salt");
Salt = salt;
this.salt = salt;
}
public byte[] Hash()
{
if (!CanComputeHash)
throw new InvalidOperationException("salt is not set");
byte[] passwordBytes = Encoding.UTF8.GetBytes(Password);
byte[] hashedString = new byte[passwordBytes.Length + Salt.Length * 2];
Salt.CopyTo(hashedString, 0);