diff options
| author | Stefan Fritsch <sf@cvs.openbsd.org> | 2018-07-06 09:06:15 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@cvs.openbsd.org> | 2018-07-06 09:06:15 +0000 |
| commit | 2313ae906efdc75efcb1cb648d964fa29d140a07 (patch) | |
| tree | ebdec1517d961cfb43320f938556f26219fbfacf /usr.bin/ssh/packet.c | |
| parent | 8119153a122bc9138966b15ebfd16910863f9cf7 (diff) | |
Rename COMP_DELAYED to COMP_ZLIB
Only delayed compression is supported nowadays.
ok markus@
Diffstat (limited to 'usr.bin/ssh/packet.c')
| -rw-r--r-- | usr.bin/ssh/packet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index ec7784d504f..2ca11c40616 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/packet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.273 2018/07/06 09:05:01 sf Exp $ */ +/* $OpenBSD: packet.c,v 1.274 2018/07/06 09:06:14 sf Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -868,7 +868,7 @@ 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 + if (comp->type == COMP_ZLIB && state->after_authentication && comp->enabled == 0) { if ((r = ssh_packet_init_compression(ssh)) < 0) return r; @@ -959,7 +959,7 @@ ssh_packet_enable_delayed_compress(struct ssh *ssh) /* * Remember that we are past the authentication step, so rekeying - * with COMP_DELAYED will turn on compression immediately. + * with COMP_ZLIB will turn on compression immediately. */ state->after_authentication = 1; for (mode = 0; mode < MODE_MAX; mode++) { @@ -967,7 +967,7 @@ ssh_packet_enable_delayed_compress(struct ssh *ssh) if (state->newkeys[mode] == NULL) continue; comp = &state->newkeys[mode]->comp; - if (comp && !comp->enabled && comp->type == COMP_DELAYED) { + if (comp && !comp->enabled && comp->type == COMP_ZLIB) { if ((r = ssh_packet_init_compression(ssh)) != 0) return r; if (mode == MODE_OUT) { |