tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Rename COMP_DELAYED to COMP_ZLIB 

Only delayed compression is supported nowadays.

ok markus@

OpenBSD-Commit-ID: 5b1dbaf3d9a4085aaa10fec0b7a4364396561821
This commit is contained in:
sf@openbsd.org 2018-07-06 09:06:14 +00:00 committed by Damien Miller
parent 95db395d2e
commit ab39267fa1
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kex.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kex.c,v 1.139 2018/07/06 09:05:01 sf Exp $ */ /* $OpenBSD: kex.c,v 1.140 2018/07/06 09:06:14 sf Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* *
@ -741,7 +741,7 @@ choose_comp(struct sshcomp *comp, char *client, char *server)
if (name == NULL) if (name == NULL)
return SSH_ERR_NO_COMPRESS_ALG_MATCH; return SSH_ERR_NO_COMPRESS_ALG_MATCH;
if (strcmp(name, "zlib@openssh.com") == 0) { if (strcmp(name, "zlib@openssh.com") == 0) {
comp->type = COMP_DELAYED; comp->type = COMP_ZLIB;
} else if (strcmp(name, "none") == 0) { } else if (strcmp(name, "none") == 0) {
comp->type = COMP_NONE; comp->type = COMP_NONE;
} else { } else {

4
kex.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kex.h,v 1.86 2018/07/06 09:05:01 sf Exp $ */ /* $OpenBSD: kex.h,v 1.87 2018/07/06 09:06:14 sf Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@ -64,7 +64,7 @@
#define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org" #define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org"
#define COMP_NONE 0 #define COMP_NONE 0
#define COMP_DELAYED 1 #define COMP_ZLIB 1
#define CURVE25519_SIZE 32 #define CURVE25519_SIZE 32

8
packet.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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->iv, enc->block_size);
explicit_bzero(enc->key, enc->key_len); explicit_bzero(enc->key, enc->key_len);
explicit_bzero(mac->key, mac->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) { && comp->enabled == 0) {
if ((r = ssh_packet_init_compression(ssh)) < 0) if ((r = ssh_packet_init_compression(ssh)) < 0)
return r; return r;
@ -970,7 +970,7 @@ ssh_packet_enable_delayed_compress(struct ssh *ssh)
/* /*
* Remember that we are past the authentication step, so rekeying * 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; state->after_authentication = 1;
for (mode = 0; mode < MODE_MAX; mode++) { for (mode = 0; mode < MODE_MAX; mode++) {
@ -978,7 +978,7 @@ ssh_packet_enable_delayed_compress(struct ssh *ssh)
if (state->newkeys[mode] == NULL) if (state->newkeys[mode] == NULL)
continue; continue;
comp = &state->newkeys[mode]->comp; 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) if ((r = ssh_packet_init_compression(ssh)) != 0)
return r; return r;
if (mode == MODE_OUT) { if (mode == MODE_OUT) {

8
servconf.c
View File

@ -1,5 +1,5 @@
/* $OpenBSD: servconf.c,v 1.335 2018/07/04 13:49:31 djm Exp $ */ /* $OpenBSD: servconf.c,v 1.336 2018/07/06 09:06:14 sf Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -349,7 +349,7 @@ fill_default_server_options(ServerOptions *options)
options->permit_user_env_whitelist = NULL; options->permit_user_env_whitelist = NULL;
} }
if (options->compression == -1) if (options->compression == -1)
options->compression = COMP_DELAYED; options->compression = COMP_ZLIB;
if (options->rekey_limit == -1) if (options->rekey_limit == -1)
options->rekey_limit = 0; options->rekey_limit = 0;
if (options->rekey_interval == -1) if (options->rekey_interval == -1)
@ -1170,8 +1170,8 @@ static const struct multistate multistate_permitrootlogin[] = {
{ NULL, -1 } { NULL, -1 }
}; };
static const struct multistate multistate_compression[] = { static const struct multistate multistate_compression[] = {
{ "yes", COMP_DELAYED }, { "yes", COMP_ZLIB },
{ "delayed", COMP_DELAYED }, { "delayed", COMP_ZLIB },
{ "no", COMP_NONE }, { "no", COMP_NONE },
{ NULL, -1 } { NULL, -1 }
}; };