summaryrefslogtreecommitdiff
path: root/ssh-keyscan.1
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-10-07 13:33:15 +0100
committerColin Watson <cjwatson@debian.org>2014-10-07 14:27:30 +0100
commitf0b009aea83e9ff3a50be30f51012099a5143c16 (patch)
tree3825e6f7e3b7ea4481d06ed89aba9a7a95150df5 /ssh-keyscan.1
parent47f0bad4330b16ec3bad870fcf9839c196e42c12 (diff)
parent762c062828f5a8f6ed189ed6e44ad38fd92f8b36 (diff)
Merge 6.7p1.
* New upstream release (http://www.openssh.com/txt/release-6.7): - sshd(8): The default set of ciphers and MACs has been altered to remove unsafe algorithms. In particular, CBC ciphers and arcfour* are disabled by default. The full set of algorithms remains available if configured explicitly via the Ciphers and MACs sshd_config options. - ssh(1), sshd(8): Add support for Unix domain socket forwarding. A remote TCP port may be forwarded to a local Unix domain socket and vice versa or both ends may be a Unix domain socket (closes: #236718). - ssh(1), ssh-keygen(1): Add support for SSHFP DNS records for ED25519 key types. - sftp(1): Allow resumption of interrupted uploads. - ssh(1): When rekeying, skip file/DNS lookups of the hostkey if it is the same as the one sent during initial key exchange. - sshd(8): Allow explicit ::1 and 127.0.0.1 forwarding bind addresses when GatewayPorts=no; allows client to choose address family. - sshd(8): Add a sshd_config PermitUserRC option to control whether ~/.ssh/rc is executed, mirroring the no-user-rc authorized_keys option. - ssh(1): Add a %C escape sequence for LocalCommand and ControlPath that expands to a unique identifer based on a hash of the tuple of (local host, remote user, hostname, port). Helps avoid exceeding miserly pathname limits for Unix domain sockets in multiplexing control paths. - sshd(8): Make the "Too many authentication failures" message include the user, source address, port and protocol in a format similar to the authentication success / failure messages. - Use CLOCK_BOOTTIME in preference to CLOCK_MONOTONIC when it is available. It considers time spent suspended, thereby ensuring timeouts (e.g. for expiring agent keys) fire correctly (closes: #734553). - Use prctl() to prevent sftp-server from accessing /proc/self/{mem,maps}. * Restore TCP wrappers support, removed upstream in 6.7. It is true that dropping this reduces preauth attack surface in sshd. On the other hand, this support seems to be quite widely used, and abruptly dropping it (from the perspective of users who don't read openssh-unix-dev) could easily cause more serious problems in practice. It's not entirely clear what the right long-term answer for Debian is, but it at least probably doesn't involve dropping this feature shortly before a freeze. * Replace patch to disable OpenSSL version check with an updated version of Kurt Roeckx's patch from #732940 to just avoid checking the status field.
Diffstat (limited to 'ssh-keyscan.1')
-rw-r--r--ssh-keyscan.115
1 files changed, 8 insertions, 7 deletions
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index dae4fd9fb..5c32ea9c7 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keyscan.1,v 1.34 2014/01/28 14:13:39 jmc Exp $ 1.\" $OpenBSD: ssh-keyscan.1,v 1.35 2014/03/12 13:06:59 naddy 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 28 2014 $ 9.Dd $Mdocdate: March 12 2014 $
10.Dt SSH-KEYSCAN 1 10.Dt SSH-KEYSCAN 1
11.Os 11.Os
12.Sh NAME 12.Sh NAME
@@ -98,9 +98,10 @@ or
98for protocol version 2. 98for protocol version 2.
99Multiple values may be specified by separating them with commas. 99Multiple values may be specified by separating them with commas.
100The default is to fetch 100The default is to fetch
101.Dq rsa 101.Dq rsa ,
102.Dq ecdsa ,
102and 103and
103.Dq ecdsa 104.Dq ed25519
104keys. 105keys.
105.It Fl v 106.It Fl v
106Verbose mode. 107Verbose mode.
@@ -124,12 +125,12 @@ Input format:
1241.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4 1251.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4
125.Ed 126.Ed
126.Pp 127.Pp
127Output format for rsa1 keys: 128Output format for RSA1 keys:
128.Bd -literal 129.Bd -literal
129host-or-namelist bits exponent modulus 130host-or-namelist bits exponent modulus
130.Ed 131.Ed
131.Pp 132.Pp
132Output format for rsa, dsa and ecdsa keys: 133Output format for RSA, DSA, ECDSA, and ED25519 keys:
133.Bd -literal 134.Bd -literal
134host-or-namelist keytype base64-encoded-key 135host-or-namelist keytype base64-encoded-key
135.Ed 136.Ed
@@ -158,7 +159,7 @@ Find all hosts from the file
158which have new or different keys from those in the sorted file 159which have new or different keys from those in the sorted file
159.Pa ssh_known_hosts : 160.Pa ssh_known_hosts :
160.Bd -literal 161.Bd -literal
161$ ssh-keyscan -t rsa,dsa,ecdsa -f ssh_hosts | \e 162$ ssh-keyscan -t rsa,dsa,ecdsa,ed25519 -f ssh_hosts | \e
162 sort -u - ssh_known_hosts | diff ssh_known_hosts - 163 sort -u - ssh_known_hosts | diff ssh_known_hosts -
163.Ed 164.Ed
164.Sh SEE ALSO 165.Sh SEE ALSO