- 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@
diff --git a/ChangeLog b/ChangeLog
index 1c45452..ed21152 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,10 @@
- deraadt@cvs.openbsd.org 2002/07/01 16:15:25
[msg.c]
%u
+ - 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@
20020702
- (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc &
@@ -1249,4 +1253,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2326 2002/07/04 00:15:22 mouring Exp $
+$Id: ChangeLog,v 1.2327 2002/07/04 00:16:25 mouring Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index d396c77..0e93496 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.106 2002/06/30 21:59:45 deraadt Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.107 2002/07/01 19:48:46 markus Exp $");
#include "ssh.h"
#include "ssh2.h"
@@ -95,10 +95,10 @@
compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
if (options.compression) {
myproposal[PROPOSAL_COMP_ALGS_CTOS] =
- myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib";
+ myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib,none";
} else {
myproposal[PROPOSAL_COMP_ALGS_CTOS] =
- myproposal[PROPOSAL_COMP_ALGS_STOC] = "none";
+ myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib";
}
if (options.macs != NULL) {
myproposal[PROPOSAL_MAC_ALGS_CTOS] =