zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use opt_int_arg() to parse integers in apps/speed.c

Browse Source 
We use opt_int_arg() to prevent malformed processing of
hexadecimal input to some command line options.

Updated help to mention the change.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17585)
This commit is contained in:
Kevin K Biju 2022-02-01 11:04:35 +05:30 committed by Tomas Mraz
parent 944f822aad
commit 78212c6472
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/speed.c
View File

@ -214,7 +214,11 @@ typedef enum OPTION_choice {
} OPTION_CHOICE;
const OPTIONS speed_options[] = {
{OPT_HELP_STR, 1, '-', "Usage: %s [options] [algorithm...]\n"},
{OPT_HELP_STR, 1, '-',
"Usage: %s [options] [algorithm...]\n"
"All +int options consider prefix '0' as base-8 input, "
"prefix '0x'/'0X' as base-16 input.\n"
},
OPT_SECTION("General"),
{"help", OPT_HELP, '-', "Display this summary"},
@ -1543,7 +1547,7 @@ int speed_main(int argc, char **argv)
break;
case OPT_MULTI:
#ifndef NO_FORK
multi = atoi(opt_arg());
multi = opt_int_arg();
if ((size_t)multi >= SIZE_MAX / sizeof(int)) {
BIO_printf(bio_err, "%s: multi argument too large\n", prog);
return 0;
@ -1552,7 +1556,7 @@ int speed_main(int argc, char **argv)
break;
case OPT_ASYNCJOBS:
#ifndef OPENSSL_NO_ASYNC
async_jobs = atoi(opt_arg());
async_jobs = opt_int_arg();
if (!ASYNC_is_capable()) {
BIO_printf(bio_err,
"%s: async_jobs specified but async not supported\n",
@ -1599,10 +1603,10 @@ int speed_main(int argc, char **argv)
case OPT_SECONDS:
seconds.sym = seconds.rsa = seconds.dsa = seconds.ecdsa
= seconds.ecdh = seconds.eddsa
= seconds.sm2 = seconds.ffdh = atoi(opt_arg());
= seconds.sm2 = seconds.ffdh = opt_int_arg();
break;
case OPT_BYTES:
lengths_single = atoi(opt_arg());
lengths_single = opt_int_arg();
lengths = &lengths_single;
size_num = 1;
break;