From 537ffafefd8a3276b51dbde07267a2c8bf398469 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Mon, 20 Sep 2010 00:16:30 +0200
Subject: [PATCH] Add unit test TestKeePass2Reader.

---
 src/format/KeePass2Reader.cpp |   1 +
 src/keys/PasswordKey.cpp      |   9 ++++++
 src/keys/PasswordKey.h        |   2 ++
 tests/CMakeLists.txt          |   3 ++
 tests/NonAscii.kdbx           | Bin 0 -> 2574 bytes
 tests/TestKeePass2Reader.cpp  |  55 ++++++++++++++++++++++++++++++++++
 6 files changed, 70 insertions(+)
 create mode 100644 tests/NonAscii.kdbx
 create mode 100644 tests/TestKeePass2Reader.cpp

diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp
index 23d99fb35..d38b433e7 100644
--- a/src/format/KeePass2Reader.cpp
+++ b/src/format/KeePass2Reader.cpp
@@ -74,6 +74,7 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke
 
     if (realStart != m_streamStartBytes) {
         raiseError("4");
+        return 0;
     }
 
     HashedBlockStream hashedStream(&cipherStream);
diff --git a/src/keys/PasswordKey.cpp b/src/keys/PasswordKey.cpp
index b48e9186a..ce216c216 100644
--- a/src/keys/PasswordKey.cpp
+++ b/src/keys/PasswordKey.cpp
@@ -19,6 +19,15 @@
 
 #include "crypto/CryptoHash.h"
 
+PasswordKey::PasswordKey()
+{
+}
+
+PasswordKey::PasswordKey(const QString& password)
+{
+    setPassword(password);
+}
+
 QByteArray PasswordKey::rawKey() const
 {
     return m_key;
diff --git a/src/keys/PasswordKey.h b/src/keys/PasswordKey.h
index 259f1c825..6d32d560e 100644
--- a/src/keys/PasswordKey.h
+++ b/src/keys/PasswordKey.h
@@ -25,6 +25,8 @@
 class PasswordKey : public Key
 {
 public:
+    PasswordKey();
+    PasswordKey(const QString& password);
     QByteArray rawKey() const;
     void setPassword(const QString& password);
     PasswordKey* clone() const;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cbcdaf38a..41b1e6476 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -71,6 +71,9 @@ target_link_libraries( testgroup keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_L
 add_unit_test( testkeepass2xmlreader TestKeePass2XmlReader.cpp )
 target_link_libraries( testkeepass2xmlreader keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} )
 
+add_unit_test( testkeepass2reader TestKeePass2Reader.cpp )
+target_link_libraries( testkeepass2reader keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} )
+
 add_unit_test( testgroupmodel TestGroupModel.cpp modeltest.cpp )
 target_link_libraries( testgroupmodel keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} )
 
diff --git a/tests/NonAscii.kdbx b/tests/NonAscii.kdbx
new file mode 100644
index 0000000000000000000000000000000000000000..d4e4ec547a9333194007156559cd3d9aafccf6ea
GIT binary patch
literal 2574
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

literal 0
HcmV?d00001

diff --git a/tests/TestKeePass2Reader.cpp b/tests/TestKeePass2Reader.cpp
new file mode 100644
index 000000000..840817826
--- /dev/null
+++ b/tests/TestKeePass2Reader.cpp
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QtTest/QTest>
+
+#include "config-keepassx-tests.h"
+#include "core/Database.h"
+#include "core/Metadata.h"
+#include "crypto/Crypto.h"
+#include "format/KeePass2Reader.h"
+#include "keys/PasswordKey.h"
+
+class TestKeePass2Reader : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase();
+    void testNonAscii();
+};
+
+void TestKeePass2Reader::initTestCase()
+{
+    Crypto::init();
+}
+
+void TestKeePass2Reader::testNonAscii()
+{
+    QString filename = QString(KEEPASSX_TEST_DIR).append("/NonAscii.kdbx");
+    CompositeKey key;
+    key.addKey(PasswordKey(QString::fromUtf8("\xce\x94\xc3\xb6\xd8\xb6")));
+    KeePass2Reader* reader = new KeePass2Reader();
+    Database* db = reader->readDatabase(filename, key);
+    QVERIFY(db);
+    QVERIFY(!reader->error());
+    QCOMPARE(db->metadata()->name(), QString("NonAsciiTest"));
+}
+
+QTEST_MAIN(TestKeePass2Reader);
+
+#include "TestKeePass2Reader.moc"