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, 4 insertions, 3 deletions

diff --git a/packet.c b/packet.c
index 337304bd0..50de0267a 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.240 2016/09/28 20:32:42 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.241 2016/09/28 21:44:52 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -965,8 +965,9 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
         /* explicit_bzero(enc->iv,  enc->block_size);
            explicit_bzero(enc->key, enc->key_len);
            explicit_bzero(mac->key, mac->key_len); */
-        if (comp->type == COMP_DELAYED && state->after_authentication &&
-            comp->enabled == 0) {
+        if ((comp->type == COMP_ZLIB ||
+            (comp->type == COMP_DELAYED &&
+             state->after_authentication)) && comp->enabled == 0) {
                 if ((r = ssh_packet_init_compression(ssh)) < 0)
                         return r;
                 if (mode == MODE_OUT) {