-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove SHA-1 signed keys #16912
Remove SHA-1 signed keys #16912
Conversation
6e3166b
to
2a2226e
Compare
lib/config/openssh.go
Outdated
UserKnownHostsFile "{{ $dot.KnownHostsPath }}" | ||
IdentityFile "{{ $dot.IdentityFilePath }}" | ||
CertificateFile "{{ $dot.CertificateFilePath }}"{{- if $dot.NewerHostKeyAlgorithmsSupported }} | ||
HostKeyAlgorithms [email protected],[email protected]{{- else }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to include these explicitly? Can't just not set host key algos in this case?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, because of 3rd party libraries that I don't want to mention here. I changed the logic to work with SHA-2 and SHA-1 if the first one is not supported.
5d44945
to
fb29329
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm but let's please wait for @timothyb89 to review as well
Co-authored-by: Roman Tkachenko <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a huge improvement, and works perfectly on my machine. Thank you!
I converted this PR back to a draft as we found out that crypto SSH patch breaks older OpenSSH clients. |
This PR switches Go crypto library to our fork that supports extension negotiation (RFC 8308).
It also removes
PubkeyAcceptedAlgorithms [email protected]
from the SSH config file as this option is no longer needed.I also refactored the SSH config generation logic as we had to separate generators. One for
tsh config
and the second fortbot
that were doing the same thing.Closes #10918
Closes #15149
Closes #15633