From 54880067830dddd9611bc8c6145a396f208b76ca Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 27 Sep 2024 10:42:40 +0200 Subject: Merging upstream version 1:9.9p1. Signed-off-by: Daniel Baumann --- kex.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'kex.c') diff --git a/kex.c b/kex.c index 63aae5d..6b957e5 100644 --- a/kex.c +++ b/kex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.186 2024/05/17 00:30:23 djm Exp $ */ +/* $OpenBSD: kex.c,v 1.187 2024/08/23 04:51:00 deraadt Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -842,8 +842,6 @@ choose_comp(struct sshcomp *comp, char *client, char *server) #ifdef WITH_ZLIB if (strcmp(name, "zlib@openssh.com") == 0) { comp->type = COMP_DELAYED; - } else if (strcmp(name, "zlib") == 0) { - comp->type = COMP_ZLIB; } else #endif /* WITH_ZLIB */ if (strcmp(name, "none") == 0) { -- cgit v1.2.3