summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2016-09-28 20:32:42 +0000
committerDamien Miller <djm@mindrot.org>2016-09-29 06:54:50 +1000
commit4577adead6a7d600c8e764619d99477a08192c8f (patch)
tree1f825ee75953b95abab5a88ee9f8e241cab9eec1 /kex.c
parent80d1c963b4dc84ffd11d09617b39c4bffda08956 (diff)
downloadopenssh-git-4577adead6a7d600c8e764619d99477a08192c8f.tar.gz
upstream commit
restore pre-auth compression support in the client -- the previous commit was intended to remove it from the server only. remove a few server-side pre-auth compression bits that escaped adjust wording of Compression directive in sshd_config(5) pointed out by naddy@ ok markus@ Upstream-ID: d23696ed72a228dacd4839dd9f2dec424ba2016b
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kex.c b/kex.c
index 811e2cf6..c122361f 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.124 2016/09/22 17:52:53 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.125 2016/09/28 20:32:42 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
*
@@ -684,8 +684,6 @@ choose_comp(struct sshcomp *comp, char *client, char *server)
return SSH_ERR_NO_COMPRESS_ALG_MATCH;
if (strcmp(name, "zlib@openssh.com") == 0) {
comp->type = COMP_DELAYED;
- } else if (strcmp(name, "zlib") == 0) {
- comp->type = COMP_ZLIB;
} else if (strcmp(name, "none") == 0) {
comp->type = COMP_NONE;
} else {