diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-05-24 06:43:45 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-06-06 03:25:38 +0200 |
| commit | 8c02e3639acefe1e447e293dbe23a0917abd3734 (patch) | |
| tree | d8684e7c071c74449b9136ead1ef56623d9941f1 | |
| parent | upstream commit (diff) | |
| download | openssh-8c02e3639acefe1e447e293dbe23a0917abd3734.tar.xz openssh-8c02e3639acefe1e447e293dbe23a0917abd3734.zip | |
upstream commit
KNF compression proposal and simplify the client side a
little. ok djm@
Upstream-ID: aa814b694efe9e5af8a26e4c80a05526ae6d6605
| -rw-r--r-- | sshconnect2.c | 12 | ||||
| -rw-r--r-- | sshd.c | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index c0814e5bc..3d3c7bf42 100644 --- 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) { @@ -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) |