summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authorsf@openbsd.org <sf@openbsd.org>2018-07-06 09:05:01 +0000
committerDamien Miller <djm@mindrot.org>2018-07-10 15:13:40 +1000
commit95db395d2e56a6f868193aead6cadb2493f036c6 (patch)
tree23c5d15ca0cb14e4e3e313f75e0f2edb6f1616a8 /kex.c
parentf28a4d5cd24c4aa177e96b4f96957991e552cb70 (diff)
upstream: Remove leftovers from pre-authentication compression
Support for this has been removed in 2016. COMP_DELAYED will be renamed in a later commit. ok markus@ OpenBSD-Commit-ID: 6a99616c832627157113fcb0cf5a752daf2e6b58
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 2fd052e96..0c444e186 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.c,v 1.138 2018/07/04 13:49:31 djm Exp $ */ 1/* $OpenBSD: kex.c,v 1.139 2018/07/06 09:05:01 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 *
@@ -742,8 +742,6 @@ choose_comp(struct sshcomp *comp, char *client, char *server)
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_DELAYED;
745 } else if (strcmp(name, "zlib") == 0) {
746 comp->type = COMP_ZLIB;
747 } else if (strcmp(name, "none") == 0) { 745 } else if (strcmp(name, "none") == 0) {
748 comp->type = COMP_NONE; 746 comp->type = COMP_NONE;
749 } else { 747 } else {