diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-09-28 21:44:52 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-09-29 08:18:39 +1000 |
commit | b7689155f3f5c4999846c07a852b1c7a43b09cec (patch) | |
tree | 9fedbd666c59b54e9c68f16d79e1b70e993ba570 /kex.c | |
parent | 4577adead6a7d600c8e764619d99477a08192c8f (diff) |
upstream commit
put back some pre-auth zlib bits that I shouldn't have
removed - they are still used by the client. Spotted by naddy@
Upstream-ID: 80919468056031037d56a1f5b261c164a6f90dc2
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.c,v 1.125 2016/09/28 20:32:42 djm Exp $ */ | 1 | /* $OpenBSD: kex.c,v 1.126 2016/09/28 21:44:52 djm 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 | * |
@@ -684,6 +684,8 @@ choose_comp(struct sshcomp *comp, char *client, char *server) | |||
684 | return SSH_ERR_NO_COMPRESS_ALG_MATCH; | 684 | return SSH_ERR_NO_COMPRESS_ALG_MATCH; |
685 | if (strcmp(name, "zlib@openssh.com") == 0) { | 685 | if (strcmp(name, "zlib@openssh.com") == 0) { |
686 | comp->type = COMP_DELAYED; | 686 | comp->type = COMP_DELAYED; |
687 | } else if (strcmp(name, "zlib") == 0) { | ||
688 | comp->type = COMP_ZLIB; | ||
687 | } else if (strcmp(name, "none") == 0) { | 689 | } else if (strcmp(name, "none") == 0) { |
688 | comp->type = COMP_NONE; | 690 | comp->type = COMP_NONE; |
689 | } else { | 691 | } else { |