From: Darren Tucker <dtucker@dtucker.net>
Date: Sun, 20 Feb 2022 02:30:52 +0000 (+1100)
Subject: Really move DSA to end of list.
X-Git-Tag: V_8_9_P1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=336685d223a59f893faeedf0a562e053fd84058e;p=thirdparty%2Fopenssh-portable.git

Really move DSA to end of list.

In commit ad16a84e syncing from OpenBSD, RSA was accidentally moved to
the end of the list instead of DSA.  Spotted by andrew at fyfe.gb.net.
---

diff --git a/readconf.c b/readconf.c
index ef6bcfea3..f26fabaa6 100644
--- a/readconf.c
+++ b/readconf.c
@@ -2531,7 +2531,7 @@ fill_default_options(Options * options)
 		options->add_keys_to_agent_lifespan = 0;
 	}
 	if (options->num_identity_files == 0) {
-		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_DSA, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA, 0);
 #ifdef OPENSSL_HAS_ECC
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA, 0);
 		add_identity_file(options, "~/",
@@ -2542,7 +2542,7 @@ fill_default_options(Options * options)
 		add_identity_file(options, "~/",
 		    _PATH_SSH_CLIENT_ID_ED25519_SK, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_XMSS, 0);
-		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_DSA, 0);
 	}
 	if (options->escape_char == -1)
 		options->escape_char = '~';