diff options
| author | delphij <delphij@FreeBSD.org> | 2012-06-25 19:01:04 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2012-06-25 19:01:04 +0000 |
| commit | 85590af6fa7e8cead37c00e128451fe7558cf305 (patch) | |
| tree | 5e70af4b403758f890e440f8b596f7058d98f4a8 /crypto/openssh | |
| parent | 2fce293bbe99a5168851f955d4f546a4b2cb9cdb (diff) | |
| download | FreeBSD-src-85590af6fa7e8cead37c00e128451fe7558cf305.zip FreeBSD-src-85590af6fa7e8cead37c00e128451fe7558cf305.tar.gz | |
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
Diffstat (limited to 'crypto/openssh')
| -rw-r--r-- | crypto/openssh/ssh-keyscan.1 | 11 | ||||
| -rw-r--r-- | crypto/openssh/ssh-keyscan.c | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/crypto/openssh/ssh-keyscan.1 b/crypto/openssh/ssh-keyscan.1 index dbb0d7d..ebc2e3f 100644 --- a/crypto/openssh/ssh-keyscan.1 +++ b/crypto/openssh/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 $ .\" $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 diff --git a/crypto/openssh/ssh-keyscan.c b/crypto/openssh/ssh-keyscan.c index b085dd4..c9de130 100644 --- a/crypto/openssh/ssh-keyscan.c +++ b/crypto/openssh/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 */ |
