diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.469 2016/05/02 14:10:58 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.470 2016/05/24 04:43:45 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2617,10 +2617,11 @@ do_ssh2_kex(void) | |||
2617 | 2617 | ||
2618 | if (options.compression == COMP_NONE) { | 2618 | if (options.compression == COMP_NONE) { |
2619 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = | 2619 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
2620 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "none"; | 2620 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "none"; |
2621 | } else if (options.compression == COMP_DELAYED) { | 2621 | } else if (options.compression == COMP_DELAYED) { |
2622 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = | 2622 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
2623 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com"; | 2623 | myproposal[PROPOSAL_COMP_ALGS_STOC] = |
2624 | "none,zlib@openssh.com"; | ||
2624 | } | 2625 | } |
2625 | 2626 | ||
2626 | if (options.rekey_limit || options.rekey_interval) | 2627 | if (options.rekey_limit || options.rekey_interval) |