Add Argon2Kdf and enable parameters in db settings

Note: This implementation is not yet connected to the
database itself and will corrupt existing kdbx3 db's.

* Implemented memory and parallelism parameters for Argon2Kdf
* Using libargon2; libsodium does not support Argon2d algorithm
* Moved basic rounds parameter into Kdf class
* Reimplemented benchmark algorithm; previous was utterly broken

1 files changed, 37 insertions, 2 deletions

diff --git a/src/crypto/kdf/Kdf.cpp b/src/crypto/kdf/Kdf.cpp
index cfc3025c1..5134adc5f 100644
--- a/src/crypto/kdf/Kdf.cpp
+++ b/src/crypto/kdf/Kdf.cpp
@@ -20,8 +20,12 @@
 
 #include <QtConcurrent>
 
+#include "crypto/Random.h"
+
 Kdf::Kdf(Uuid uuid)
-    : m_uuid(uuid)
+    : m_rounds(KDF_DEFAULT_ROUNDS)
+    , m_seed(QByteArray(KDF_DEFAULT_SEED_SIZE, 0))
+    , m_uuid(uuid)
 {
 }
 
@@ -30,6 +34,37 @@ Uuid Kdf::uuid() const
     return m_uuid;
 }
 
+int Kdf::rounds() const
+{
+    return m_rounds;
+}
+
+QByteArray Kdf::seed() const
+{
+    return m_seed;
+}
+
+bool Kdf::setRounds(int rounds)
+{
+    m_rounds = rounds;
+    return true;
+}
+
+bool Kdf::setSeed(const QByteArray& seed)
+{
+    if (seed.size() != m_seed.size()) {
+        return false;
+    }
+
+    m_seed = seed;
+    return true;
+}
+
+void Kdf::randomizeSeed()
+{
+    setSeed(randomGen()->randomArray(m_seed.size()));
+}
+
 int Kdf::benchmark(int msec) const
 {
     BenchmarkThread thread1(msec, this);
@@ -41,7 +76,7 @@ int Kdf::benchmark(int msec) const
     thread1.wait();
     thread2.wait();
 
-    return qMin(thread1.rounds(), thread2.rounds());
+    return qMax(1, qMin(thread1.rounds(), thread2.rounds()));
 }
 
 Kdf::BenchmarkThread::BenchmarkThread(int msec, const Kdf* kdf)