Change req so the new parameter '-rand file' uses the given file in

addition to the file given through the RANDFILE option or environment
variable.

diff --git a/apps/req.c b/apps/req.c
index b9b19b83129caac4105481af399b3c0b9da82df0..4b9c3a1ed88b82a15362ee23a66bc0582de7034d 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -552,13 +552,10 @@ bad:
 
        if (newreq && (pkey == NULL))
                {
-               char *randfile;
-
-               if (inrand)
-                       randfile = inrand;
-               else
-                       randfile = CONF_get_string(req_conf,SECTION,"RANDFILE");
+               char *randfile = CONF_get_string(req_conf,SECTION,"RANDFILE");
                app_RAND_load_file(randfile, bio_err, 0);
+               if (inrand)
+                       app_RAND_load_files(inrand);
        
                if (newkey <= 0)
                        {