summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-07-04 00:16:25 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-07-04 00:16:25 +0000
commit343010ad503ee040528d95b10d6cc4d0bde6c303 (patch)
tree1b790f8216a49d40f6239c5483f535dc7cea3090
parentfd2aacedabade08a5a3af613a6aca2c299776dd8 (diff)
- markus@cvs.openbsd.org 2002/07/01 19:48:46
[sshconnect2.c] for compression=yes, we fallback to no-compression if the server does not support compression, vice versa for compression=no. ok mouring@
-rw-r--r--ChangeLog6
-rw-r--r--sshconnect2.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c4545235..ed2115249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,10 @@
41 - deraadt@cvs.openbsd.org 2002/07/01 16:15:25 41 - deraadt@cvs.openbsd.org 2002/07/01 16:15:25
42 [msg.c] 42 [msg.c]
43 %u 43 %u
44 - markus@cvs.openbsd.org 2002/07/01 19:48:46
45 [sshconnect2.c]
46 for compression=yes, we fallback to no-compression if the server does
47 not support compression, vice versa for compression=no. ok mouring@
44 48
4520020702 4920020702
46 - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & 50 - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc &
@@ -1249,4 +1253,4 @@
1249 - (stevesk) entropy.c: typo in debug message 1253 - (stevesk) entropy.c: typo in debug message
1250 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1254 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1251 1255
1252$Id: ChangeLog,v 1.2326 2002/07/04 00:15:22 mouring Exp $ 1256$Id: ChangeLog,v 1.2327 2002/07/04 00:16:25 mouring Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index d396c77c6..0e93496b6 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.106 2002/06/30 21:59:45 deraadt Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.107 2002/07/01 19:48:46 markus Exp $");
27 27
28#include "ssh.h" 28#include "ssh.h"
29#include "ssh2.h" 29#include "ssh2.h"
@@ -95,10 +95,10 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
95 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); 95 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
96 if (options.compression) { 96 if (options.compression) {
97 myproposal[PROPOSAL_COMP_ALGS_CTOS] = 97 myproposal[PROPOSAL_COMP_ALGS_CTOS] =
98 myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib"; 98 myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib,none";
99 } else { 99 } else {
100 myproposal[PROPOSAL_COMP_ALGS_CTOS] = 100 myproposal[PROPOSAL_COMP_ALGS_CTOS] =
101 myproposal[PROPOSAL_COMP_ALGS_STOC] = "none"; 101 myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib";
102 } 102 }
103 if (options.macs != NULL) { 103 if (options.macs != NULL) {
104 myproposal[PROPOSAL_MAC_ALGS_CTOS] = 104 myproposal[PROPOSAL_MAC_ALGS_CTOS] =