From owner-svn-src-stable@FreeBSD.ORG  Mon Jul  2 02:26:53 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8D29C106566C;
	Mon,  2 Jul 2012 02:26:53 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 764278FC08;
	Mon,  2 Jul 2012 02:26:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q622QrCs037507;
	Mon, 2 Jul 2012 02:26:53 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q622Qrev037504;
	Mon, 2 Jul 2012 02:26:53 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201207020226.q622Qrev037504@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 2 Jul 2012 02:26:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237940 - stable/9/crypto/openssh
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jul 2012 02:26:53 -0000

Author: delphij
Date: Mon Jul  2 02:26:52 2012
New Revision: 237940
URL: http://svn.freebsd.org/changeset/base/237940

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

Modified:
  stable/9/crypto/openssh/ssh-keyscan.1
  stable/9/crypto/openssh/ssh-keyscan.c
Directory Properties:
  stable/9/crypto/openssh/   (props changed)

Modified: stable/9/crypto/openssh/ssh-keyscan.1
==============================================================================
--- stable/9/crypto/openssh/ssh-keyscan.1	Sun Jul  1 22:18:20 2012	(r237939)
+++ stable/9/crypto/openssh/ssh-keyscan.1	Mon Jul  2 02:26:52 2012	(r237940)
@@ -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

Modified: stable/9/crypto/openssh/ssh-keyscan.c
==============================================================================
--- stable/9/crypto/openssh/ssh-keyscan.c	Sun Jul  1 22:18:20 2012	(r237939)
+++ stable/9/crypto/openssh/ssh-keyscan.c	Mon Jul  2 02:26:52 2012	(r237940)
@@ -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 */