diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2022-02-04 02:49:17 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-02-07 12:27:48 +1100 |
| commit | ad16a84e64a8cf1c69c63de3fb9008320a37009c (patch) | |
| tree | b0f78df42ddbb154c544f1a0c75cc96b86cd6ba9 /readconf.c | |
| parent | 253de42753de85dde266e061b6fec12ca6589f7d (diff) | |
| download | openssh-git-ad16a84e64a8cf1c69c63de3fb9008320a37009c.tar.gz | |
upstream: Since they are deprecated, move DSA to the end of the
default list of public keys so that they will be tried last. From github
PR#295 from "ProBackup-nl", ok djm@
OpenBSD-Commit-ID: 7e5d575cf4971d4e2de92e0b6d6efaba53598bf0
Diffstat (limited to 'readconf.c')
| -rw-r--r-- | readconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.364 2021/12/19 22:14:47 djm Exp $ */ +/* $OpenBSD: readconf.c,v 1.365 2022/02/04 02:49:17 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2532,7 +2532,6 @@ 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_RSA, 0); add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_DSA, 0); #ifdef OPENSSL_HAS_ECC add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA, 0); @@ -2544,6 +2543,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); } if (options->escape_char == -1) options->escape_char = '~'; |