summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2016-09-28 21:44:52 +0000
committerDamien Miller <djm@mindrot.org>2016-09-29 08:18:39 +1000
commitb7689155f3f5c4999846c07a852b1c7a43b09cec (patch)
tree9fedbd666c59b54e9c68f16d79e1b70e993ba570 /kex.h
parent4577adead6a7d600c8e764619d99477a08192c8f (diff)
downloadopenssh-git-b7689155f3f5c4999846c07a852b1c7a43b09cec.tar.gz
upstream commit
put back some pre-auth zlib bits that I shouldn't have removed - they are still used by the client. Spotted by naddy@ Upstream-ID: 80919468056031037d56a1f5b261c164a6f90dc2
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/kex.h b/kex.h
index 318c41d4..3794f212 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.80 2016/09/28 20:32:42 djm Exp $ */
+/* $OpenBSD: kex.h,v 1.81 2016/09/28 21:44:52 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -64,7 +64,8 @@
#define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org"
#define COMP_NONE 0
-#define COMP_DELAYED 1
+#define COMP_ZLIB 1
+#define COMP_DELAYED 2
#define CURVE25519_SIZE 32