- (bal) Synced ssh.1 w/ OpenBSD

2 files changed, 21 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index e7ea57417..2e1aadb9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,12 +21,12 @@
    - danh@cvs.openbsd.org 2001/02/10 15:14:11
      [scp.c]
      fix memory leak; ok markus@
- - (bal) Minor correction to sftp-client.c I made.  Should return 'status'
-   instead of '0'  (from the OpenBSD tree)
- - OpenBSD Sync
    - djm@cvs.openbsd.org 2001/02/10 0:45:52
      [scp.1]
      Mention that you can quote pathnames with spaces in them
+ - (bal) Minor correction to sftp-client.c I made.  Should return 'status'
+   instead of '0'  (from the OpenBSD tree)
+ - (bal) Synced ssh.1 w/ OpenBSD
 
 20010210
  - (djm) Sync sftp and scp stuff from OpenBSD:
@@ -3810,4 +3810,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.720 2001/02/10 21:59:35 mouring Exp $
+$Id: ChangeLog,v 1.721 2001/02/10 22:08:03 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index 28913232f..dc177c8ba 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.84 2001/02/04 15:10:44 markus Exp $
+.\" $OpenBSD: ssh.1,v 1.90 2001/02/10 16:03:29 markus Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -48,7 +48,7 @@
 .Op Ar command
 .Pp
 .Nm ssh
-.Op Fl afgknqstvxACNPTX246
+.Op Fl afgknqstvxACNPTX1246
 .Op Fl c Ar cipher_spec
 .Op Fl e Ar escape_char
 .Op Fl i Ar identity_file
@@ -374,11 +374,12 @@ cipher which is no longer fully supported in
 .Ar blowfish
 is a fast block cipher, it appears very secure and is much faster than
 .Ar 3des .
-.It Fl c Ar "3des-cbc,blowfish-cbc,arcfour,cast128-cbc"
+.It Fl c Ar cipher_spec
 Additionally, for protocol version 2 a comma-separated list of ciphers can
 be specified in order of preference.
-Protocol version 2 supports 3DES, Blowfish, and CAST128 in CBC mode
-and Arcfour.
+See
+.Cm Ciphers
+for more information.
 .It Fl e Ar ch|^ch|none
 Sets the escape character for sessions with a pty (default:
 .Ql ~ ) .
@@ -549,6 +550,10 @@ from the local machine.
 Port forwardings can also be specified in the configuration file.
 Privileged ports can be forwarded only when
 logging in as root on the remote machine.
+.It Fl 1
+Forces
+.Nm
+to try protocol version 1 only.
 .It Fl 2
 Forces
 .Nm
@@ -562,22 +567,6 @@ Forces
 .Nm
 to use IPv6 addresses only.
 .El
-.Pp
-If
-.Nm
-is not invoked with one of the standard program names
-.Pf ( Dq ssh ,
-.Dq slogin ,
-.Dq rsh ,
-.Dq rlogin ,
-or
-.Dq remsh ) ,
-it uses this name as its
-.Ar hostname
-argument.
-This is consistent with traditional
-.Xr rsh 1
-behavior.
 .Sh CONFIGURATION FILES
 .Nm
 obtains configuration data from the following sources (in this order):
@@ -668,7 +657,12 @@ Specifies the ciphers allowed for protocol version 2
 in order of preference.
 Multiple ciphers must be comma-separated.
 The default is
-.Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes128-cbc .
+.Pp
+.Bd -literal
+  ``3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes128-cbc,
+    aes192-cbc,aes256-cbc,rijndael128-cbc,rijndael192-cbc,
+    rijndael256-cbc,rijndael-cbc@lysator.liu.se''
+.Ed
 .It Cm Compression
 Specifies whether to use compression.
 The argument must be
@@ -1276,5 +1270,4 @@ protocol versions 1.5 and 2.0.
 .Xr ssh-agent 1 ,
 .Xr ssh-keygen 1 ,
 .Xr telnet 1 ,
-.Xr sshd 8 ,
-.Xr ssl 8
+.Xr sshd 8