summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keyscan.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2012-04-11 13:34:17 +0000
committerdjm <djm@openbsd.org>2012-04-11 13:34:17 +0000
commitcf82b9be0f85bc59b5f229c435e73f806c05ed1f (patch)
tree0da3e0fbbba518651f32a81e9935a7d71710dd60 /usr.bin/ssh/ssh-keyscan.c
parentSLIST_REMOVE_NEXT -> SLIST_REMOVE_AFTER for better consistency and (diff)
downloadwireguard-openbsd-cf82b9be0f85bc59b5f229c435e73f806c05ed1f.tar.xz
wireguard-openbsd-cf82b9be0f85bc59b5f229c435e73f806c05ed1f.zip
now that sshd defaults to offering ECDSA keys, ssh-keyscan should also
look for them by default; bz#1971
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 ff7e8450ae7..6a5b93137a2 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.85 2011/03/15 10:36:02 okan Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.86 2012/04/11 13:34:17 djm Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
@@ -52,7 +52,7 @@ int ssh_port = SSH_DEFAULT_PORT;
#define KT_RSA 4
#define KT_ECDSA 8
-int get_keytypes = KT_RSA; /* Get only RSA keys by default */
+int get_keytypes = KT_RSA|KT_ECDSA;/* Get RSA and ECDSA keys by default */
int hash_hosts = 0; /* Hash hostname on output */