upstream: Move always unsupported keywords to be grouped with the other

ones. Move oSecurityProvider to match the order in the OpCodes enum. Patch
from openbsd@academicsolutions.ch, ok djm@

OpenBSD-Commit-ID: 061e4505861ec1e02ba3a63e3d1b3be3cad458ec

diff --git a/readconf.c b/readconf.c
index 1b541e691ff746dd61800a9679e9a97e64a44cf0..282afede6c3f4961be2dc50c235d6c7e61e8214f 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.317 2019/12/20 02:29:21 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.318 2019/12/20 02:42:42 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -197,6 +197,9 @@ static struct {
        { "afstokenpassing", oUnsupported },
        { "kerberosauthentication", oUnsupported },
        { "kerberostgtpassing", oUnsupported },
+       { "rsaauthentication", oUnsupported },
+       { "rhostsrsaauthentication", oUnsupported },
+       { "compressionlevel", oUnsupported },
 
        /* Sometimes-unsupported options */
 #if defined(GSSAPI)
@@ -213,10 +216,6 @@ static struct {
        { "smartcarddevice", oUnsupported },
        { "pkcs11provider", oUnsupported },
 #endif
-       { "securitykeyprovider", oSecurityKeyProvider },
-       { "rsaauthentication", oUnsupported },
-       { "rhostsrsaauthentication", oUnsupported },
-       { "compressionlevel", oUnsupported },
 
        { "forwardagent", oForwardAgent },
        { "forwardx11", oForwardX11 },
@@ -310,6 +309,7 @@ static struct {
        { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
        { "ignoreunknown", oIgnoreUnknown },
        { "proxyjump", oProxyJump },
+       { "securitykeyprovider", oSecurityKeyProvider },
 
        { NULL, oBadOption }
 };