diff options
| author |   markus <markus@openbsd.org> | 2005-07-25 11:59:39 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2005-07-25 11:59:39 +0000 |
| commit | b24e4443a133b5bb32af0c8a62d1a78ce5df2085 (patch) | |
| tree | 91b0d8a4fe14a00ad9c9dcd931b74420c56e4781 /usr.bin/ssh/sshconnect2.c | |
| parent | forgot these ... (diff) | |
| download | wireguard-openbsd-b24e4443a133b5bb32af0c8a62d1a78ce5df2085.tar.xz wireguard-openbsd-b24e4443a133b5bb32af0c8a62d1a78ce5df2085.zip | |
add a new compression method that delays compression until the user
has been authenticated successfully and set compression to 'delayed'
for sshd.
this breaks older openssh clients (< 3.5) if they insist on
compression, so you have to re-enable compression in sshd_config.
ok djm@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 7e0a9509c39..331e7096459 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.140 2005/07/17 07:17:55 djm Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.141 2005/07/25 11:59:40 markus Exp $"); #include "ssh.h" #include "ssh2.h" @@ -99,10 +99,10 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); if (options.compression) { myproposal[PROPOSAL_COMP_ALGS_CTOS] = - myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib,none"; + myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib@openssh.com,zlib,none"; } else { myproposal[PROPOSAL_COMP_ALGS_CTOS] = - myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib"; + myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com,zlib"; } if (options.macs != NULL) { myproposal[PROPOSAL_MAC_ALGS_CTOS] = |