Mirrors/KeyKeeper
1
0
Fork 0
mirror of https://github.com/KeyKeeperApp/KeyKeeper.git synced 2026-05-03 13:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

slightly refactor OuterEncryptionUtil.CheckOuterEncryptionHeader

Browse Source
This commit is contained in:
Slavasil
2025-11-25 00:41:22 +03:00
parent 6a7e1b2eae
commit a2f5ccf64b
1 changed files with 38 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/KeyKeeper/PasswordStore/Crypto/OuterEncryptionUtil.cs
View File

@@ -18,73 +18,53 @@ public static class OuterEncryptionUtil
public static void CheckOuterEncryptionHeader(FileStream f) public static void CheckOuterEncryptionHeader(FileStream f)
{ {
BinaryReader rd = new(f); BinaryReader rd = new(f);
byte masterSaltLen;
try try
{ {
masterSaltLen = rd.ReadByte(); byte masterSaltLen = rd.ReadByte();
}
catch (EndOfStreamException)
{
throw PassStoreFileException.UnexpectedEndOfFile;
}
if (masterSaltLen < MIN_MASTER_SALT_LEN || masterSaltLen > MAX_MASTER_SALT_LEN)
{
throw PassStoreFileException.InvalidCryptoHeader;
}
f.Seek(masterSaltLen, SeekOrigin.Current); if (masterSaltLen < MIN_MASTER_SALT_LEN || masterSaltLen > MAX_MASTER_SALT_LEN)
byte encryptAlgo;
try
{
encryptAlgo = rd.ReadByte();
}
catch (EndOfStreamException)
{
throw PassStoreFileException.UnexpectedEndOfFile;
}
if (encryptAlgo == ENCRYPT_ALGO_AES)
{
// пропустить 16 байт вектора инициализации AES
f.Seek(16, SeekOrigin.Current);
}
else
{
throw PassStoreFileException.InvalidCryptoHeader;
}
byte keyDerivationFunctionType;
try
{
keyDerivationFunctionType = rd.ReadByte();
}
catch (EndOfStreamException)
{
throw PassStoreFileException.UnexpectedEndOfFile;
}
if (keyDerivationFunctionType == KDF_TYPE_AESKDF)
{
int nRounds;
try
{
nRounds = rd.Read7BitEncodedInt();
}
catch (EndOfStreamException)
{
throw PassStoreFileException.UnexpectedEndOfFile;
}
catch (FormatException)
{ {
throw PassStoreFileException.InvalidCryptoHeader; throw PassStoreFileException.InvalidCryptoHeader;
} }
if (nRounds < MIN_AESKDF_ROUNDS || nRounds > MAX_AESKDF_ROUNDS)
f.Seek(masterSaltLen, SeekOrigin.Current);
byte encryptAlgo = rd.ReadByte();
if (encryptAlgo == ENCRYPT_ALGO_AES)
{
// пропустить 16 байт вектора инициализации AES
f.Seek(16, SeekOrigin.Current);
}
else
{ {
throw PassStoreFileException.InvalidCryptoHeader; throw PassStoreFileException.InvalidCryptoHeader;
} }
// пропустить 32 байта сида AES-KDF
f.Seek(32, SeekOrigin.Current); byte keyDerivationFunctionType = rd.ReadByte();
if (keyDerivationFunctionType == KDF_TYPE_AESKDF)
{
int nRounds;
try
{
nRounds = rd.Read7BitEncodedInt();
}
catch (FormatException)
{
throw PassStoreFileException.InvalidCryptoHeader;
}
if (nRounds < MIN_AESKDF_ROUNDS || nRounds > MAX_AESKDF_ROUNDS)
{
throw PassStoreFileException.InvalidCryptoHeader;
}
// пропустить 32 байта сида AES-KDF
f.Seek(32, SeekOrigin.Current);
}
}
catch (EndOfStreamException)
{
throw PassStoreFileException.UnexpectedEndOfFile;
} }
} }
} }