diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-01-23 10:24:29 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-01-23 21:53:54 +1100 |
| commit | 7f8e66fea8c4e2a910df9067cb7638999b7764d5 (patch) | |
| tree | 88c1a4a73a03cfa993fee0c1f23b6327ef1351a1 /sshconnect2.c | |
| parent | 69ac4e33023b379e9a8e9b4b6aeeffa6d1fcf6fa (diff) | |
upstream: Make zlib optional. This adds a "ZLIB" build time option
that allows building without zlib compression and associated options. With
feedback from markus@, ok djm@
OpenBSD-Commit-ID: 44c6e1133a90fd15a3aa865bdedc53bab28b7910
Diffstat (limited to 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 8d13310f2..3b84a2d56 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sshconnect2.c,v 1.317 2020/01/23 07:10:22 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.318 2020/01/23 10:24:30 dtucker Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
| 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
| @@ -174,8 +174,8 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port) | |||
| 174 | myproposal[PROPOSAL_ENC_ALGS_STOC] = | 174 | myproposal[PROPOSAL_ENC_ALGS_STOC] = |
| 175 | compat_cipher_proposal(options.ciphers); | 175 | compat_cipher_proposal(options.ciphers); |
| 176 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = | 176 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
| 177 | myproposal[PROPOSAL_COMP_ALGS_STOC] = options.compression ? | 177 | myproposal[PROPOSAL_COMP_ALGS_STOC] = |
| 178 | "zlib@openssh.com,zlib,none" : "none,zlib@openssh.com,zlib"; | 178 | (char *)compression_alg_list(options.compression); |
| 179 | myproposal[PROPOSAL_MAC_ALGS_CTOS] = | 179 | myproposal[PROPOSAL_MAC_ALGS_CTOS] = |
| 180 | myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; | 180 | myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; |
| 181 | if (options.hostkeyalgorithms != NULL) { | 181 | if (options.hostkeyalgorithms != NULL) { |