mirror of git://anongit.mindrot.org/openssh.git
- 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.
This commit is contained in:
parent
b22c2b86af
commit
4040fe10a9
|
@ -106,6 +106,10 @@
|
||||||
- deraadt@cvs.openbsd.org 2001/03/01 03:38:33
|
- deraadt@cvs.openbsd.org 2001/03/01 03:38:33
|
||||||
[cli.c cli.h rijndael.h ssh-keyscan.1]
|
[cli.c cli.h rijndael.h ssh-keyscan.1]
|
||||||
copyright notices on all source files
|
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
|
20010304
|
||||||
- (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
|
- (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
|
||||||
|
@ -4298,4 +4302,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.884 2001/03/05 06:50:47 mouring Exp $
|
$Id: ChangeLog,v 1.885 2001/03/05 06:52:57 mouring Exp $
|
||||||
|
|
7
ssh.c
7
ssh.c
|
@ -39,7 +39,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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/evp.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
|
@ -936,7 +936,8 @@ client_subsystem_reply(int type, int plen, void *ctxt)
|
||||||
|
|
||||||
id = packet_get_int();
|
id = packet_get_int();
|
||||||
len = buffer_len(&command);
|
len = buffer_len(&command);
|
||||||
len = MAX(len, 900);
|
if (len > 900)
|
||||||
|
len = 900;
|
||||||
packet_done();
|
packet_done();
|
||||||
if (type == SSH2_MSG_CHANNEL_FAILURE)
|
if (type == SSH2_MSG_CHANNEL_FAILURE)
|
||||||
fatal("Request for subsystem '%.*s' failed on channel %d",
|
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));
|
debug("Sending command: %.*s", len, buffer_ptr(&command));
|
||||||
channel_request_start(id, "exec", 0);
|
channel_request_start(id, "exec", 0);
|
||||||
}
|
}
|
||||||
packet_put_string(buffer_ptr(&command), len);
|
packet_put_string(buffer_ptr(&command), buffer_len(&command));
|
||||||
packet_send();
|
packet_send();
|
||||||
} else {
|
} else {
|
||||||
channel_request(id, "shell", 0);
|
channel_request(id, "shell", 0);
|
||||||
|
|
Loading…
Reference in New Issue