diff options
| author | sf@openbsd.org <sf@openbsd.org> | 2018-07-06 11:06:14 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-07-10 07:13:40 +0200 |
| commit | ab39267fa1243d02b6c330615539fc4b21e17dc4 (patch) | |
| tree | e1a1525b384e439f41f4a4b106a93efee07b6ac1 /packet.c | |
| parent | upstream: Remove leftovers from pre-authentication compression (diff) | |
| download | openssh-ab39267fa1243d02b6c330615539fc4b21e17dc4.tar.xz openssh-ab39267fa1243d02b6c330615539fc4b21e17dc4.zip | |
upstream: Rename COMP_DELAYED to COMP_ZLIB
Only delayed compression is supported nowadays.
ok markus@
OpenBSD-Commit-ID: 5b1dbaf3d9a4085aaa10fec0b7a4364396561821
Diffstat (limited to 'packet.c')
| -rw-r--r-- | packet.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 @@ -879,7 +879,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; @@ -970,7 +970,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++) { @@ -978,7 +978,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) { |