Call for testing: OpenSSH 8.5

[Darren Tucker]

On Tue, Feb 23, 2021 at 07:08:05PM -0500, Phil Pennock wrote:
[...]
>   # command-line:
>   sshd -T | grep -i '^PubkeyAcceptedKeyTypes'
> 
>   pubkeyacceptedkeytypes [...]
> 
> So besides the option not being renamed or duplicated

They should not be duplicated, but the not being renamed is an
oversight on my part (the old names are still listed first, so the
config dumper finds them ahead of the new names).

diff --git a/readconf.c b/readconf.c
index b0a85097..a05be047 100644
--- a/readconf.c
+++ b/readconf.c
@@ -308,10 +308,10 @@ static struct {
        { "revokedhostkeys", oRevokedHostKeys },
        { "fingerprinthash", oFingerprintHash },
        { "updatehostkeys", oUpdateHostkeys },
-       { "hostbasedkeytypes", oHostbasedAcceptedAlgorithms }, /* obsolete */
        { "hostbasedalgorithms", oHostbasedAcceptedAlgorithms },
-       { "pubkeyacceptedkeytypes", oPubkeyAcceptedAlgorithms }, /* obsolete */
+       { "hostbasedkeytypes", oHostbasedAcceptedAlgorithms }, /* obsolete */
        { "pubkeyacceptedalgorithms", oPubkeyAcceptedAlgorithms },
+       { "pubkeyacceptedkeytypes", oPubkeyAcceptedAlgorithms }, /* obsolete */
        { "ignoreunknown", oIgnoreUnknown },
        { "proxyjump", oProxyJump },
        { "securitykeyprovider", oSecurityKeyProvider },
diff --git a/servconf.c b/servconf.c
index b782ccbb..7e94d2d7 100644
--- a/servconf.c
+++ b/servconf.c
@@ -559,13 +559,13 @@ static struct {
        { "rhostsrsaauthentication", sDeprecated, SSHCFG_ALL },
        { "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },
        { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_ALL },
-       { "hostbasedacceptedkeytypes", sHostbasedAcceptedAlgorithms, SSHCFG_ALL }, /* obsolete */
        { "hostbasedacceptedalgorithms", sHostbasedAcceptedAlgorithms, SSHCFG_ALL },
+       { "hostbasedacceptedkeytypes", sHostbasedAcceptedAlgorithms, SSHCFG_ALL }, /* obsolete */
        { "hostkeyalgorithms", sHostKeyAlgorithms, SSHCFG_GLOBAL },
        { "rsaauthentication", sDeprecated, SSHCFG_ALL },
        { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },
-       { "pubkeyacceptedkeytypes", sPubkeyAcceptedAlgorithms, SSHCFG_ALL }, /* obsolete */
        { "pubkeyacceptedalgorithms", sPubkeyAcceptedAlgorithms, SSHCFG_ALL },
+       { "pubkeyacceptedkeytypes", sPubkeyAcceptedAlgorithms, SSHCFG_ALL }, /* obsolete */
        { "pubkeyauthoptions", sPubkeyAuthOptions, SSHCFG_ALL },
        { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */
 #ifdef KRB5

-- 
Darren Tucker (dtucker at dtucker.net)
GPG key 11EAA6FA / A86E 3E07 5B19 5880 E860  37F4 9357 ECEF 11EA A6FA (new)
    Good judgement comes with experience. Unfortunately, the experience
usually comes from bad judgement.