Mercurial > dropbear
diff sysoptions.h @ 1144:624fc24cfae5 coverity
merge
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 07 Aug 2015 21:26:03 +0800 |
parents | cc3916a7afd9 |
children | 809feaa9408f |
line wrap: on
line diff
--- a/sysoptions.h Tue Jun 23 21:49:04 2015 +0800 +++ b/sysoptions.h Fri Aug 07 21:26:03 2015 +0800 @@ -47,7 +47,7 @@ * the clearenv() function */ #define ENV_SIZE 100 -#define MAX_CMD_LEN 1024 /* max length of a command */ +#define MAX_CMD_LEN 9000 /* max length of a command */ #define MAX_TERM_LEN 200 /* max length of TERM name */ #define MAX_HOST_LEN 254 /* max hostname len for tcp fwding */ @@ -153,7 +153,8 @@ #define MAX_CHANNELS 100 /* simple mem restriction, includes each tcp/x11 connection, so can't be _too_ small */ -#define MAX_STRING_LEN 2400 /* Sun SSH needs this long for algos */ +#define MAX_STRING_LEN (MAX(MAX_CMD_LEN, 2400)) /* Sun SSH needs 2400 for algos, + MAX_CMD_LEN is usually longer */ /* For a 4096 bit DSS key, empirically determined */ #define MAX_PUBKEY_SIZE 1700