tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
sf@openbsd.org 2018-07-10 09:36:58 +00:00 committed by Damien Miller
parent 120a1ec74e
commit 984bacfaac
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kex.h
View File

@ -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. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@ -63,6 +63,7 @@
#define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org" #define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org"
#define COMP_NONE 0 #define COMP_NONE 0
/* pre-auth compression (COMP_ZLIB) is only supported in the client */
#define COMP_ZLIB 1 #define COMP_ZLIB 1
#define COMP_DELAYED 2 #define COMP_DELAYED 2

4
monitor_wrap.c
View File

@ -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 <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -84,8 +84,6 @@
#include "ssherr.h" #include "ssherr.h"
/* Imports */ /* Imports */
extern z_stream incoming_stream;
extern z_stream outgoing_stream;
extern struct monitor *pmonitor; extern struct monitor *pmonitor;
extern struct sshbuf *loginmsg; extern struct sshbuf *loginmsg;
extern ServerOptions options; extern ServerOptions options;