summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kex.h3
-rw-r--r--monitor_wrap.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/kex.h b/kex.h
index 209008189..d36e4d150 100644
--- a/kex.h
+++ b/kex.h
@@ -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 */
87extern z_stream incoming_stream;
88extern z_stream outgoing_stream;
89extern struct monitor *pmonitor; 87extern struct monitor *pmonitor;
90extern struct sshbuf *loginmsg; 88extern struct sshbuf *loginmsg;
91extern ServerOptions options; 89extern ServerOptions options;