1 files changed, 61 insertions, 21 deletions

diff --git a/src/lib/libssl/src/apps/rand.c b/src/lib/libssl/src/apps/rand.c
index 6add7bbd6c..f51f5bec35 100644
--- a/src/lib/libssl/src/apps/rand.c
+++ b/src/lib/libssl/src/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
@@ -40,6 +92,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,7 +106,7 @@ int MAIN(int argc, char **argv)
                         else
                                 badopt = 1;
                         }
-                if (strcmp(argv[i], "-engine") == 0)
+                else if (strcmp(argv[i], "-engine") == 0)
                         {
                         if ((argv[i+1] != NULL) && (engine == NULL))
                                 engine = argv[++i];
@@ -95,29 +150,13 @@ 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," -engine e             - use engine e, possibly a hardware device.\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;
                 }
 
-        if (engine != NULL)
-                {
-                if((e = ENGINE_by_id(engine)) == NULL)
-                        {
-                        BIO_printf(bio_err,"invalid engine \"%s\"\n",
-                                engine);
-                        goto err;
-                        }
-                if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
-                        {
-                        BIO_printf(bio_err,"can't use that engine\n");
-                        goto err;
-                        }
-                BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
-                /* Free our "structural" reference. */
-                ENGINE_free(e);
-                }
+        e = setup_engine(bio_err, engine, 0);
 
         app_RAND_load_file(NULL, bio_err, (inrand != NULL));
         if (inrand != NULL)
@@ -132,7 +171,7 @@ int MAIN(int argc, char **argv)
         else
                 {
                 r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-#ifdef VMS
+#ifdef OPENSSL_SYS_VMS
                 {
                 BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                 out = BIO_push(tmpbio, out);
@@ -173,5 +212,6 @@ err:
         ERR_print_errors(bio_err);
         if (out)
                 BIO_free_all(out);
+        apps_shutdown();
         EXIT(ret);
         }