SSH Agent: Fix handling of encrypted RSA keys #1587
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
phoerious
reviewed
Mar 3, 2018
src/sshagent/OpenSSHKey.cpp
Outdated
| @@ -94,6 +94,10 @@ int OpenSSHKey::keyLength() const | |||
|
|
|||
| const QString OpenSSHKey::fingerprint() const | |||
| { | |||
| if (m_publicData.isEmpty()) { | |||
| return ""; | |||
There was a problem hiding this comment.
Does this have to be an empty string or could you also return a null string {}?
phoerious
reviewed
Mar 3, 2018
src/sshagent/OpenSSHKey.cpp
Outdated
| @@ -115,6 +119,10 @@ const QString OpenSSHKey::comment() const | |||
|
|
|||
| const QString OpenSSHKey::publicKey() const | |||
| { | |||
| if (m_publicData.isEmpty()) { | |||
| return ""; | |||
hifi
force-pushed
the
hotfix/ssh-agent-enc-rsa
branch
from
b619a4e to
eabfacc
Compare
|
Changed. |
hifi
force-pushed
the
hotfix/ssh-agent-enc-rsa
branch
from
eabfacc to
5a28a40
Compare
|
Done. |
|
Still out of date. |
Also fix multiple UI issues caused by said keys. Fixes keepassxreboot#1560
hifi
force-pushed
the
hotfix/ssh-agent-enc-rsa
branch
from
5a28a40 to
103ec9f
Compare
phoerious
added a commit
that referenced
this pull request
Mar 6, 2018
- Fix unnecessary automatic upgrade to KDBX 4.0 and prevent challenge-response key being stripped [#1568] - Abort saving and show an error message when challenge-response fails [#1659] - Support inner stream protection on all string attributes [#1646] - Fix favicon downloads not finishing on some websites [#1657] - Fix freeze due to invalid STDIN data [#1628] - Correct issue with encrypted RSA SSH keys [#1587] - Fix crash on macOS due to QTBUG-54832 [#1607] - Show error message if ssh-agent communication fails [#1614] - Fix --pw-stdin and filename parameters being ignored [#1608] - Fix Auto-Type syntax check not allowing spaces and special characters [#1626] - Fix reference placeholders in combination with Auto-Type [#1649] - Fix qtbase translations not being loaded [#1611] - Fix startup crash on Windows due to missing SVG libraries [#1662] - Correct database tab order regression [#1610] - Fix GCC 8 compilation error [#1612] - Fix copying of advanced attributes on KDE [#1640] - Fix member initialization of CategoryListWidgetDelegate [#1613] - Fix inconsistent toolbar icon sizes and provide higher-quality icons [#1616] - Improve preview panel geometry [#1609]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1560
Description
Multiple UI issues caused by not having public key available have been fixed as well. All old RSA keys are always decrypted for display now, there's no manual decrypt option available for such keys.
The changes also handle the edge case that should not happen that such key is loaded but not decrypted.
How has this been tested?
Tested all kinds of keys in all kinds of situations by hand in the UI and automatic add/removal. Could not find any issues so far.
Types of changes
Checklist: