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

1 files changed, 2 insertions, 3 deletions

diff --git a/kex.h b/kex.h
index 382630660..318c41d4a 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.79 2016/09/22 21:15:41 djm Exp $ */
+/* $OpenBSD: kex.h,v 1.80 2016/09/28 20:32:42 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -64,8 +64,7 @@
 #define KEX_CURVE25519_SHA256_OLD       "curve25519-sha256@libssh.org"
 
 #define COMP_NONE       0
-#define COMP_ZLIB       1
-#define COMP_DELAYED    2
+#define COMP_DELAYED    1
 
 #define CURVE25519_SIZE 32