summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c7
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 @@
1/* $OpenBSD: packet.c,v 1.272 2018/07/06 09:03:02 sf Exp $ */ 1/* $OpenBSD: packet.c,v 1.273 2018/07/06 09:05:01 sf Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -879,9 +879,8 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
879 /* explicit_bzero(enc->iv, enc->block_size); 879 /* explicit_bzero(enc->iv, enc->block_size);
880 explicit_bzero(enc->key, enc->key_len); 880 explicit_bzero(enc->key, enc->key_len);
881 explicit_bzero(mac->key, mac->key_len); */ 881 explicit_bzero(mac->key, mac->key_len); */
882 if ((comp->type == COMP_ZLIB || 882 if (comp->type == COMP_DELAYED && state->after_authentication
883 (comp->type == COMP_DELAYED && 883 && comp->enabled == 0) {
884 state->after_authentication)) && comp->enabled == 0) {
885 if ((r = ssh_packet_init_compression(ssh)) < 0) 884 if ((r = ssh_packet_init_compression(ssh)) < 0)
886 return r; 885 return r;
887 if (mode == MODE_OUT) { 886 if (mode == MODE_OUT) {