From 7867a3b3885e461fa1f9ea9b70986484e28201ad Mon Sep 17 00:00:00 2001 From: sf Date: Tue, 10 Jul 2018 09:36:58 +0000 Subject: [PATCH] re-remove some pre-auth compression bits This time, make sure to not remove things that are necessary for pre-auth compression on the client. Add a comment that pre-auth compression is still supported in the client. ok markus@ --- usr.bin/ssh/kex.h | 3 ++- usr.bin/ssh/monitor_wrap.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/usr.bin/ssh/kex.h b/usr.bin/ssh/kex.h index fa22c1eb5e4..b6808f79b99 100644 --- a/usr.bin/ssh/kex.h +++ b/usr.bin/ssh/kex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.89 2018/07/09 21:56:06 markus Exp $ */ +/* $OpenBSD: kex.h,v 1.90 2018/07/10 09:36:58 sf Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -49,6 +49,7 @@ #define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org" #define COMP_NONE 0 +/* pre-auth compression (COMP_ZLIB) is only supported in the client */ #define COMP_ZLIB 1 #define COMP_DELAYED 2 diff --git a/usr.bin/ssh/monitor_wrap.c b/usr.bin/ssh/monitor_wrap.c index 70edc0b74b8..06c98e4b94d 100644 --- a/usr.bin/ssh/monitor_wrap.c +++ b/usr.bin/ssh/monitor_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.c,v 1.104 2018/07/10 09:13:30 djm Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.105 2018/07/10 09:36:58 sf Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -73,8 +73,6 @@ #include "ssherr.h" /* Imports */ -extern z_stream incoming_stream; -extern z_stream outgoing_stream; extern struct monitor *pmonitor; extern struct sshbuf *loginmsg; extern ServerOptions options; -- 2.20.1