diff options
| author | Jonathan White <support@dmapps.us> | 2020-07-02 02:16:40 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2020-07-03 00:39:45 +0300 |
| commit | 3b459813ed19f9f7a4e79b237134a749151f13b2 (patch) | |
| tree | f4542b57d2bbcc2f9195ad276c49da7cc68f614b /tests | |
| parent | 60bb593228bbe46f829dcd1866472377eb48bfbe (diff) | |
Replace "Master Key" with "Database Credentials"
Definitions:
* Database Key - Cryptographic hash used to perform encrypt/decrypt of the database.
* Database Credentials - User facing term to refer to the collection of Password, Key File, and/or Hardware Key used to derive the Database Key.
Changes:
* Remove the term "master" and "key" from the user's lexicon and clarify the code base based on the definitions above.
* Clean up wording in the UI to be clearer to the end user.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/TestKeePass2Format.cpp | 6 | ||||
| -rw-r--r-- | tests/gui/TestGui.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/TestKeePass2Format.cpp b/tests/TestKeePass2Format.cpp index f58d0a885..b0217c942 100644 --- a/tests/TestKeePass2Format.cpp +++ b/tests/TestKeePass2Format.cpp @@ -87,9 +87,9 @@ void TestKeePass2Format::testXmlMetadata() QCOMPARE(m_xmlDb->metadata()->defaultUserNameChanged(), MockClock::datetimeUtc(2010, 8, 8, 17, 27, 45)); QCOMPARE(m_xmlDb->metadata()->maintenanceHistoryDays(), 127); QCOMPARE(m_xmlDb->metadata()->color(), QString("#FFEF00")); - QCOMPARE(m_xmlDb->metadata()->masterKeyChanged(), MockClock::datetimeUtc(2012, 4, 5, 17, 9, 34)); - QCOMPARE(m_xmlDb->metadata()->masterKeyChangeRec(), 101); - QCOMPARE(m_xmlDb->metadata()->masterKeyChangeForce(), -1); + QCOMPARE(m_xmlDb->metadata()->databaseKeyChanged(), MockClock::datetimeUtc(2012, 4, 5, 17, 9, 34)); + QCOMPARE(m_xmlDb->metadata()->databaseKeyChangeRec(), 101); + QCOMPARE(m_xmlDb->metadata()->databaseKeyChangeForce(), -1); QCOMPARE(m_xmlDb->metadata()->protectTitle(), false); QCOMPARE(m_xmlDb->metadata()->protectUsername(), true); QCOMPARE(m_xmlDb->metadata()->protectPassword(), false); diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp index e59540a02..70417dbd5 100644 --- a/tests/gui/TestGui.cpp +++ b/tests/gui/TestGui.cpp @@ -63,15 +63,15 @@ #include "gui/SearchWidget.h" #include "gui/TotpDialog.h" #include "gui/TotpSetupDialog.h" +#include "gui/databasekey/KeyComponentWidget.h" +#include "gui/databasekey/KeyFileEditWidget.h" +#include "gui/databasekey/PasswordEditWidget.h" #include "gui/dbsettings/DatabaseSettingsDialog.h" #include "gui/entry/EditEntryWidget.h" #include "gui/entry/EntryView.h" #include "gui/group/EditGroupWidget.h" #include "gui/group/GroupModel.h" #include "gui/group/GroupView.h" -#include "gui/masterkey/KeyComponentWidget.h" -#include "gui/masterkey/KeyFileEditWidget.h" -#include "gui/masterkey/PasswordEditWidget.h" #include "gui/wizard/NewDatabaseWizard.h" #include "keys/FileKey.h" #include "keys/PasswordKey.h" |