Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-22 04:49:42 -04:00
Code Issues Projects Releases Packages 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
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() void ChangeMasterKeyWidget::generateKey()
{ {
m_key.clear(); bool cleared = false;
if (m_ui->passwordGroup->isChecked()) { if (m_ui->passwordGroup->isChecked()) {
if (m_ui->enterPasswordEdit->text() == m_ui->repeatPasswordEdit->text()) { if (m_ui->enterPasswordEdit->text() == m_ui->repeatPasswordEdit->text()) {
@ -107,6 +107,8 @@ void ChangeMasterKeyWidget::generateKey()
return; return;
} }
} }
m_key.clear();
cleared = true;
m_key.addKey(PasswordKey(m_ui->enterPasswordEdit->text())); m_key.addKey(PasswordKey(m_ui->enterPasswordEdit->text()));
} }
else { else {
@ -120,8 +122,12 @@ void ChangeMasterKeyWidget::generateKey()
FileKey fileKey; FileKey fileKey;
QString errorMsg; QString errorMsg;
if (!fileKey.load(m_ui->keyFileCombo->currentText(), &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); m_key.addKey(fileKey);
} }