diff options
| author |   dtucker <dtucker@openbsd.org> | 2016-05-24 04:43:45 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2016-05-24 04:43:45 +0000 |
| commit | 1b1c1c1b20ef1c59a78e468bc641712dfb0f23b2 (patch) | |
| tree | 0d58780085545c624e903102f63c776c3e90f6f1 | |
| parent | Disabling active cooling trip points when we lack the right method to operate. (diff) | |
| download | wireguard-openbsd-1b1c1c1b20ef1c59a78e468bc641712dfb0f23b2.tar.xz wireguard-openbsd-1b1c1c1b20ef1c59a78e468bc641712dfb0f23b2.zip | |
KNF compression proposal and simplify the client side a little. ok djm@
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 12 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.c | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 0365ee8a8e1..1698b598e9e 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/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. @@ -165,13 +165,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/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 9c9b19d4bfc..8001ce9ff18 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/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 @@ -2437,10 +2437,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) |