jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace "Master Key" with "Database Credentials"

Browse Source 
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.
This commit is contained in:
Jonathan White
2020-07-01 19:16:40 -04:00
parent 60bb593228
commit 3b459813ed
45 changed files with 162 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/format/Kdbx3Writer.cpp
View File

@@ -47,16 +47,16 @@ bool Kdbx3Writer::writeDatabase(QIODevice* device, Database* db)
}
if (!db->setKey(db->key(), false, true)) {
raiseError(tr("Unable to calculate master key"));
raiseError(tr("Unable to calculate database key"));
return false;
}
// generate transformed master key
// generate transformed database key
CryptoHash hash(CryptoHash::Sha256);
hash.addData(masterSeed);
hash.addData(db->challengeResponseKey());
Q_ASSERT(!db->transformedMasterKey().isEmpty());
hash.addData(db->transformedMasterKey());
Q_ASSERT(!db->transformedDatabaseKey().isEmpty());
hash.addData(db->transformedDatabaseKey());
QByteArray finalKey = hash.result();
// write header