summaryrefslogtreecommitdiff
path: root/ssh-add.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2022-02-04 02:49:17 +0000
committerDamien Miller <djm@mindrot.org>2022-02-07 12:27:48 +1100
commitad16a84e64a8cf1c69c63de3fb9008320a37009c (patch)
treeb0f78df42ddbb154c544f1a0c75cc96b86cd6ba9 /ssh-add.c
parent253de42753de85dde266e061b6fec12ca6589f7d (diff)
downloadopenssh-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 'ssh-add.c')
-rw-r--r--ssh-add.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-add.c b/ssh-add.c
index 4a6f5e14..75554774 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.164 2022/01/14 03:43:48 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.165 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
@@ -77,7 +77,6 @@ extern char *__progname;
static char *default_files[] = {
#ifdef WITH_OPENSSL
_PATH_SSH_CLIENT_ID_RSA,
- _PATH_SSH_CLIENT_ID_DSA,
#ifdef OPENSSL_HAS_ECC
_PATH_SSH_CLIENT_ID_ECDSA,
_PATH_SSH_CLIENT_ID_ECDSA_SK,
@@ -86,6 +85,7 @@ static char *default_files[] = {
_PATH_SSH_CLIENT_ID_ED25519,
_PATH_SSH_CLIENT_ID_ED25519_SK,
_PATH_SSH_CLIENT_ID_XMSS,
+ _PATH_SSH_CLIENT_ID_DSA,
NULL
};