From 0352d94ee224d70f7a09de9bf4a06f4b6df3c54d Mon Sep 17 00:00:00 2001
From: delphij <delphij@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 2 Jul 2012 02:26:52 +0000
Subject: [PATCH] MFC r237568:

Fetch both ECDSA and RSA keys by default in ssh-keyscan(1).


git-svn-id: svn://svn.freebsd.org/base/stable/9@237940 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 crypto/openssh/ssh-keyscan.1 | 11 +++++++----
 crypto/openssh/ssh-keyscan.c |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/crypto/openssh/ssh-keyscan.1 b/crypto/openssh/ssh-keyscan.1
index dbb0d7da6..ebc2e3f5f 100644
--- a/crypto/openssh/ssh-keyscan.1
+++ b/crypto/openssh/ssh-keyscan.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-keyscan.1,v 1.29 2010/08/31 11:54:45 djm Exp $
+.\"	$OpenBSD: ssh-keyscan.1,v 1.30 2012/04/11 13:34:17 djm Exp $
 .\"	$FreeBSD$
 .\"
 .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
@@ -7,7 +7,7 @@
 .\" permitted provided that due credit is given to the author and the
 .\" OpenBSD project by leaving this copyright notice intact.
 .\"
-.Dd August 31, 2010
+.Dd April 11 2012
 .Dt SSH-KEYSCAN 1
 .Os
 .Sh NAME
@@ -95,8 +95,11 @@ or
 .Dq rsa
 for protocol version 2.
 Multiple values may be specified by separating them with commas.
-The default is
-.Dq rsa .
+The default is to fetch
+.Dq rsa
+and
+.Dq ecdsa
+keys.
 .It Fl v
 Verbose mode.
 Causes
diff --git a/crypto/openssh/ssh-keyscan.c b/crypto/openssh/ssh-keyscan.c
index 25d7ac66f..2ba71ea60 100644
--- a/crypto/openssh/ssh-keyscan.c
+++ b/crypto/openssh/ssh-keyscan.c
@@ -57,7 +57,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 */
 
-- 
2.45.0