summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2014-03-12 04:44:59 +0000
committerDamien Miller <djm@cvs.openbsd.org>2014-03-12 04:44:59 +0000
commit00bc0f93ca7bc27a117c7bd17a48ed15e6ce18a4 (patch)
treef595908ddf35f9c5e2a86c0af868353cffdf1ebc
parent75bd8096cbf79e75f94588c4f73671ca40b39d85 (diff)
scan for Ed25519 keys by default too
-rw-r--r--usr.bin/ssh/ssh-keyscan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c
index 97ee9ee745c..362b732ddad 100644
--- a/usr.bin/ssh/ssh-keyscan.c
+++ b/usr.bin/ssh/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.89 2013/12/06 13:39:49 markus Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.90 2014/03/12 04:44:58 djm Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
@@ -53,7 +53,7 @@ int ssh_port = SSH_DEFAULT_PORT;
#define KT_ECDSA 8
#define KT_ED25519 16
-int get_keytypes = KT_RSA|KT_ECDSA;/* Get RSA and ECDSA keys by default */
+int get_keytypes = KT_RSA|KT_ECDSA|KT_ED25519;
int hash_hosts = 0; /* Hash hostname on output */