svn commit: r237940 - stable/9/crypto/openssh

[Xin LI]

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 at 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 */