diff options
-rw-r--r-- | kex.c | 4 | ||||
-rw-r--r-- | kex.h | 4 | ||||
-rw-r--r-- | packet.c | 8 | ||||
-rw-r--r-- | servconf.c | 8 |
4 files changed, 12 insertions, 12 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.c,v 1.139 2018/07/06 09:05:01 sf Exp $ */ | 1 | /* $OpenBSD: kex.c,v 1.140 2018/07/06 09:06:14 sf Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -741,7 +741,7 @@ choose_comp(struct sshcomp *comp, char *client, char *server) | |||
741 | if (name == NULL) | 741 | if (name == NULL) |
742 | return SSH_ERR_NO_COMPRESS_ALG_MATCH; | 742 | return SSH_ERR_NO_COMPRESS_ALG_MATCH; |
743 | if (strcmp(name, "zlib@openssh.com") == 0) { | 743 | if (strcmp(name, "zlib@openssh.com") == 0) { |
744 | comp->type = COMP_DELAYED; | 744 | comp->type = COMP_ZLIB; |
745 | } else if (strcmp(name, "none") == 0) { | 745 | } else if (strcmp(name, "none") == 0) { |
746 | comp->type = COMP_NONE; | 746 | comp->type = COMP_NONE; |
747 | } else { | 747 | } else { |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.86 2018/07/06 09:05:01 sf Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.87 2018/07/06 09:06:14 sf Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -64,7 +64,7 @@ | |||
64 | #define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org" | 64 | #define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org" |
65 | 65 | ||
66 | #define COMP_NONE 0 | 66 | #define COMP_NONE 0 |
67 | #define COMP_DELAYED 1 | 67 | #define COMP_ZLIB 1 |
68 | 68 | ||
69 | #define CURVE25519_SIZE 32 | 69 | #define CURVE25519_SIZE 32 |
70 | 70 | ||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.273 2018/07/06 09:05:01 sf Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.274 2018/07/06 09:06:14 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,7 +879,7 @@ 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_DELAYED && state->after_authentication | 882 | if (comp->type == COMP_ZLIB && state->after_authentication |
883 | && comp->enabled == 0) { | 883 | && comp->enabled == 0) { |
884 | if ((r = ssh_packet_init_compression(ssh)) < 0) | 884 | if ((r = ssh_packet_init_compression(ssh)) < 0) |
885 | return r; | 885 | return r; |
@@ -970,7 +970,7 @@ ssh_packet_enable_delayed_compress(struct ssh *ssh) | |||
970 | 970 | ||
971 | /* | 971 | /* |
972 | * Remember that we are past the authentication step, so rekeying | 972 | * Remember that we are past the authentication step, so rekeying |
973 | * with COMP_DELAYED will turn on compression immediately. | 973 | * with COMP_ZLIB will turn on compression immediately. |
974 | */ | 974 | */ |
975 | state->after_authentication = 1; | 975 | state->after_authentication = 1; |
976 | for (mode = 0; mode < MODE_MAX; mode++) { | 976 | for (mode = 0; mode < MODE_MAX; mode++) { |
@@ -978,7 +978,7 @@ ssh_packet_enable_delayed_compress(struct ssh *ssh) | |||
978 | if (state->newkeys[mode] == NULL) | 978 | if (state->newkeys[mode] == NULL) |
979 | continue; | 979 | continue; |
980 | comp = &state->newkeys[mode]->comp; | 980 | comp = &state->newkeys[mode]->comp; |
981 | if (comp && !comp->enabled && comp->type == COMP_DELAYED) { | 981 | if (comp && !comp->enabled && comp->type == COMP_ZLIB) { |
982 | if ((r = ssh_packet_init_compression(ssh)) != 0) | 982 | if ((r = ssh_packet_init_compression(ssh)) != 0) |
983 | return r; | 983 | return r; |
984 | if (mode == MODE_OUT) { | 984 | if (mode == MODE_OUT) { |
diff --git a/servconf.c b/servconf.c index a54219f01..f5272b0f9 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.335 2018/07/04 13:49:31 djm Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.336 2018/07/06 09:06:14 sf Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -349,7 +349,7 @@ fill_default_server_options(ServerOptions *options) | |||
349 | options->permit_user_env_whitelist = NULL; | 349 | options->permit_user_env_whitelist = NULL; |
350 | } | 350 | } |
351 | if (options->compression == -1) | 351 | if (options->compression == -1) |
352 | options->compression = COMP_DELAYED; | 352 | options->compression = COMP_ZLIB; |
353 | if (options->rekey_limit == -1) | 353 | if (options->rekey_limit == -1) |
354 | options->rekey_limit = 0; | 354 | options->rekey_limit = 0; |
355 | if (options->rekey_interval == -1) | 355 | if (options->rekey_interval == -1) |
@@ -1170,8 +1170,8 @@ static const struct multistate multistate_permitrootlogin[] = { | |||
1170 | { NULL, -1 } | 1170 | { NULL, -1 } |
1171 | }; | 1171 | }; |
1172 | static const struct multistate multistate_compression[] = { | 1172 | static const struct multistate multistate_compression[] = { |
1173 | { "yes", COMP_DELAYED }, | 1173 | { "yes", COMP_ZLIB }, |
1174 | { "delayed", COMP_DELAYED }, | 1174 | { "delayed", COMP_ZLIB }, |
1175 | { "no", COMP_NONE }, | 1175 | { "no", COMP_NONE }, |
1176 | { NULL, -1 } | 1176 | { NULL, -1 } |
1177 | }; | 1177 | }; |