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 /sshd.c | |
| 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
Diffstat (limited to '')
| -rw-r--r-- | sshd.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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) |