[src/trunk]: src/crypto/dist/ssh >for compression=yes, we fallback to no-comp...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1bb56d12509c
branches:  trunk
changeset: 533525:1bb56d12509c
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Jul 03 10:07:48 2002 +0000

description:
>for compression=yes, we fallback to no-compression if the server does
>not support compression, vice versa for compression=no. ok mouring@
sync w/openbsd

diffstat:

 crypto/dist/ssh/sshconnect2.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 0b92fee155ea -r 1bb56d12509c crypto/dist/ssh/sshconnect2.c
--- a/crypto/dist/ssh/sshconnect2.c     Wed Jul 03 10:06:39 2002 +0000
+++ b/crypto/dist/ssh/sshconnect2.c     Wed Jul 03 10:07:48 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sshconnect2.c,v 1.19 2002/07/01 06:17:13 itojun Exp $  */
+/*     $NetBSD: sshconnect2.c,v 1.20 2002/07/03 10:07:48 itojun Exp $  */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -24,7 +24,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"
@@ -96,10 +96,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] =