Use the default_md config file value when signing CRLs.

[openssl.git] / apps / rand.c

diff --git a/apps/rand.c b/apps/rand.c
index 10adf0e95d81e3f3810987b9ee169afb145e5769..a893896033a8c4422a9c6138ae31deb17602e4e1 100644 (file)
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -1,4 +1,57 @@
 /* apps/rand.c */
+/* ====================================================================
+ * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
 
 #include "apps.h"
 
@@ -9,7 +62,6 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
-#include <openssl/engine.h>
 
 #undef PROG
 #define PROG rand_main
@@ -24,7 +76,9 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
+#ifndef OPENSSL_NO_ENGINE
        ENGINE *e = NULL;
+#endif
        int i, r, ret = 1;
        int badopt;
        char *outfile = NULL;
@@ -32,7 +86,9 @@ int MAIN(int argc, char **argv)
        int base64 = 0;
        BIO *out = NULL;
        int num = -1;
+#ifndef OPENSSL_NO_ENGINE
        char *engine=NULL;
+#endif
 
        apps_startup();
 
@@ -40,6 +96,9 @@ int MAIN(int argc, char **argv)
                if ((bio_err = BIO_new(BIO_s_file())) != NULL)
                        BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
 
+       if (!load_config(bio_err, NULL))
+               goto err;
+
        badopt = 0;
        i = 0;
        while (!badopt && argv[++i] != NULL)
@@ -51,6 +110,7 @@ int MAIN(int argc, char **argv)
                        else
                                badopt = 1;
                        }
+#ifndef OPENSSL_NO_ENGINE
                else if (strcmp(argv[i], "-engine") == 0)
                        {
                        if ((argv[i+1] != NULL) && (engine == NULL))
@@ -58,6 +118,7 @@ int MAIN(int argc, char **argv)
                        else
                                badopt = 1;
                        }
+#endif
                else if (strcmp(argv[i], "-rand") == 0)
                        {
                        if ((argv[i+1] != NULL) && (inrand == NULL))
@@ -95,13 +156,17 @@ 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");
+#ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err, "-engine e             - use engine e, possibly a hardware device.\n");
+#endif
                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;
                }
 
+#ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
+#endif
 
        app_RAND_load_file(NULL, bio_err, (inrand != NULL));
        if (inrand != NULL)
@@ -140,7 +205,7 @@ int MAIN(int argc, char **argv)
                int chunk;
 
                chunk = num;
-               if (chunk > sizeof buf)
+               if (chunk > (int)sizeof(buf))
                        chunk = sizeof buf;
                r = RAND_bytes(buf, chunk);
                if (r <= 0)
@@ -157,5 +222,6 @@ err:
        ERR_print_errors(bio_err);
        if (out)
                BIO_free_all(out);
-       EXIT(ret);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);
        }