upstream commit

put back some pre-auth zlib bits that I shouldn't have
removed - they are still used by the client. Spotted by naddy@

Upstream-ID: 80919468056031037d56a1f5b261c164a6f90dc2

1 files changed, 3 insertions, 1 deletions

diff --git a/kex.c b/kex.c
index c122361f2..3f97f8c00 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.125 2016/09/28 20:32:42 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.126 2016/09/28 21:44:52 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -684,6 +684,8 @@ choose_comp(struct sshcomp *comp, char *client, char *server)
                 return SSH_ERR_NO_COMPRESS_ALG_MATCH;
         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 = COMP_NONE;
         } else {