diff options
author | Damien Miller <djm@mindrot.org> | 2000-10-28 14:19:58 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-10-28 14:19:58 +1100 |
commit | 69b69aa50d0effadc8b7e9c564f7a2ee223ac6b5 (patch) | |
tree | 4aea8b2b116123812ade69ae73fde80fee8e0f41 /ssh.1 | |
parent | c05e01875bab590584f51bbeb464dd23c64f27fa (diff) |
- (djm) Sync with OpenBSD:
- markus@cvs.openbsd.org 2000/10/16 15:46:32
[ssh.1]
fixes from pekkas@netcore.fi
- markus@cvs.openbsd.org 2000/10/17 14:28:11
[atomicio.c]
return number of characters processed; ok deraadt@
- markus@cvs.openbsd.org 2000/10/18 12:04:02
[atomicio.c]
undo
- markus@cvs.openbsd.org 2000/10/18 12:23:02
[scp.c]
replace atomicio(read,...) with read(); ok deraadt@
- markus@cvs.openbsd.org 2000/10/18 12:42:00
[session.c]
restore old record login behaviour
- deraadt@cvs.openbsd.org 2000/10/19 10:41:13
[auth-skey.c]
fmt string problem in unused code
- provos@cvs.openbsd.org 2000/10/19 10:45:16
[sshconnect2.c]
don't reference freed memory. okay deraadt@
- markus@cvs.openbsd.org 2000/10/21 11:04:23
[canohost.c]
typo, eramore@era-t.ericsson.se; ok niels@
- markus@cvs.openbsd.org 2000/10/23 13:31:55
[cipher.c]
non-alignment dependent swap_bytes(); from
simonb@wasabisystems.com/netbsd
- markus@cvs.openbsd.org 2000/10/26 12:38:28
[compat.c]
add older vandyke products
- markus@cvs.openbsd.org 2000/10/27 01:32:19
[channels.c channels.h clientloop.c serverloop.c session.c]
[ssh.c util.c]
enable non-blocking IO on channels, and tty's (except for the
client ttys).
- markus@cvs.openbsd.org 2000/10/27 01:48:22
channels.c channels.h clientloop.c
deny agent/x11 forwarding unless requested; thanks to jwl@pobox.com
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -34,6 +34,7 @@ | |||
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.64 2000/10/16 21:46:31 markus Exp $ | ||
37 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
38 | .Dt SSH 1 | 39 | .Dt SSH 1 |
39 | .Os | 40 | .Os |
@@ -367,7 +368,7 @@ It is believed to be secure. | |||
367 | (triple-des) is an encrypt-decrypt-encrypt triple with three different keys. | 368 | (triple-des) is an encrypt-decrypt-encrypt triple with three different keys. |
368 | It is presumably more secure than the | 369 | It is presumably more secure than the |
369 | .Ar des | 370 | .Ar des |
370 | cipher which is no longer supported in | 371 | cipher which is no longer fully supported in |
371 | .Nm ssh . | 372 | .Nm ssh . |
372 | .Ar blowfish | 373 | .Ar blowfish |
373 | is a fast block cipher, it appears very secure and is much faster than | 374 | is a fast block cipher, it appears very secure and is much faster than |
@@ -628,9 +629,9 @@ If the option is set to | |||
628 | the check will not be executed. | 629 | the check will not be executed. |
629 | .It Cm Cipher | 630 | .It Cm Cipher |
630 | Specifies the cipher to use for encrypting the session | 631 | Specifies the cipher to use for encrypting the session |
631 | in protocol version 1 | 632 | in protocol version 1. |
632 | Currently, | 633 | Currently, |
633 | .Dq blowfish , | 634 | .Dq blowfish |
634 | and | 635 | and |
635 | .Dq 3des | 636 | .Dq 3des |
636 | are supported. | 637 | are supported. |