upstream commit

restore pre-auth compression support in the client -- the
previous commit was intended to remove it from the server only.

remove a few server-side pre-auth compression bits that escaped

adjust wording of Compression directive in sshd_config(5)

pointed out by naddy@ ok markus@

Upstream-ID: d23696ed72a228dacd4839dd9f2dec424ba2016b

1 files changed, 3 insertions, 4 deletions

diff --git a/packet.c b/packet.c
index 002e8d49a..337304bd0 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.239 2016/09/28 16:33:07 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.240 2016/09/28 20:32:42 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -965,9 +965,8 @@ 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_ZLIB ||
-            (comp->type == COMP_DELAYED &&
-             state->after_authentication)) && comp->enabled == 0) {
+        if (comp->type == COMP_DELAYED && state->after_authentication &&
+            comp->enabled == 0) {
                 if ((r = ssh_packet_init_compression(ssh)) < 0)
                         return r;
                 if (mode == MODE_OUT) {