upstream commit

KNF compression proposal and simplify the client side a
 little.  ok djm@

Upstream-ID: aa814b694efe9e5af8a26e4c80a05526ae6d6605

diff --git a/sshconnect2.c b/sshconnect2.c
index c0814e5bcdf4e6803e415030ebae0e059b222364..3d3c7bf420966bd0951886404c1fffcc43806eef 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.244 2016/05/23 23:30:50 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.245 2016/05/24 04:43:45 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -171,13 +171,9 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
            compat_cipher_proposal(options.ciphers);
        myproposal[PROPOSAL_ENC_ALGS_STOC] =
            compat_cipher_proposal(options.ciphers);
-       if (options.compression) {
-               myproposal[PROPOSAL_COMP_ALGS_CTOS] =
-               myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib@openssh.com,zlib,none";
-       } else {
-               myproposal[PROPOSAL_COMP_ALGS_CTOS] =
-               myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com,zlib";
-       }
+       myproposal[PROPOSAL_COMP_ALGS_CTOS] =
+           myproposal[PROPOSAL_COMP_ALGS_STOC] = options.compression ?
+           "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) {

diff --git a/sshd.c b/sshd.c
index 0200691e83c845535531d6ef0b3079199c0d5938..799c7711f49c69c1d1b92544ace51a4bf57b6ef4 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.469 2016/05/02 14:10:58 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.470 2016/05/24 04:43:45 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2617,10 +2617,11 @@ do_ssh2_kex(void)
 
        if (options.compression == COMP_NONE) {
                myproposal[PROPOSAL_COMP_ALGS_CTOS] =
-               myproposal[PROPOSAL_COMP_ALGS_STOC] = "none";
+                   myproposal[PROPOSAL_COMP_ALGS_STOC] = "none";
        } else if (options.compression == COMP_DELAYED) {
                myproposal[PROPOSAL_COMP_ALGS_CTOS] =
-               myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com";
+                   myproposal[PROPOSAL_COMP_ALGS_STOC] =
+                   "none,zlib@openssh.com";
        }
 
        if (options.rekey_limit || options.rekey_interval)