diff options
author | Damien Miller <djm@mindrot.org> | 2000-10-16 12:14:42 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-10-16 12:14:42 +1100 |
commit | 50a41ed079629fdcd9a1d2a781b73170422fc73a (patch) | |
tree | dbac99a364edff124412c16f079975a2e89a0389 /ssh.1 | |
parent | 5993935f76e66c957f02efaa8fc0c8ff8a3f92c9 (diff) |
- (djm) Sync with OpenBSD:
- markus@cvs.openbsd.org 2000/10/14 04:01:15
[cipher.c]
debug3
- markus@cvs.openbsd.org 2000/10/14 04:07:23
[scp.c]
remove spaces from arguments; from djm@mindrot.org
- markus@cvs.openbsd.org 2000/10/14 06:09:46
[ssh.1]
Cipher is for SSH-1 only
- markus@cvs.openbsd.org 2000/10/14 06:12:09
[servconf.c servconf.h serverloop.c session.c sshd.8]
AllowTcpForwarding; from naddy@
- markus@cvs.openbsd.org 2000/10/14 06:16:56
[auth2.c compat.c compat.h sshconnect2.c version.h]
OpenSSH_2.3; note that is is not complete, but the version number
needs to be changed for interoperability reasons
- markus@cvs.openbsd.org 2000/10/14 06:19:45
[auth-rsa.c]
do not send RSA challenge if key is not allowed by key-options; from
eivind@ThinkSec.com
- markus@cvs.openbsd.org 2000/10/15 08:14:01
[rijndael.c session.c]
typos; from stevesk@sweden.hp.com
- markus@cvs.openbsd.org 2000/10/15 08:18:31
[rijndael.c]
typo
- Copy manpages back over from OpenBSD - too tedious to wade through diffs
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -627,7 +627,8 @@ If the option is set to | |||
627 | .Dq no , | 627 | .Dq no , |
628 | the check will not be executed. | 628 | the check will not be executed. |
629 | .It Cm Cipher | 629 | .It Cm Cipher |
630 | Specifies the cipher to use for encrypting the session. | 630 | Specifies the cipher to use for encrypting the session |
631 | in protocol version 1 | ||
631 | Currently, | 632 | Currently, |
632 | .Dq blowfish , | 633 | .Dq blowfish , |
633 | and | 634 | and |
@@ -640,7 +641,7 @@ Specifies the ciphers allowed for protocol version 2 | |||
640 | in order of preference. | 641 | in order of preference. |
641 | Multiple ciphers must be comma-separated. | 642 | Multiple ciphers must be comma-separated. |
642 | The default is | 643 | The default is |
643 | .Dq 3des-cbc,blowfish-cbc,arcfour,cast128-cbc . | 644 | .Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour . |
644 | .It Cm Compression | 645 | .It Cm Compression |
645 | Specifies whether to use compression. | 646 | Specifies whether to use compression. |
646 | The argument must be | 647 | The argument must be |