summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2020-11-23 16:58:31 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-11-23 19:33:22 +0000
commit26e5a3d413ef40804bf1fb4c9f35b46bd2c73f29 (patch)
treee4b16d9b759323a49480eaa41e0fa98a18105d0f
parentbb8522682d9ad5b13874f4cb469ec3daf358c48c (diff)
QPasswordDigestor - improve code coverage
By extending (a bit) an auto-test to cover paths found by LCOV. All of them is just to trigger the code that checks input parameters. Change-Id: I62f9a9045038ff8d123fd1396f4bfd85e75c6d8f Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 95cbce3e6e0d8a1e82260cfb5b78491a3906be86) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/auto/network/ssl/qpassworddigestor/tst_qpassworddigestor.cpp59
1 files changed, 59 insertions, 0 deletions
diff --git a/tests/auto/network/ssl/qpassworddigestor/tst_qpassworddigestor.cpp b/tests/auto/network/ssl/qpassworddigestor/tst_qpassworddigestor.cpp
index bbd6c72ca8..a9b99f3e58 100644
--- a/tests/auto/network/ssl/qpassworddigestor/tst_qpassworddigestor.cpp
+++ b/tests/auto/network/ssl/qpassworddigestor/tst_qpassworddigestor.cpp
@@ -28,18 +28,77 @@
#include <QtTest/QtTest>
#include <QtNetwork/qpassworddigestor.h>
+#include <QtCore/qcryptographichash.h>
#include <QtCore/QByteArray>
+#include <limits>
+
class tst_QPasswordDigestor : public QObject
{
Q_OBJECT
private Q_SLOTS:
+ void inputSanityChecks();
void pbkdf1Vectors_data();
void pbkdf1Vectors();
void pbkdf2Vectors_data();
void pbkdf2Vectors();
};
+void tst_QPasswordDigestor::inputSanityChecks()
+{
+ const QByteArray pass("password");
+ const QByteArray salt("saltsalt");
+#ifndef QT_CRYPTOGRAPHICHASH_ONLY_SHA1
+ //1. PBKDF1 supports only SHA1 and (if not disabled in Qt) MD5 algorithms.
+ QTest::ignoreMessage(QtWarningMsg, "The only supported algorithms for pbkdf1 are SHA-1 and MD5!");
+ auto derivedKey = QPasswordDigestor::deriveKeyPbkdf1(QCryptographicHash::Sha224, pass, salt, 2, 48);
+ QCOMPARE(derivedKey, QByteArray());
+#endif // QT_CRYPTOGRAPHICHASH_ONLY_SHA1
+
+ // 2. Salt size must be == 8:
+ QTest::ignoreMessage(QtWarningMsg, "The salt must be 8 bytes long!");
+ derivedKey = QPasswordDigestor::deriveKeyPbkdf1(QCryptographicHash::Sha1, pass, "salt", 2, 48);
+ QCOMPARE(derivedKey, QByteArray());
+
+ // 3. An illegal number of iterations (0):
+ derivedKey = QPasswordDigestor::deriveKeyPbkdf1(QCryptographicHash::Sha1, pass, salt, 0, 48);
+ QCOMPARE(derivedKey, QByteArray());
+
+ // 4. An illegal number of iterations (-10):
+ derivedKey = QPasswordDigestor::deriveKeyPbkdf1(QCryptographicHash::Sha1, pass, salt, -10, 48);
+ QCOMPARE(derivedKey, QByteArray());
+
+ // 5. An invalid key size (0):
+ derivedKey = QPasswordDigestor::deriveKeyPbkdf1(QCryptographicHash::Sha1,
+ "password", "saltsalt", 1, 0);
+ QCOMPARE(derivedKey, QByteArray());
+
+ // 6. Requested key is too large:
+ QTest::ignoreMessage(QtWarningMsg, "Derived key too long:\n"
+ " QCryptographicHash::Sha1 was chosen which"
+ " produces output of length 20 but 120 was requested.");
+ derivedKey = QPasswordDigestor::deriveKeyPbkdf1(QCryptographicHash::Sha1, pass, salt, 1,
+ quint64(QCryptographicHash::hashLength(QCryptographicHash::Sha1) + 100));
+ QCOMPARE(derivedKey, QByteArray());
+
+ // 7. Key size is too large, max is quint64(std::numeric_limits<quint32>::max() - 1) * hashLen
+ const auto invalidDkLen = quint64(QCryptographicHash::hashLength(QCryptographicHash::Sha1))
+ * (std::numeric_limits<quint32>::max() - 1) + 1;
+ QTest::ignoreMessage(QtWarningMsg, "Derived key too long:\n"
+ "QCryptographicHash::Sha1 was chosen which produces output"
+ " of length 85899345880 but 85899345881 was requested.");
+ derivedKey = QPasswordDigestor::deriveKeyPbkdf2(QCryptographicHash::Sha1, pass, salt, 1, invalidDkLen);
+ QCOMPARE(derivedKey, QByteArray());
+
+ // 8. Invalid number of iterations.
+ derivedKey = QPasswordDigestor::deriveKeyPbkdf2(QCryptographicHash::Sha1, pass, salt, 0, 100);
+ QCOMPARE(derivedKey, QByteArray());
+
+ // 9. Invalid (negative) number of iterations.
+ derivedKey = QPasswordDigestor::deriveKeyPbkdf2(QCryptographicHash::Sha1, pass, salt, -100, 100);
+ QCOMPARE(derivedKey, QByteArray());
+}
+
void tst_QPasswordDigestor::pbkdf1Vectors_data()
{
QTest::addColumn<QCryptographicHash::Algorithm>("algorithm");