projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SM4 optimization for ARM by HW instruction
[openssl.git]
/
apps
/
rand.c
diff --git
a/apps/rand.c
b/apps/rand.c
index 1ad6894597fcfcddd5b42275a6e719074d9335b9..f99c91dbbf45b73375c6027d81cdfd16b690e4b4 100644
(file)
--- a/
apps/rand.c
+++ b/
apps/rand.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 1998-202
0
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-202
1
The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-19,7
+19,7
@@
#include <openssl/rand.h>
typedef enum OPTION_choice {
#include <openssl/rand.h>
typedef enum OPTION_choice {
- OPT_
ERR = -1, OPT_EOF = 0, OPT_HELP
,
+ OPT_
COMMON
,
OPT_OUT, OPT_ENGINE, OPT_BASE64, OPT_HEX,
OPT_R_ENUM, OPT_PROV_ENUM
} OPTION_CHOICE;
OPT_OUT, OPT_ENGINE, OPT_BASE64, OPT_HEX,
OPT_R_ENUM, OPT_PROV_ENUM
} OPTION_CHOICE;
@@
-88,16
+88,20
@@
int rand_main(int argc, char **argv)
break;
}
}
break;
}
}
+
+ /* Optional argument is number of bytes to generate. */
argc = opt_num_rest();
argv = opt_rest();
if (argc == 1) {
if (!opt_int(argv[0], &num) || num <= 0)
argc = opt_num_rest();
argv = opt_rest();
if (argc == 1) {
if (!opt_int(argv[0], &num) || num <= 0)
- goto end;
- } else if (argc > 0) {
- BIO_printf(bio_err, "Extra arguments given.\n");
+ goto opthelp;
+ } else if (!opt_check_rest_arg(NULL)) {
goto opthelp;
}
goto opthelp;
}
+ if (!app_RAND_load())
+ goto end;
+
out = bio_open_default(outfile, 'w', format);
if (out == NULL)
goto end;
out = bio_open_default(outfile, 'w', format);
if (out == NULL)
goto end;