mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge 6b36b33c29 into af2479da8d

Browse source
This commit is contained in:
Jonathan White 2025-03-30 23:52:53 +02:00 • committed by GitHub
commit 1f8408eb13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/crypto/kdf/Argon2Kdf.cpp
View file

@ -33,11 +33,11 @@
*/ */
Argon2Kdf::Argon2Kdf(Type type) Argon2Kdf::Argon2Kdf(Type type)
: Kdf::Kdf(type == Type::Argon2d ? KeePass2::KDF_ARGON2D : KeePass2::KDF_ARGON2ID) : Kdf::Kdf(type == Type::Argon2d ? KeePass2::KDF_ARGON2D : KeePass2::KDF_ARGON2ID)
, m_version(0x13) , m_version(ARGON2_DEFAULT_VERSION)
, m_memory(1 << 16) , m_memory(ARGON2_DEFAULT_MEMORY)
, m_parallelism(static_cast<quint32>(QThread::idealThreadCount())) , m_parallelism(ARGON2_DEFAULT_PARALLELISM)
{ {
m_rounds = 10; m_rounds = ARGON2_DEFAULT_ROUNDS;
} }
quint32 Argon2Kdf::version() const quint32 Argon2Kdf::version() const
@ -52,7 +52,7 @@ bool Argon2Kdf::setVersion(quint32 version)
m_version = version; m_version = version;
return true; return true;
} }
m_version = 0x13; m_version = ARGON2_DEFAULT_VERSION;
return false; return false;
} }
@ -73,7 +73,7 @@ bool Argon2Kdf::setMemory(quint64 kibibytes)
m_memory = kibibytes; m_memory = kibibytes;
return true; return true;
} }
m_memory = 16; m_memory = ARGON2_DEFAULT_MEMORY;
return false; return false;
} }
@ -89,7 +89,7 @@ bool Argon2Kdf::setParallelism(quint32 threads)
m_parallelism = threads; m_parallelism = threads;
return true; return true;
} }
m_parallelism = 1; m_parallelism = ARGON2_DEFAULT_PARALLELISM;
return false; return false;
} }

14
src/crypto/kdf/Argon2Kdf.h
View file

