diff options
| author |   djm <djm@openbsd.org> | 2016-09-28 20:32:42 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2016-09-28 20:32:42 +0000 |
| commit | 049095fd94e456446a491ae16385a7193aa84c3a (patch) | |
| tree | e809085a0fe89bc8f444bdc7a951594d0fe66d33 /usr.bin/ssh/sshconnect2.c | |
| parent | Use the packed attribute for every structure that is used in the wire (diff) | |
| download | wireguard-openbsd-049095fd94e456446a491ae16385a7193aa84c3a.tar.xz wireguard-openbsd-049095fd94e456446a491ae16385a7193aa84c3a.zip | |
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@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index f975accacdc..460948ec927 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.249 2016/09/28 16:33:07 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.250 2016/09/28 20:32:42 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -168,7 +168,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) compat_cipher_proposal(options.ciphers); myproposal[PROPOSAL_COMP_ALGS_CTOS] = myproposal[PROPOSAL_COMP_ALGS_STOC] = options.compression ? - "zlib@openssh.com,none" : "none,zlib@openssh.com"; + "zlib@openssh.com,zlib,none" : "none,zlib@openssh.com,zlib"; myproposal[PROPOSAL_MAC_ALGS_CTOS] = myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; if (options.hostkeyalgorithms != NULL) { |