diff options
| author | Janek Bevendorff <janek@jbev.net> | 2018-01-11 02:20:37 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2018-01-13 22:25:00 +0300 |
| commit | 6df54cfe8d15891beddf70b0ca8e246103d6d8f9 (patch) | |
| tree | 20b9b514ee233941ff57fc6cae29718a16fc85ec /src/format/KeePass2.cpp | |
| parent | b04c8c2b6e45610a4c26874025668d9d2b91cf71 (diff) | |
Do not assert KDF UUID and improve error message
Diffstat (limited to 'src/format/KeePass2.cpp')
| -rw-r--r-- | src/format/KeePass2.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/format/KeePass2.cpp b/src/format/KeePass2.cpp index 9f0832fb0..d58e8bbfd 100644 --- a/src/format/KeePass2.cpp +++ b/src/format/KeePass2.cpp @@ -70,7 +70,7 @@ QByteArray KeePass2::hmacKey(QByteArray masterSeed, QByteArray transformedMaster * @param p variant map containing parameters * @return initialized KDF */ -QSharedPointer<Kdf> KeePass2::kdfFromParameters(const QVariantMap &p) +QSharedPointer<Kdf> KeePass2::kdfFromParameters(const QVariantMap& p) { QByteArray uuidBytes = p.value(KDFPARAM_UUID).toByteArray(); if (uuidBytes.size() != Uuid::Length) { @@ -111,7 +111,6 @@ QSharedPointer<Kdf> KeePass2::uuidToKdf(const Uuid& uuid) return QSharedPointer<Argon2Kdf>::create(); } - Q_ASSERT_X(false, "uuidToKdf", "Invalid UUID"); return {}; } |