diff options
| author | delphij <delphij@FreeBSD.org> | 2012-06-25 18:54:02 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2012-06-25 18:54:02 +0000 |
| commit | cabe4d214f840efeab467937bd586fba19e39dba (patch) | |
| tree | 699b7ba896e27250c6d0ba2dde3dbb849576af6f | |
| parent | a9c7316f0b012b7e85d1a1c4d8b6ce36b9fd9604 (diff) | |
| download | FreeBSD-src-cabe4d214f840efeab467937bd586fba19e39dba.zip FreeBSD-src-cabe4d214f840efeab467937bd586fba19e39dba.tar.gz | |
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
| -rw-r--r-- | ssh-keyscan.1 | 11 | ||||
| -rw-r--r-- | ssh-keyscan.c | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1 index fe9bb6e..f2b0fc8 100644 --- a/ssh-keyscan.1 +++ b/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 $ .\" .\" 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 diff --git a/ssh-keyscan.c b/ssh-keyscan.c index b085dd4..c9de130 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -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 */ |
