Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Jun 2012 19:01:04 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r237568 - head/crypto/openssh
Message-ID:  <201206251901.q5PJ14DB089886@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Mon Jun 25 19:01:04 2012
New Revision: 237568
URL: http://svn.freebsd.org/changeset/base/237568

Log:
  MFV (r237567):
  
  Fetch both ECDSA and RSA keys by default in ssh-keyscan(1).
  
  Approved by:	des
  Obtained from:	OpenSSH portable
  MFC after:	1 week

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

Modified: head/crypto/openssh/ssh-keyscan.1
==============================================================================
--- head/crypto/openssh/ssh-keyscan.1	Mon Jun 25 18:54:02 2012	(r237567)
+++ head/crypto/openssh/ssh-keyscan.1	Mon Jun 25 19:01:04 2012	(r237568)
@@ -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: head/crypto/openssh/ssh-keyscan.c
==============================================================================
--- head/crypto/openssh/ssh-keyscan.c	Mon Jun 25 18:54:02 2012	(r237567)
+++ head/crypto/openssh/ssh-keyscan.c	Mon Jun 25 19:01:04 2012	(r237568)
@@ -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>.
  *
@@ -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 */
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206251901.q5PJ14DB089886>