Add unit test TestKeePass2Reader.

3 files changed, 12 insertions, 0 deletions

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;