diff options
| author | Janek Bevendorff <janek@jbev.net> | 2017-01-14 23:26:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-14 23:26:23 +0300 |
| commit | 9dadafe20a2a9c7878b4505c1aa4097c87b955f4 (patch) | |
| tree | 30fffe447d0921c669b810a1019b0b78dcda4882 /src/keys/CompositeKey.h | |
| parent | b4b47ec8fdba4f5b0c9490737b6077b5cf86214e (diff) | |
| parent | 6fd7427cae596befb4668184fbdb18d39e71a68f (diff) | |
Merge pull request #160 from louib/feature/updateKdbxExtract
Fixes #156 : update kdbx-extract
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 3290d3671..f8666aadc 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" @@ -39,6 +40,7 @@ public: void addKey(const Key& key); static int transformKeyBenchmark(int msec); + static CompositeKey readFromLine(QString line); private: static QByteArray transformKeyRaw(const QByteArray& key, const QByteArray& seed, |