summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshconnect2.c
diff options
context:
space:
mode:
authorsf <sf@openbsd.org>2018-07-06 09:05:01 +0000
committersf <sf@openbsd.org>2018-07-06 09:05:01 +0000
commitcc86c4925836bf60b213b8a6b1dbb696a55b8b9a (patch)
treea420dc0c6125ae6aa02103762f50e7caf6b75b56 /usr.bin/ssh/sshconnect2.c
parentRemove unused ssh_packet_start_compression() (diff)
downloadwireguard-openbsd-cc86c4925836bf60b213b8a6b1dbb696a55b8b9a.tar.xz
wireguard-openbsd-cc86c4925836bf60b213b8a6b1dbb696a55b8b9a.zip
Remove leftovers from pre-authentication compression
Support for this has been removed in 2016. COMP_DELAYED will be renamed in a later commit. ok markus@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
-rw-r--r--usr.bin/ssh/sshconnect2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index 74b1ecb2545..2469e36c239 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.275 2018/07/04 13:49:31 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.276 2018/07/06 09:05:01 sf 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,zlib,none" : "none,zlib@openssh.com,zlib";
+ "zlib@openssh.com,none" : "none,zlib@openssh.com";
myproposal[PROPOSAL_MAC_ALGS_CTOS] =
myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
if (options.hostkeyalgorithms != NULL) {