mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 13:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

OpenSSHKey: when writing to agent, ensure comment string is at least one byte

Browse source 
This unbreaks adding keys to gpg-agent.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
This commit is contained in:
Steven Noonan 2018-03-07 20:43:26 -08:00 • committed by Jonathan White
parent d156457405
commit dc1aead2a2
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/gui/entry/EditEntryWidget.cpp
View file

@ -420,12 +420,16 @@ void EditEntryWidget::browsePrivateKey()
bool EditEntryWidget::getOpenSSHKey(OpenSSHKey& key, bool decrypt) bool EditEntryWidget::getOpenSSHKey(OpenSSHKey& key, bool decrypt)
{ {
QString fileName;
QByteArray privateKeyData; QByteArray privateKeyData;
if (m_sshAgentUi->attachmentRadioButton->isChecked()) { if (m_sshAgentUi->attachmentRadioButton->isChecked()) {
privateKeyData = m_advancedUi->attachmentsWidget->getAttachment(m_sshAgentUi->attachmentComboBox->currentText()); fileName = m_sshAgentUi->attachmentComboBox->currentText();
privateKeyData = m_advancedUi->attachmentsWidget->getAttachment(fileName);
} else { } else {
QFile localFile(m_sshAgentUi->externalFileEdit->text()); QFile localFile(m_sshAgentUi->externalFileEdit->text());
QFileInfo localFileInfo(localFile);
fileName = localFileInfo.fileName();
if (localFile.fileName().isEmpty()) { if (localFile.fileName().isEmpty()) {
return false; return false;
@ -464,6 +468,10 @@ bool EditEntryWidget::getOpenSSHKey(OpenSSHKey& key, bool decrypt)
key.setComment(m_entry->username()); key.setComment(m_entry->username());
} }
if (key.comment().isEmpty()) {
key.setComment(fileName);
}
return true; return true;
} }

11
src/sshagent/SSHAgent.cpp
View file

@ -268,10 +268,15 @@ void SSHAgent::databaseModeChanged(DatabaseWidget::Mode mode)
} }
QByteArray keyData; QByteArray keyData;
QString fileName;
if (settings.selectedType() == "attachment") { if (settings.selectedType() == "attachment") {
keyData = e->attachments()->value(settings.attachmentName()); fileName = settings.attachmentName();
keyData = e->attachments()->value(fileName);
} else if (!settings.fileName().isEmpty()) { } else if (!settings.fileName().isEmpty()) {
QFile file(settings.fileName()); QFile file(settings.fileName());
QFileInfo fileInfo(file);
fileName = fileInfo.fileName();
if (file.size() > 1024 * 1024) { if (file.size() > 1024 * 1024) {
continue; continue;
@ -302,6 +307,10 @@ void SSHAgent::databaseModeChanged(DatabaseWidget::Mode mode)
key.setComment(e->username()); key.setComment(e->username());
} }
if (key.comment().isEmpty()) {
key.setComment(fileName);
}
if (settings.removeAtDatabaseClose()) { if (settings.removeAtDatabaseClose()) {
removeIdentityAtLock(key, uuid); removeIdentityAtLock(key, uuid);
} }