From 2aa645bca435759fa01e4e5827b7d93ad4e06673 Mon Sep 17 00:00:00 2001 From: Kevin K Biju Date: Wed, 23 Mar 2022 10:40:50 +0530 Subject: [PATCH] Size of random output is now a long, also added option to select chunk size Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/17949) --- apps/rand.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/rand.c b/apps/rand.c index f99c91dbbf4..e9aedb4bbc0 100644 --- a/apps/rand.c +++ b/apps/rand.c @@ -52,7 +52,9 @@ int rand_main(int argc, char **argv) BIO *out = NULL; char *outfile = NULL, *prog; OPTION_CHOICE o; - int format = FORMAT_BINARY, i, num = -1, r, ret = 1; + int format = FORMAT_BINARY, r, i, ret = 1, buflen = 131072; + long num = -1; + uint8_t *buf = NULL; prog = opt_init(argc, argv, rand_options); while ((o = opt_next()) != OPT_EOF) { @@ -93,7 +95,7 @@ int rand_main(int argc, char **argv) argc = opt_num_rest(); argv = opt_rest(); if (argc == 1) { - if (!opt_int(argv[0], &num) || num <= 0) + if (!opt_long(argv[0], &num) || num <= 0) goto opthelp; } else if (!opt_check_rest_arg(NULL)) { goto opthelp; @@ -113,13 +115,11 @@ int rand_main(int argc, char **argv) out = BIO_push(b64, out); } + buf = app_malloc(buflen, "buffer for output file"); while (num > 0) { - unsigned char buf[4096]; - int chunk; + long chunk; - chunk = num; - if (chunk > (int)sizeof(buf)) - chunk = sizeof(buf); + chunk = (num > buflen) ? buflen : num; r = RAND_bytes(buf, chunk); if (r <= 0) goto end; @@ -143,6 +143,7 @@ int rand_main(int argc, char **argv) end: if (ret != 0) ERR_print_errors(bio_err); + OPENSSL_free(buf); release_engine(e); BIO_free_all(out); return ret; -- 2.47.3