diff options
| author | Janek Bevendorff <janek@jbev.net> | 2017-01-15 04:20:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-15 04:20:21 +0300 |
| commit | e17576a6f71c1ff3671f01be72b93ff6f7c8861a (patch) | |
| tree | 941ef6d78f04890998b69803c28e083a8c174c24 /src/keys/CompositeKey.h | |
| parent | f33cd1541941a088b90f463d457f4a9f86aa712a (diff) | |
| parent | 9dadafe20a2a9c7878b4505c1aa4097c87b955f4 (diff) | |
Merge branch 'develop' into feature/yubikey
Diffstat (limited to 'src/keys/CompositeKey.h')
| -rw-r--r-- | src/keys/CompositeKey.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/keys/CompositeKey.h b/src/keys/CompositeKey.h index b5f973d20..531c2d9b2 100644 --- a/src/keys/CompositeKey.h +++ b/src/keys/CompositeKey.h @@ -19,6 +19,7 @@ #define KEEPASSX_COMPOSITEKEY_H #include <QList> +#include <QString> #include "keys/Key.h" #include "keys/ChallengeResponseKey.h" @@ -43,6 +44,7 @@ public: void addChallengeResponseKey(const ChallengeResponseKey& key); static int transformKeyBenchmark(int msec); + static CompositeKey readFromLine(QString line); private: static QByteArray transformKeyRaw(const QByteArray& key, const QByteArray& seed, |