From c6f83b9ca6a6368c33b3fb315ded32c3423a0f2d Mon Sep 17 00:00:00 2001
From: rockihack <rocki.hack@gmail.com>
Date: Fri, 13 Oct 2017 12:31:57 +0200
Subject: [PATCH] Fix: Regenerate transform seed and transform master key on
 save.

---
 src/core/Database.cpp         | 19 +++++++++++++++++++
 src/core/Database.h           |  1 +
 src/format/KeePass2Writer.cpp |  8 +++++++-
 src/format/KeePass2Writer.h   |  4 ++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index d3f87a7b47..864dd758ee 100644
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -257,6 +257,25 @@ bool Database::hasKey() const
     return m_data.hasKey;
 }
 
+bool Database::transformKeyWithSeed(const QByteArray& transformSeed)
+{
+    Q_ASSERT(hasKey());
+
+    bool ok;
+    QString errorString;
+
+    QByteArray transformedMasterKey =
+            m_data.key.transform(transformSeed, transformRounds(), &ok, &errorString);
+    if (!ok) {
+        return false;
+    }
+
+    m_data.transformSeed = transformSeed;
+    m_data.transformedMasterKey = transformedMasterKey;
+
+    return true;
+}
+
 bool Database::verifyKey(const CompositeKey& key) const
 {
     Q_ASSERT(hasKey());
diff --git a/src/core/Database.h b/src/core/Database.h
index a799e0b3bf..b08233e57b 100644
--- a/src/core/Database.h
+++ b/src/core/Database.h
@@ -106,6 +106,7 @@ class Database : public QObject
      */
     bool setKey(const CompositeKey& key);
     bool hasKey() const;
+    bool transformKeyWithSeed(const QByteArray& transformSeed);
     bool verifyKey(const CompositeKey& key) const;
     void recycleEntry(Entry* entry);
     void recycleGroup(Group* group);
diff --git a/src/format/KeePass2Writer.cpp b/src/format/KeePass2Writer.cpp
index d63151c844..f8f60f11e6 100644
--- a/src/format/KeePass2Writer.cpp
+++ b/src/format/KeePass2Writer.cpp
@@ -45,6 +45,7 @@ void KeePass2Writer::writeDatabase(QIODevice* device, Database* db)
     m_error = false;
     m_errorStr.clear();
 
+    QByteArray transformSeed = randomGen()->randomArray(32);
     QByteArray masterSeed = randomGen()->randomArray(32);
     QByteArray encryptionIV = randomGen()->randomArray(16);
     QByteArray protectedStreamKey = randomGen()->randomArray(32);
@@ -52,7 +53,12 @@ void KeePass2Writer::writeDatabase(QIODevice* device, Database* db)
     QByteArray endOfHeader = "\r\n\r\n";
 
     if (db->challengeMasterSeed(masterSeed) == false) {
-        raiseError("Unable to issue challenge-response.");
+        raiseError(tr("Unable to issue challenge-response."));
+        return;
+    }
+
+    if (!db->transformKeyWithSeed(transformSeed)) {
+        raiseError(tr("Unable to calculate master key"));
         return;
     }
 
diff --git a/src/format/KeePass2Writer.h b/src/format/KeePass2Writer.h
index 1b3436dc69..184aa1a71e 100644
--- a/src/format/KeePass2Writer.h
+++ b/src/format/KeePass2Writer.h
@@ -18,6 +18,8 @@
 #ifndef KEEPASSX_KEEPASS2WRITER_H
 #define KEEPASSX_KEEPASS2WRITER_H
 
+#include <QCoreApplication>
+
 #include "format/KeePass2.h"
 #include "keys/CompositeKey.h"
 
@@ -26,6 +28,8 @@ class QIODevice;
 
 class KeePass2Writer
 {
+    Q_DECLARE_TR_FUNCTIONS(KeePass2Writer)
+
 public:
     KeePass2Writer();
     void writeDatabase(QIODevice* device, Database* db);