Date: Mon, 25 Jun 2012 18:54:03 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r237567 - vendor-crypto/openssh/dist Message-ID: <201206251854.q5PIs3fj089519@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Mon Jun 25 18:54:02 2012 New Revision: 237567 URL: http://svn.freebsd.org/changeset/base/237567 Log: Merge from upstream: - djm@cvs.openbsd.org 2012/04/11 13:34:17 [ssh-keyscan.1 ssh-keyscan.c] now that sshd defaults to offering ECDSA keys, ssh-keyscan should also look for them by default; bz#1971 Approved by: des Modified: vendor-crypto/openssh/dist/ssh-keyscan.1 vendor-crypto/openssh/dist/ssh-keyscan.c Modified: vendor-crypto/openssh/dist/ssh-keyscan.1 ============================================================================== --- vendor-crypto/openssh/dist/ssh-keyscan.1 Mon Jun 25 17:50:11 2012 (r237566) +++ vendor-crypto/openssh/dist/ssh-keyscan.1 Mon Jun 25 18:54:02 2012 (r237567) @@ -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 $ .\" .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. .\" @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: August 31 2010 $ +.Dd $Mdocdate: April 11 2012 $ .Dt SSH-KEYSCAN 1 .Os .Sh NAME @@ -94,8 +94,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: vendor-crypto/openssh/dist/ssh-keyscan.c ============================================================================== --- vendor-crypto/openssh/dist/ssh-keyscan.c Mon Jun 25 17:50:11 2012 (r237566) +++ vendor-crypto/openssh/dist/ssh-keyscan.c Mon Jun 25 18:54:02 2012 (r237567) @@ -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?201206251854.q5PIs3fj089519>