- 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@

1 files changed, 6 insertions, 4 deletions

diff --git a/kex.c b/kex.c
index 06a3ad4cc..5dce335fe 100644
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.63 2005/07/17 07:17:55 djm Exp $");
+RCSID("$OpenBSD: kex.c,v 1.64 2005/07/25 11:59:39 markus Exp $");
 
 #include <openssl/crypto.h>
 
@@ -275,10 +275,12 @@ choose_comp(Comp *comp, char *client, char *server)
         char *name = match_list(client, server, NULL);
         if (name == NULL)
                 fatal("no matching comp found: client %s server %s", client, server);
-        if (strcmp(name, "zlib") == 0) {
-                comp->type = 1;
+        if (strcmp(name, "zlib@openssh.com") == 0) {
+                comp->type = COMP_DELAYED;
+        } else if (strcmp(name, "zlib") == 0) {
+                comp->type = COMP_ZLIB;
         } else if (strcmp(name, "none") == 0) {
-                comp->type = 0;
+                comp->type = COMP_NONE;
         } else {
                 fatal("unsupported comp %s", name);
         }