diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
commit | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (patch) | |
tree | d12ff16d94cffc5d84dba0193eaaa616967c9c2c /ssh.0 | |
parent | cadac134eda6ed97478afdc528a68dd33f31dbc5 (diff) | |
parent | 1e4cfeee6c17b02af09418c5afe4a4d71aaaf0c8 (diff) |
import openssh-5.3p1-gsskex-all-20100124.patch
Diffstat (limited to 'ssh.0')
-rw-r--r-- | ssh.0 | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -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 | ||
873 | OpenBSD 4.5 February 12, 2009 14 | 867 | OpenBSD 4.6 March 19, 2009 14 |