upstream: Remove leftovers from pre-authentication compression

Support for this has been removed in 2016.
COMP_DELAYED will be renamed in a later commit.

ok markus@

OpenBSD-Commit-ID: 6a99616c832627157113fcb0cf5a752daf2e6b58

1 files changed, 3 insertions, 4 deletions

diff --git a/packet.c b/packet.c
index 4da9f52b6..a39a340f3 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.272 2018/07/06 09:03:02 sf Exp $ */
+/* $OpenBSD: packet.c,v 1.273 2018/07/06 09:05:01 sf Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -879,9 +879,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) {