Merge branch 'master' into develop

2019-03-19 19:01:31 -04:00
parent 0f1be60bda c51752df39
commit 31bd90a8df
99 changed files with 4428 additions and 3872 deletions
--- a/src/core/Database.h
+++ b/src/core/Database.h
@@ -109,7 +109,8 @@ public:
    QSharedPointer<const CompositeKey> key() const;
    bool setKey(const QSharedPointer<const CompositeKey>& key,
                bool updateChangedTime = true,
-                bool updateTransformSalt = false);
+                bool updateTransformSalt = false,
+                bool transformKey = true);
    QByteArray challengeResponseKey() const;
    bool challengeMasterSeed(const QByteArray& masterSeed);
    bool verifyKey(const QSharedPointer<CompositeKey>& key) const;