Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-20 08:05:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug #218

Browse Source 
Do not accept faulty files as Key File. Moreover, do not clear keys
unless we have a key to add.
This commit is contained in:
Amir Pakdel 2015-05-12 15:12:17 -04:00
parent a7f4e2d0cd
commit 58061af959
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/ChangeMasterKeyWidget.cpp
View File

@ -96,7 +96,7 @@ QLabel* ChangeMasterKeyWidget::headlineLabel()
void ChangeMasterKeyWidget::generateKey()
{
m_key.clear();
bool cleared = false;
if (m_ui->passwordGroup->isChecked()) {
if (m_ui->enterPasswordEdit->text() == m_ui->repeatPasswordEdit->text()) {
@ -107,6 +107,8 @@ void ChangeMasterKeyWidget::generateKey()
return;
}
}
m_key.clear();
cleared = true;
m_key.addKey(PasswordKey(m_ui->enterPasswordEdit->text()));
}
else {
@ -120,8 +122,12 @@ void ChangeMasterKeyWidget::generateKey()
FileKey fileKey;
QString errorMsg;
if (!fileKey.load(m_ui->keyFileCombo->currentText(), &errorMsg)) {
// TODO: error handling
MessageBox::critical(this, tr("Failed to set key file"),
tr("Failed to set %1 as the Key file:\n%2")
.arg(m_ui->keyFileCombo->currentText(), errorMsg));
return;
}
if (!cleared) m_key.clear();
m_key.addKey(fileKey);
}