sshserver.pl: bump an sshd config to use its modern name - #22460
sshserver.pl: bump an sshd config to use its modern name#22460vszakats wants to merge 3 commits into
Conversation
7468531 to
d44887d
Compare
There was a problem hiding this comment.
Pull request overview
Updates the OpenSSH test server configuration generated by tests/sshserver.pl to use the modern sshd configuration keyword for permitting ssh-rsa keys on newer OpenSSH versions, aligning with upstream OpenSSH’s option rename.
Changes:
- Replace
PubkeyAcceptedKeyTypeswith the modernPubkeyAcceptedAlgorithmsfor OpenSSH >= 8.8 in the generated sshd config. - Add an inline note indicating the legacy option name for older OpenSSH versions.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| if(($sshdid =~ /OpenSSH/) && ($sshdvernum >= 880) && ($keyalgo eq 'rsa')) { | ||
| push @cfgarr, 'HostKeyAlgorithms +ssh-rsa'; | ||
| push @cfgarr, 'PubkeyAcceptedKeyTypes +ssh-rsa'; | ||
| push @cfgarr, 'PubkeyAcceptedAlgorithms +ssh-rsa'; # named PubkeyAcceptedKeyTypes in OpenSSH <8.5 |
There was a problem hiding this comment.
Does this need an extra if(($sshdid =~ /OpenSSH/) && ($sshdvernum... entry to keep it working for openssh <8.5?
There was a problem hiding this comment.
This section is already guarded for sshdvernum >= 880, so never used for <8.5.
There was a problem hiding this comment.
Fair - it just looked odd to introduce a comment like that instead of another gate
There was a problem hiding this comment.
I added it to hit grep (and as a reminder) if someone is looking for the previous name.
Ref: openssh/openssh-portable@ee9c0da