diff options
author | Damien Miller <djm@mindrot.org> | 2005-07-26 21:54:56 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-07-26 21:54:56 +1000 |
commit | 9786e6e2a034a8273b5d0d3b8cd8caf063bb875a (patch) | |
tree | 0322eb7ffcdd5600fb25094e9627cd62291da2e4 /sshconnect2.c | |
parent | 47655ee03a67ed89ef55c957e5a8183ca3113d2c (diff) |
- markus@cvs.openbsd.org 2005/07/25 11:59:40
[kex.c kex.h myproposal.h packet.c packet.h servconf.c session.c]
[sshconnect2.c sshd.c sshd_config sshd_config.5]
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 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 012ce2b42..baee664ea 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.140 2005/07/17 07:17:55 djm Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.141 2005/07/25 11:59:40 markus Exp $"); |
27 | 27 | ||
28 | #include "openbsd-compat/sys-queue.h" | 28 | #include "openbsd-compat/sys-queue.h" |
29 | 29 | ||
@@ -101,10 +101,10 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) | |||
101 | compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); | 101 | compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); |
102 | if (options.compression) { | 102 | if (options.compression) { |
103 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = | 103 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
104 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib,none"; | 104 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib@openssh.com,zlib,none"; |
105 | } else { | 105 | } else { |
106 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = | 106 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
107 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib"; | 107 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com,zlib"; |
108 | } | 108 | } |
109 | if (options.macs != NULL) { | 109 | if (options.macs != NULL) { |
110 | myproposal[PROPOSAL_MAC_ALGS_CTOS] = | 110 | myproposal[PROPOSAL_MAC_ALGS_CTOS] = |