summaryrefslogtreecommitdiff
path: root/ssh.0
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-01-24 22:46:54 +0000
committerColin Watson <cjwatson@debian.org>2010-01-24 22:46:54 +0000
commit59247ecde39f2d826a94ab07f6095ca1f6644e88 (patch)
tree5910d4a840352aafbf67e8a39fa63936e5529b26 /ssh.0
parent07d905b406c4ab64ea2f10a22f4f8f0d595269f6 (diff)
parent964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff)
* New upstream release.
* Update to GSSAPI patch from http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
Diffstat (limited to 'ssh.0')
-rw-r--r--ssh.012
1 files changed, 3 insertions, 9 deletions
diff --git a/ssh.0 b/ssh.0
index 1788bf9cc..af73167b2 100644
--- a/ssh.0
+++ b/ssh.0
@@ -78,14 +78,8 @@ DESCRIPTION
78 graphic weaknesses. The default is ``3des''. 78 graphic weaknesses. The default is ``3des''.
79 79
80 For protocol version 2, cipher_spec is a comma-separated list of 80 For protocol version 2, cipher_spec is a comma-separated list of
81 ciphers listed in order of preference. The supported ciphers 81 ciphers listed in order of preference. See the Ciphers keyword
82 are: 3des-cbc, aes128-cbc, aes192-cbc, aes256-cbc, aes128-ctr, 82 for more information.
83 aes192-ctr, aes256-ctr, arcfour128, arcfour256, arcfour, blow-
84 fish-cbc, and cast128-cbc. The default is:
85
86 aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,
87 arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,
88 aes192-ctr,aes256-ctr
89 83
90 -D [bind_address:]port 84 -D [bind_address:]port
91 Specifies a local ``dynamic'' application-level port forwarding. 85 Specifies a local ``dynamic'' application-level port forwarding.
@@ -870,4 +864,4 @@ AUTHORS
870 created OpenSSH. Markus Friedl contributed the support for SSH protocol 864 created OpenSSH. Markus Friedl contributed the support for SSH protocol
871 versions 1.5 and 2.0. 865 versions 1.5 and 2.0.
872 866
873OpenBSD 4.5 February 12, 2009 14 867OpenBSD 4.6 March 19, 2009 14