From: markus <markus@openbsd.org>
Date: Wed, 12 Apr 2000 23:00:28 +0000 (+0000)
Subject: document Protocol, Ciphers
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ca6d7ea6fad764a69c9eab67db72dac9822f29f2;p=openbsd

document Protocol, Ciphers
---

diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 1c093800e60..55a38666b1e 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sat Apr 22 21:55:14 1995 ylo
 .\"
-.\" $Id: ssh.1,v 1.44 2000/04/12 21:47:51 aaron Exp $
+.\" $Id: ssh.1,v 1.45 2000/04/12 23:00:28 markus Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSH 1
@@ -548,6 +548,12 @@ and
 are supported.
 The default is
 .Dq 3des .
+.It Cm Ciphers
+Specifies the ciphers allowed for protocol version 2
+in order of preference.
+Multiple ciphers must be comma-separated.
+The default is
+.Dq blowfish-cbc,3des-cbc,arcfour,cast128-cbc .
 .It Cm Compression
 Specifies whether to use compression.
 The argument must be
@@ -697,6 +703,17 @@ or
 .It Cm Port
 Specifies the port number to connect on the remote host.
 Default is 22.
+.It Cm Protocol
+Specifies the protocol versions
+.Nm
+should support in order of preference.
+The possible values are
+.Dq 1
+and
+.Dq 2 .
+Multiple versions must be comma-separated.
+The default is
+.Dq 1 .
 .It Cm ProxyCommand
 Specifies the command to use to connect to the server.
 The command
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index 85d694afba9..cd6646f34bb 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sat Apr 22 21:55:14 1995 ylo
 .\"
-.\" $Id: sshd.8,v 1.40 2000/04/12 21:47:51 aaron Exp $
+.\" $Id: sshd.8,v 1.41 2000/04/12 23:00:28 markus Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSHD 8
@@ -246,6 +246,11 @@ wildcards in the patterns.
 Only user names are valid, a numerical user ID isn't recognized.
 By default login is allowed regardless of the user name.
 .Pp
+.It Cm Ciphers
+Specifies the ciphers allowed for protocol version 2.
+Multiple ciphers must be comma-separated.
+The default is
+.Dq blowfish-cbc,3des-cbc,arcfour,cast128-cbc .
 .It Cm CheckMail
 Specifies whether
 .Nm
@@ -427,6 +432,17 @@ when a user logs in interactively.
 or equivalent.)
 The default is
 .Dq yes .
+.It Cm Protocol
+Specifies the protocol versions
+.Nm
+should support.
+The possible values are
+.Dq 1
+and
+.Dq 2 .
+Multiple versions must be comma-separated.
+The default is
+.Dq 1 .
 .It Cm RandomSeed
 Obsolete.
 Random number generation uses other techniques.