- markus@cvs.openbsd.org 2001/03/01 22:46:37

     [ssh.c]
     don't truncate remote ssh-2 commands; from mkubita@securities.cz
     use min, not max for logging, fixes overflow.

diff --git a/ChangeLog b/ChangeLog
index d7d6de0109eb40fa5b98dd3ca3ab5b613e079c12..1a208f4feea9106274fa3c1c79f2d52176dbd74d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -106,6 +106,10 @@
    - deraadt@cvs.openbsd.org 2001/03/01 03:38:33
      [cli.c cli.h rijndael.h ssh-keyscan.1]
      copyright notices on all source files
+   - markus@cvs.openbsd.org 2001/03/01 22:46:37
+     [ssh.c]
+     don't truncate remote ssh-2 commands; from mkubita@securities.cz
+     use min, not max for logging, fixes overflow.
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.

diff --git a/ssh.c b/ssh.c
index cf6b0379637e3e5e32a51daedc6ae349edda7f5c..c76c7bb71f530e7c48c3f2146e867b0162927c50 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.99 2001/03/01 02:29:04 deraadt Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.100 2001/03/01 22:46:37 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -936,7 +936,8 @@ client_subsystem_reply(int type, int plen, void *ctxt)
 
        id = packet_get_int();
        len = buffer_len(&command);
-       len = MAX(len, 900);
+       if (len > 900)
+               len = 900;
        packet_done();
        if (type == SSH2_MSG_CHANNEL_FAILURE)
                fatal("Request for subsystem '%.*s' failed on channel %d",
@@ -1009,7 +1010,7 @@ ssh_session2_callback(int id, void *arg)
                        debug("Sending command: %.*s", len, buffer_ptr(&command));
                        channel_request_start(id, "exec", 0);
                }
-               packet_put_string(buffer_ptr(&command), len);
+               packet_put_string(buffer_ptr(&command), buffer_len(&command));
                packet_send();
        } else {
                channel_request(id, "shell", 0);