diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
commit | 59247ecde39f2d826a94ab07f6095ca1f6644e88 (patch) | |
tree | 5910d4a840352aafbf67e8a39fa63936e5529b26 /ssh.1 | |
parent | 07d905b406c4ab64ea2f10a22f4f8f0d595269f6 (diff) | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (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.1')
-rw-r--r-- | ssh.1 | 27 |
1 files changed, 5 insertions, 22 deletions
@@ -34,8 +34,8 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh.1,v 1.282 2009/02/12 03:44:25 djm Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.283 2009/03/19 15:15:09 jmc Exp $ |
38 | .Dd $Mdocdate: February 12 2009 $ | 38 | .Dd $Mdocdate: March 19 2009 $ |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -191,26 +191,9 @@ For protocol version 2, | |||
191 | .Ar cipher_spec | 191 | .Ar cipher_spec |
192 | is a comma-separated list of ciphers | 192 | is a comma-separated list of ciphers |
193 | listed in order of preference. | 193 | listed in order of preference. |
194 | The supported ciphers are: | 194 | See the |
195 | 3des-cbc, | 195 | .Cm Ciphers |
196 | aes128-cbc, | 196 | keyword for more information. |
197 | aes192-cbc, | ||
198 | aes256-cbc, | ||
199 | aes128-ctr, | ||
200 | aes192-ctr, | ||
201 | aes256-ctr, | ||
202 | arcfour128, | ||
203 | arcfour256, | ||
204 | arcfour, | ||
205 | blowfish-cbc, | ||
206 | and | ||
207 | cast128-cbc. | ||
208 | The default is: | ||
209 | .Bd -literal -offset indent | ||
210 | aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128, | ||
211 | arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr, | ||
212 | aes192-ctr,aes256-ctr | ||
213 | .Ed | ||
214 | .It Fl D Xo | 197 | .It Fl D Xo |
215 | .Sm off | 198 | .Sm off |
216 | .Oo Ar bind_address : Oc | 199 | .Oo Ar bind_address : Oc |