upstream: Put obsolete aliases for hostbasedalgorithms and

pubkeyacceptedalgorithms after their current names so that the config-dump
mode finds and uses the current names.  Spotted by Phil Pennock.

OpenBSD-Commit-ID: 5dd10e93cccfaff3aaaa09060c917adff04a9b15

diff --git a/readconf.c b/readconf.c
index b0a850977140931b14ae3392c78545f403553f81..724974b708f92848066ccc1067382bac57d0fd1a 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.351 2021/02/15 20:43:15 markus Exp $ */
+/* $OpenBSD: readconf.c,v 1.352 2021/02/24 01:18:08 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -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 b782ccbbad8ab1eea404c37ad300f250d597036f..9695583a0f854d15d320281312517ee73b8f89d5 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.376 2021/02/15 20:36:35 markus Exp $ */
+/* $OpenBSD: servconf.c,v 1.377 2021/02/24 01:18:08 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -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