diff options
author | Colin Watson <cjwatson@debian.org> | 2011-01-24 12:43:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-01-24 12:43:25 +0000 |
commit | 626f1d986ff72aa514da63e34744e1de9cf21b9a (patch) | |
tree | d215a5280bc2e57251e4a9e08bfd3674ad824a94 /ssh-keyscan.1 | |
parent | 6ed622cb6fe8f71bbe0d998cdd12280410bfb420 (diff) | |
parent | 0970072c89b079b022538e3c366fbfa2c53fc821 (diff) |
* New upstream release (http://www.openssh.org/txt/release-5.7):
- Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA
offer better performance than plain DH and DSA at the same equivalent
symmetric key length, as well as much shorter keys.
- sftp(1)/sftp-server(8): add a protocol extension to support a hard
link operation. It is available through the "ln" command in the
client. The old "ln" behaviour of creating a symlink is available
using its "-s" option or through the preexisting "symlink" command.
- scp(1): Add a new -3 option to scp: Copies between two remote hosts
are transferred through the local host (closes: #508613).
- ssh(1): "atomically" create the listening mux socket by binding it on
a temporary name and then linking it into position after listen() has
succeeded. This allows the mux clients to determine that the server
socket is either ready or stale without races (closes: #454784).
Stale server sockets are now automatically removed (closes: #523250).
- ssh(1): install a SIGCHLD handler to reap expired child process
(closes: #594687).
- ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent
temporary directories (closes: #357469, although only if you arrange
for ssh-agent to actually see $TMPDIR since the setgid bit will cause
it to be stripped off).
Diffstat (limited to 'ssh-keyscan.1')
-rw-r--r-- | ssh-keyscan.1 | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1 index 78255ff79..fe9bb6e07 100644 --- a/ssh-keyscan.1 +++ b/ssh-keyscan.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keyscan.1,v 1.28 2010/01/09 23:04:13 dtucker Exp $ | 1 | .\" $OpenBSD: ssh-keyscan.1,v 1.29 2010/08/31 11:54:45 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. | 3 | .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. |
4 | .\" | 4 | .\" |
@@ -6,7 +6,7 @@ | |||
6 | .\" permitted provided that due credit is given to the author and the | 6 | .\" permitted provided that due credit is given to the author and the |
7 | .\" OpenBSD project by leaving this copyright notice intact. | 7 | .\" OpenBSD project by leaving this copyright notice intact. |
8 | .\" | 8 | .\" |
9 | .Dd $Mdocdate: January 9 2010 $ | 9 | .Dd $Mdocdate: August 31 2010 $ |
10 | .Dt SSH-KEYSCAN 1 | 10 | .Dt SSH-KEYSCAN 1 |
11 | .Os | 11 | .Os |
12 | .Sh NAME | 12 | .Sh NAME |
@@ -88,9 +88,10 @@ Specifies the type of the key to fetch from the scanned hosts. | |||
88 | The possible values are | 88 | The possible values are |
89 | .Dq rsa1 | 89 | .Dq rsa1 |
90 | for protocol version 1 and | 90 | for protocol version 1 and |
91 | .Dq rsa | 91 | .Dq dsa , |
92 | .Dq ecdsa | ||
92 | or | 93 | or |
93 | .Dq dsa | 94 | .Dq rsa |
94 | for protocol version 2. | 95 | for protocol version 2. |
95 | Multiple values may be specified by separating them with commas. | 96 | Multiple values may be specified by separating them with commas. |
96 | The default is | 97 | The default is |
@@ -122,7 +123,7 @@ attacks which have begun after the ssh_known_hosts file was created. | |||
122 | host-or-namelist bits exponent modulus | 123 | host-or-namelist bits exponent modulus |
123 | .Ed | 124 | .Ed |
124 | .Pp | 125 | .Pp |
125 | .Pa Output format for rsa and dsa keys: | 126 | .Pa Output format for rsa, dsa and ecdsa keys: |
126 | .Bd -literal | 127 | .Bd -literal |
127 | host-or-namelist keytype base64-encoded-key | 128 | host-or-namelist keytype base64-encoded-key |
128 | .Ed | 129 | .Ed |
@@ -130,9 +131,12 @@ host-or-namelist keytype base64-encoded-key | |||
130 | Where | 131 | Where |
131 | .Pa keytype | 132 | .Pa keytype |
132 | is either | 133 | is either |
133 | .Dq ssh-rsa | 134 | .Dq ecdsa-sha2-nistp256 , |
135 | .Dq ecdsa-sha2-nistp384 , | ||
136 | .Dq ecdsa-sha2-nistp521 , | ||
137 | .Dq ssh-dss | ||
134 | or | 138 | or |
135 | .Dq ssh-dss . | 139 | .Dq ssh-rsa . |
136 | .Pp | 140 | .Pp |
137 | .Pa /etc/ssh/ssh_known_hosts | 141 | .Pa /etc/ssh/ssh_known_hosts |
138 | .Sh EXAMPLES | 142 | .Sh EXAMPLES |
@@ -149,7 +153,7 @@ Find all hosts from the file | |||
149 | which have new or different keys from those in the sorted file | 153 | which have new or different keys from those in the sorted file |
150 | .Pa ssh_known_hosts : | 154 | .Pa ssh_known_hosts : |
151 | .Bd -literal | 155 | .Bd -literal |
152 | $ ssh-keyscan -t rsa,dsa -f ssh_hosts | \e | 156 | $ ssh-keyscan -t rsa,dsa,ecdsa -f ssh_hosts | \e |
153 | sort -u - ssh_known_hosts | diff ssh_known_hosts - | 157 | sort -u - ssh_known_hosts | diff ssh_known_hosts - |
154 | .Ed | 158 | .Ed |
155 | .Sh SEE ALSO | 159 | .Sh SEE ALSO |