make apps compile again

[openssl.git] / apps / rand.c

diff --git a/apps/rand.c b/apps/rand.c
index fa9bc023f4059cfd7468f8847487abc79ae05713..10adf0e95d81e3f3810987b9ee169afb145e5769 100644 (file)
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -9,6 +9,7 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
+#include <openssl/engine.h>
 
 #undef PROG
 #define PROG rand_main
@@ -23,6 +24,7 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
+       ENGINE *e = NULL;
        int i, r, ret = 1;
        int badopt;
        char *outfile = NULL;
@@ -30,6 +32,7 @@ int MAIN(int argc, char **argv)
        int base64 = 0;
        BIO *out = NULL;
        int num = -1;
+       char *engine=NULL;
 
        apps_startup();
 
@@ -48,6 +51,13 @@ int MAIN(int argc, char **argv)
                        else
                                badopt = 1;
                        }
+               else if (strcmp(argv[i], "-engine") == 0)
+                       {
+                       if ((argv[i+1] != NULL) && (engine == NULL))
+                               engine = argv[++i];
+                       else
+                               badopt = 1;
+                       }
                else if (strcmp(argv[i], "-rand") == 0)
                        {
                        if ((argv[i+1] != NULL) && (inrand == NULL))
@@ -84,12 +94,15 @@ int MAIN(int argc, char **argv)
                {
                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");
+               BIO_printf(bio_err, "-out file             - write to file\n");
+               BIO_printf(bio_err, "-engine e             - use engine e, possibly a hardware device.\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;
                }
 
+        e = setup_engine(bio_err, engine, 0);
+
        app_RAND_load_file(NULL, bio_err, (inrand != NULL));
        if (inrand != NULL)
                BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
@@ -101,7 +114,15 @@ int MAIN(int argc, char **argv)
        if (outfile != NULL)
                r = BIO_write_filename(out, outfile);
        else
+               {
                r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
+#ifdef OPENSSL_SYS_VMS
+               {
+               BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+               out = BIO_push(tmpbio, out);
+               }
+#endif
+               }
        if (r <= 0)
                goto err;