Fix s_server/s_client handling of the split_send_frag argument

Ensure that a value of 0 is correctly handled for the split_send_frag
argument.

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell 2016-03-07 10:06:42 +00:00
parent ccd82ef4c2
commit e2d5183d7c
2 changed files with 10 additions and 4 deletions

View File

@ -1389,8 +1389,11 @@ int s_client_main(int argc, char **argv)
case OPT_SPLIT_SEND_FRAG:
split_send_fragment = atoi(opt_arg());
if (split_send_fragment == 0) {
/* Not allowed - set to a deliberately bad value */
split_send_fragment = -1;
/*
* Not allowed - set to a deliberately bad value so we get an
* error message below
*/
split_send_fragment = SSL3_RT_MAX_PLAIN_LENGTH + 1;
}
break;
case OPT_MAX_PIPELINES:

View File

@ -1517,8 +1517,11 @@ int s_server_main(int argc, char *argv[])
case OPT_SPLIT_SEND_FRAG:
split_send_fragment = atoi(opt_arg());
if (split_send_fragment == 0) {
/* Not allowed - set to a deliberately bad value */
split_send_fragment = -1;
/*
* Not allowed - set to a deliberately bad value so we get an
* error message below
*/
split_send_fragment = SSL3_RT_MAX_PLAIN_LENGTH + 1;
}
break;
case OPT_MAX_PIPELINES: