1 files changed, 6 insertions, 6 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index 215f76ca2..703d0721f 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.105 2002/06/23 03:30:17 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 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
             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] =
@@ -422,7 +422,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)
         clear_auth_state(authctxt);
         dispatch_set(SSH2_MSG_USERAUTH_PK_OK, NULL);
 
-        /* try another method if we did not send a packet*/
+        /* try another method if we did not send a packet */
         if (sent == 0)
                 userauth(authctxt, NULL);
 
@@ -947,9 +947,9 @@ ssh_keysign(Key *key, u_char **sigp, u_int *lenp,
         buffer_init(&b);
         buffer_put_int(&b, packet_get_connection_in()); /* send # of socket */
         buffer_put_string(&b, data, datalen);
-        msg_send(to[1], version, &b);
+        ssh_msg_send(to[1], version, &b);
 
-        if (msg_recv(from[0], &b) < 0) {
+        if (ssh_msg_recv(from[0], &b) < 0) {
                 error("ssh_keysign: no reply");
                 buffer_clear(&b);
                 return -1;