diff options
author | sf@openbsd.org <sf@openbsd.org> | 2018-07-10 09:36:58 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-07-11 09:52:08 +1000 |
commit | 984bacfaacbbe31c35191b828fb5b5b2f0362c36 (patch) | |
tree | 72ffe63312c4d8673332a9a0354ea7456a7294e7 | |
parent | 120a1ec74e8d9d29f4eb9a27972ddd22351ddef9 (diff) |
upstream: 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@
OpenBSD-Commit-ID: 282c6fec7201f18a5c333bbb68d9339734d2f784
-rw-r--r-- | kex.h | 3 | ||||
-rw-r--r-- | monitor_wrap.c | 4 |
2 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.89 2018/07/09 21:56:06 markus Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.90 2018/07/10 09:36:58 sf Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -63,6 +63,7 @@ | |||
63 | #define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org" | 63 | #define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org" |
64 | 64 | ||
65 | #define COMP_NONE 0 | 65 | #define COMP_NONE 0 |
66 | /* pre-auth compression (COMP_ZLIB) is only supported in the client */ | ||
66 | #define COMP_ZLIB 1 | 67 | #define COMP_ZLIB 1 |
67 | #define COMP_DELAYED 2 | 68 | #define COMP_DELAYED 2 |
68 | 69 | ||
diff --git a/monitor_wrap.c b/monitor_wrap.c index e970da2e3..f291ac085 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.104 2018/07/10 09:13:30 djm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.105 2018/07/10 09:36:58 sf Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -84,8 +84,6 @@ | |||
84 | #include "ssherr.h" | 84 | #include "ssherr.h" |
85 | 85 | ||
86 | /* Imports */ | 86 | /* Imports */ |
87 | extern z_stream incoming_stream; | ||
88 | extern z_stream outgoing_stream; | ||
89 | extern struct monitor *pmonitor; | 87 | extern struct monitor *pmonitor; |
90 | extern struct sshbuf *loginmsg; | 88 | extern struct sshbuf *loginmsg; |
91 | extern ServerOptions options; | 89 | extern ServerOptions options; |