Check # of arguments for remaining commands.
[openssl.git] / apps / rand.c
index fa9bc023f4059cfd7468f8847487abc79ae05713..cf45b43b2cd239d3af5e9541eff8cca007f9c30d 100644 (file)
@@ -1,4 +1,11 @@
-/* apps/rand.c */
+/*
+ * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
 
 #include "apps.h"
 
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
-#undef PROG
-#define PROG rand_main
-
-/* -out file         - write to file
- * -rand file:file   - PRNG seed files
- * -base64           - encode output
- * num               - write 'num' bytes
- */
-
-int MAIN(int, char **);
-
-int MAIN(int argc, char **argv)
-       {
-       int i, r, ret = 1;
-       int badopt;
-       char *outfile = NULL;
-       char *inrand = NULL;
-       int base64 = 0;
-       BIO *out = NULL;
-       int num = -1;
-
-       apps_startup();
-
-       if (bio_err == NULL)
-               if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-                       BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
-
-       badopt = 0;
-       i = 0;
-       while (!badopt && argv[++i] != NULL)
-               {
-               if (strcmp(argv[i], "-out") == 0)
-                       {
-                       if ((argv[i+1] != NULL) && (outfile == NULL))
-                               outfile = argv[++i];
-                       else
-                               badopt = 1;
-                       }
-               else if (strcmp(argv[i], "-rand") == 0)
-                       {
-                       if ((argv[i+1] != NULL) && (inrand == NULL))
-                               inrand = argv[++i];
-                       else
-                               badopt = 1;
-                       }
-               else if (strcmp(argv[i], "-base64") == 0)
-                       {
-                       if (!base64)
-                               base64 = 1;
-                       else
-                               badopt = 1;
-                       }
-               else if (isdigit((unsigned char)argv[i][0]))
-                       {
-                       if (num < 0)
-                               {
-                               r = sscanf(argv[i], "%d", &num);
-                               if (r == 0 || num < 0)
-                                       badopt = 1;
-                               }
-                       else
-                               badopt = 1;
-                       }
-               else
-                       badopt = 1;
-               }
-
-       if (num < 0)
-               badopt = 1;
-       
-       if (badopt) 
-               {
-               BIO_printf(bio_err, "Usage: rand [options] num\n");
-               BIO_printf(bio_err, "where options are\n");
-               BIO_printf(bio_err, "-out file            - write to file\n");
-               BIO_printf(bio_err, "-rand file%cfile%c...  - seed PRNG from files\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-               BIO_printf(bio_err, "-base64              - encode output\n");
-               goto err;
-               }
-
-       app_RAND_load_file(NULL, bio_err, (inrand != NULL));
-       if (inrand != NULL)
-               BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
-                       app_RAND_load_files(inrand));
-
-       out = BIO_new(BIO_s_file());
-       if (out == NULL)
-               goto err;
-       if (outfile != NULL)
-               r = BIO_write_filename(out, outfile);
-       else
-               r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-       if (r <= 0)
-               goto err;
-
-       if (base64)
-               {
-               BIO *b64 = BIO_new(BIO_f_base64());
-               if (b64 == NULL)
-                       goto err;
-               out = BIO_push(b64, out);
-               }
-       
-       while (num > 0) 
-               {
-               unsigned char buf[4096];
-               int chunk;
-
-               chunk = num;
-               if (chunk > sizeof buf)
-                       chunk = sizeof buf;
-               r = RAND_bytes(buf, chunk);
-               if (r <= 0)
-                       goto err;
-               BIO_write(out, buf, chunk);
-               num -= chunk;
-               }
-       BIO_flush(out);
-
-       app_RAND_write_file(NULL, bio_err);
-       ret = 0;
-       
-err:
-       ERR_print_errors(bio_err);
-       if (out)
-               BIO_free_all(out);
-       EXIT(ret);
-       }
+typedef enum OPTION_choice {
+    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+    OPT_OUT, OPT_ENGINE, OPT_BASE64, OPT_HEX,
+    OPT_R_ENUM
+} OPTION_CHOICE;
+
+const OPTIONS rand_options[] = {
+    {OPT_HELP_STR, 1, '-', "Usage: %s [flags] num\n"},
+    {OPT_HELP_STR, 1, '-', "Valid options are:\n"},
+    {"help", OPT_HELP, '-', "Display this summary"},
+    {"out", OPT_OUT, '>', "Output file"},
+    OPT_R_OPTIONS,
+    {"base64", OPT_BASE64, '-', "Base64 encode output"},
+    {"hex", OPT_HEX, '-', "Hex encode output"},
+#ifndef OPENSSL_NO_ENGINE
+    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+#endif
+    {NULL}
+};
+
+int rand_main(int argc, char **argv)
+{
+    ENGINE *e = NULL;
+    BIO *out = NULL;
+    char *outfile = NULL, *prog;
+    OPTION_CHOICE o;
+    int format = FORMAT_BINARY, i, num = -1, r, ret = 1;
+
+    prog = opt_init(argc, argv, rand_options);
+    while ((o = opt_next()) != OPT_EOF) {
+        switch (o) {
+        case OPT_EOF:
+        case OPT_ERR:
+ opthelp:
+            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
+            goto end;
+        case OPT_HELP:
+            opt_help(rand_options);
+            ret = 0;
+            goto end;
+        case OPT_OUT:
+            outfile = opt_arg();
+            break;
+        case OPT_ENGINE:
+            e = setup_engine(opt_arg(), 0);
+            break;
+        case OPT_R_CASES:
+            if (!opt_rand(o))
+                goto end;
+            break;
+        case OPT_BASE64:
+            format = FORMAT_BASE64;
+            break;
+        case OPT_HEX:
+            format = FORMAT_TEXT;
+            break;
+        }
+    }
+    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;
+    }
+
+    out = bio_open_default(outfile, 'w', format);
+    if (out == NULL)
+        goto end;
+
+    if (format == FORMAT_BASE64) {
+        BIO *b64 = BIO_new(BIO_f_base64());
+        if (b64 == NULL)
+            goto end;
+        out = BIO_push(b64, out);
+    }
+
+    while (num > 0) {
+        unsigned char buf[4096];
+        int chunk;
+
+        chunk = num;
+        if (chunk > (int)sizeof(buf))
+            chunk = sizeof buf;
+        r = RAND_bytes(buf, chunk);
+        if (r <= 0)
+            goto end;
+        if (format != FORMAT_TEXT) {
+            if (BIO_write(out, buf, chunk) != chunk)
+                goto end;
+        } else {
+            for (i = 0; i < chunk; i++)
+                if (BIO_printf(out, "%02x", buf[i]) != 2)
+                    goto end;
+        }
+        num -= chunk;
+    }
+    if (format == FORMAT_TEXT)
+        BIO_puts(out, "\n");
+    if (BIO_flush(out) <= 0)
+        goto end;
+
+    ret = 0;
+
+ end:
+    if (ret != 0)
+        ERR_print_errors(bio_err);
+    release_engine(e);
+    BIO_free_all(out);
+    return (ret);
+}