@ -20,6 +20,11 @@
#include "Kdf.h" #include "Kdf.h"
constexpr auto ARGON2_DEFAULT_VERSION = 0x13;
constexpr auto ARGON2_DEFAULT_ROUNDS = 10;
constexpr auto ARGON2_DEFAULT_MEMORY = 1 << 16;
constexpr auto ARGON2_DEFAULT_PARALLELISM = 2;
class Argon2Kdf : public Kdf class Argon2Kdf : public Kdf
{ {
public: public:
@ -47,6 +52,15 @@ public:
int benchmark(int msec) const override; int benchmark(int msec) const override;
static quint64 toMebibytes(quint64 kibibytes)
{
return kibibytes >> 10;
}
static quint64 toKibibytes(quint64 mebibits)
{
return mebibits << 10;
}
quint32 m_version; quint32 m_version;
quint64 m_memory; quint64 m_memory;
quint32 m_parallelism; quint32 m_parallelism;

17
src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp
View file

@ -159,12 +159,7 @@ void DatabaseSettingsWidgetEncryption::initialize()
// Set up KDF algorithms // Set up KDF algorithms
loadKdfAlgorithms(); loadKdfAlgorithms();
// Perform Benchmark if requested
if (isNewDatabase) { if (isNewDatabase) {
if (IS_ARGON2(m_ui->kdfComboBox->currentData())) {
m_ui->memorySpinBox->setValue(16);
m_ui->parallelismSpinBox->setValue(2);
}
benchmarkTransformRounds(); benchmarkTransformRounds();
} }
@ -225,7 +220,7 @@ void DatabaseSettingsWidgetEncryption::loadKdfParameters()
// Set Argon2 parameters // Set Argon2 parameters
auto argon2Kdf = kdf.staticCast<Argon2Kdf>(); auto argon2Kdf = kdf.staticCast<Argon2Kdf>();
m_ui->transformRoundsSpinBox->setValue(argon2Kdf->rounds()); m_ui->transformRoundsSpinBox->setValue(argon2Kdf->rounds());
m_ui->memorySpinBox->setValue(static_cast<int>(argon2Kdf->memory()) / (1 << 10)); m_ui->memorySpinBox->setValue(Argon2Kdf::toMebibytes(argon2Kdf->memory()));
m_ui->parallelismSpinBox->setValue(argon2Kdf->parallelism()); m_ui->parallelismSpinBox->setValue(argon2Kdf->parallelism());
} else if (!dbIsArgon2 && !kdfIsArgon2) { } else if (!dbIsArgon2 && !kdfIsArgon2) {
// Set AES KDF parameters // Set AES KDF parameters
@ -233,8 +228,8 @@ void DatabaseSettingsWidgetEncryption::loadKdfParameters()
} else { } else {
// Set reasonable defaults and then benchmark // Set reasonable defaults and then benchmark
if (kdfIsArgon2) { if (kdfIsArgon2) {
m_ui->memorySpinBox->setValue(16); m_ui->memorySpinBox->setValue(Argon2Kdf::toMebibytes(ARGON2_DEFAULT_MEMORY));
m_ui->parallelismSpinBox->setValue(2); m_ui->parallelismSpinBox->setValue(ARGON2_DEFAULT_PARALLELISM);
} }
benchmarkTransformRounds(); benchmarkTransformRounds();
} }
@ -343,7 +338,7 @@ bool DatabaseSettingsWidgetEncryption::saveSettings()
kdf->setRounds(m_ui->transformRoundsSpinBox->value()); kdf->setRounds(m_ui->transformRoundsSpinBox->value());
if (IS_ARGON2(kdf->uuid())) { if (IS_ARGON2(kdf->uuid())) {
auto argon2Kdf = kdf.staticCast<Argon2Kdf>(); auto argon2Kdf = kdf.staticCast<Argon2Kdf>();
argon2Kdf->setMemory(static_cast<quint64>(m_ui->memorySpinBox->value()) * (1 << 10)); argon2Kdf->setMemory(Argon2Kdf::toKibibytes(m_ui->memorySpinBox->value()));
argon2Kdf->setParallelism(static_cast<quint32>(m_ui->parallelismSpinBox->value())); argon2Kdf->setParallelism(static_cast<quint32>(m_ui->parallelismSpinBox->value()));
} }
@ -377,8 +372,8 @@ void DatabaseSettingsWidgetEncryption::benchmarkTransformRounds(int millisecs)
auto argon2Kdf = kdf.staticCast<Argon2Kdf>(); auto argon2Kdf = kdf.staticCast<Argon2Kdf>();
// Set a small static number of rounds for the benchmark // Set a small static number of rounds for the benchmark
argon2Kdf->setRounds(4); argon2Kdf->setRounds(4);
if (!argon2Kdf->setMemory(static_cast<quint64>(m_ui->memorySpinBox->value()) * (1 << 10))) { if (!argon2Kdf->setMemory(Argon2Kdf::toKibibytes(m_ui->memorySpinBox->value()))) {
m_ui->memorySpinBox->setValue(static_cast<int>(argon2Kdf->memory() / (1 << 10))); m_ui->memorySpinBox->setValue(Argon2Kdf::toMebibytes(argon2Kdf->memory()));
} }
if (!argon2Kdf->setParallelism(static_cast<quint32>(m_ui->parallelismSpinBox->value()))) { if (!argon2Kdf->setParallelism(static_cast<quint32>(m_ui->parallelismSpinBox->value()))) {
m_ui->parallelismSpinBox->setValue(argon2Kdf->parallelism()); m_ui->parallelismSpinBox->setValue(argon2Kdf->parallelism());