Merge 4.2p1 to the trunk.

1 files changed, 58 insertions, 5 deletions

diff --git a/packet.c b/packet.c
index e2607b20f..4becde0a4 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.116 2004/10/20 11:48:53 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.119 2005/07/28 17:36:22 markus Exp $");
 
 #include "openbsd-compat/sys-queue.h"
 
@@ -118,6 +118,12 @@ static int initialized = 0;
 /* Set to true if the connection is interactive. */
 static int interactive_mode = 0;
 
+/* Set to true if we are the server side. */
+static int server_side = 0;
+
+/* Set to true if we are authenticated. */
+static int after_authentication = 0;
+
 /* Session key information for Encryption and MAC */
 Newkeys *newkeys[MODE_MAX];
 static struct packet_state {
@@ -627,7 +633,9 @@ set_newkeys(int mode)
         /* Deleting the keys does not gain extra security */
         /* memset(enc->iv,  0, enc->block_size);
            memset(enc->key, 0, enc->key_len); */
-        if (comp->type != 0 && comp->enabled == 0) {
+        if ((comp->type == COMP_ZLIB ||
+            (comp->type == COMP_DELAYED && after_authentication)) &&
+            comp->enabled == 0) {
                 packet_init_compression();
                 if (mode == MODE_OUT)
                         buffer_compress_init_send(6);
@@ -648,6 +656,35 @@ set_newkeys(int mode)
 }
 
 /*
+ * Delayed compression for SSH2 is enabled after authentication:
+ * This happans on the server side after a SSH2_MSG_USERAUTH_SUCCESS is sent,
+ * and on the client side after a SSH2_MSG_USERAUTH_SUCCESS is received.
+ */
+static void
+packet_enable_delayed_compress(void)
+{
+        Comp *comp = NULL;
+        int mode;
+
+        /*
+         * Remember that we are past the authentication step, so rekeying
+         * with COMP_DELAYED will turn on compression immediately.
+         */
+        after_authentication = 1;
+        for (mode = 0; mode < MODE_MAX; mode++) {
+                comp = &newkeys[mode]->comp;
+                if (comp && !comp->enabled && comp->type == COMP_DELAYED) {
+                        packet_init_compression();
+                        if (mode == MODE_OUT)
+                                buffer_compress_init_send(6);
+                        else
+                                buffer_compress_init_recv();
+                        comp->enabled = 1;
+                }
+        }
+}
+
+/*
  * Finalize packet in SSH2 format (compress, mac, encrypt, enqueue)
  */
 static void
@@ -760,6 +797,8 @@ packet_send2_wrapped(void)
 
         if (type == SSH2_MSG_NEWKEYS)
                 set_newkeys(MODE_OUT);
+        else if (type == SSH2_MSG_USERAUTH_SUCCESS && server_side)
+                packet_enable_delayed_compress();
 }
 
 static void
@@ -1006,7 +1045,7 @@ packet_read_poll2(u_int32_t *seqnr_p)
         static u_int packet_length = 0;
         u_int padlen, need;
         u_char *macbuf, *cp, type;
-        int maclen, block_size;
+        u_int maclen, block_size;
         Enc *enc   = NULL;
         Mac *mac   = NULL;
         Comp *comp = NULL;
@@ -1113,6 +1152,8 @@ packet_read_poll2(u_int32_t *seqnr_p)
                 packet_disconnect("Invalid ssh2 packet type: %d", type);
         if (type == SSH2_MSG_NEWKEYS)
                 set_newkeys(MODE_IN);
+        else if (type == SSH2_MSG_USERAUTH_SUCCESS && !server_side)
+                packet_enable_delayed_compress();
 #ifdef PACKET_DEBUG
         fprintf(stderr, "read/plain[%d]:\r\n", type);
         buffer_dump(&incoming_packet);
@@ -1243,9 +1284,9 @@ packet_get_bignum2(BIGNUM * value)
 }
 
 void *
-packet_get_raw(int *length_ptr)
+packet_get_raw(u_int *length_ptr)
 {
-        int bytes = buffer_len(&incoming_packet);
+        u_int bytes = buffer_len(&incoming_packet);
 
         if (length_ptr != NULL)
                 *length_ptr = bytes;
@@ -1538,3 +1579,15 @@ packet_set_rekey_limit(u_int32_t bytes)
 {
         rekey_limit = bytes;
 }
+
+void
+packet_set_server(void)
+{
+        server_side = 1;
+}
+
+void
+packet_set_authenticated(void)
+{
+        after_authentication = 1;
+}