sshconnect2.c: only re-order keys when resetting keys (instead of destroying the list and failing to rebuild it) #57
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
None of these functions actually modify the keys they are acting on
sshconnect2.c whipes all keys and close the agent fd between each authentication before rebuilding them and reconnecting to the agent. However, during an authentication: - Almost all access to the keys/key list do not modify them - The only modification to them is in userauth_pubkey, which: * Re-order the key, increasing the 'tries' count (up to 2) * Set the 'isprivate' flag * All other functions called do not modify the keys This commit: - Modify userauth_pubkey so that it cleans up isprivate when it cleans up the key - Add a pubkey_reset that: + Revert the re-ordering + Reset the 'tries' to 0 The re-ordering could be even be skipped as the order does not carry much importance...
|
AFAIK this was committed in b9844a4 |
restyled-io bot
pushed a commit
to johnsonjh/j-hpn-ssh
that referenced
this pull request
Feb 23, 2021
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.
sshconnect2.c whipes all keys and close the agent fd between each authentication before trying to rebuild the list (but failing because building the list modifies its sources) and reconnecting to the agent.
However, during an authentication:
triescount (up to 2)isprivateflagThis PR proposes a solution by:
isprivatewhen it cleans up the keypubkey_resetfunction that:triesto 0This PR also include some function argument constification, to make it simpler to see that these function do not modify their arguments
Should fix https://bugzilla.mindrot.org/show_bug.cgi?id=2642