summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keyscan.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2014-03-12 04:44:58 +0000
committerdjm <djm@openbsd.org>2014-03-12 04:44:58 +0000
commit9c3463cf13284fff092cf822f688819afebef778 (patch)
treee03d448ae60f417914294862a3cdd5fe3411e2fe /usr.bin/ssh/ssh-keyscan.c
parentenable qla(4) and qle(4) in GENERIC configs where isp(4) is already (diff)
downloadwireguard-openbsd-9c3463cf13284fff092cf822f688819afebef778.tar.xz
wireguard-openbsd-9c3463cf13284fff092cf822f688819afebef778.zip
scan for Ed25519 keys by default too
Diffstat (limited to 'usr.bin/ssh/ssh-keyscan.c')
-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 */