1 files changed, 25 insertions, 40 deletions

diff --git a/src/lib/libssl/src/apps/gendsa.c b/src/lib/libssl/src/apps/gendsa.c
index 5f00b89bb0..d69a93da45 100644
--- a/src/lib/libssl/src/apps/gendsa.c
+++ b/src/lib/libssl/src/apps/gendsa.c
@@ -63,7 +63,6 @@
 #include <sys/stat.h>
 #include "apps.h"
 #include <openssl/bio.h>
-#include <openssl/rand.h>
 #include <openssl/err.h>
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
@@ -74,14 +73,15 @@
 #undef PROG
 #define PROG gendsa_main
 
-static long dsa_load_rand(char *names);
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
         {
-        char buffer[200];
         DSA *dsa=NULL;
         int ret=1;
         char *outfile=NULL;
-        char *inrand=NULL,*randfile,*dsaparams=NULL;
+        char *inrand=NULL,*dsaparams=NULL;
+        char *passargout = NULL, *passout = NULL;
         BIO *out=NULL,*in=NULL;
         EVP_CIPHER *enc=NULL;
 
@@ -101,6 +101,11 @@ int MAIN(int argc, char **argv)
                         if (--argc < 1) goto bad;
                         outfile= *(++argv);
                         }
+                else if (strcmp(*argv,"-passout") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        passargout= *(++argv);
+                        }
                 else if (strcmp(*argv,"-rand") == 0)
                         {
                         if (--argc < 1) goto bad;
@@ -148,6 +153,12 @@ bad:
                 goto end;
                 }
 
+        if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
+                BIO_printf(bio_err, "Error getting password\n");
+                goto end;
+        }
+
+
         in=BIO_new(BIO_s_file());
         if (!(BIO_read_filename(in,dsaparams)))
                 {
@@ -161,6 +172,7 @@ bad:
                 goto end;
                 }
         BIO_free(in);
+        in = NULL;
                 
         out=BIO_new(BIO_s_file());
         if (out == NULL) goto end;
@@ -176,57 +188,30 @@ bad:
                         }
                 }
 
-        randfile=RAND_file_name(buffer,200);
-        if ((randfile == NULL)|| !RAND_load_file(randfile,1024L*1024L))
-                BIO_printf(bio_err,"unable to load 'random state'\n");
-
-        if (inrand == NULL)
-                BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
-        else
+        if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
                 {
-                BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
-                        dsa_load_rand(inrand));
+                BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
                 }
+        if (inrand != NULL)
+                BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+                        app_RAND_load_files(inrand));
 
         BIO_printf(bio_err,"Generating DSA key, %d bits\n",
                                                         BN_num_bits(dsa->p));
         if (!DSA_generate_key(dsa)) goto end;
 
-        if (randfile == NULL)
-                BIO_printf(bio_err,"unable to write 'random state'\n");
-        else
-                RAND_write_file(randfile);
+        app_RAND_write_file(NULL, bio_err);
 
-        if (!PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL,NULL))
+        if (!PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL, passout))
                 goto end;
         ret=0;
 end:
         if (ret != 0)
                 ERR_print_errors(bio_err);
+        if (in != NULL) BIO_free(in);
         if (out != NULL) BIO_free(out);
         if (dsa != NULL) DSA_free(dsa);
+        if(passout) Free(passout);
         EXIT(ret);
         }
-
-static long dsa_load_rand(char *name)
-        {
-        char *p,*n;
-        int last;
-        long tot=0;
-
-        for (;;)
-                {
-                last=0;
-                for (p=name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++);
-                if (*p == '\0') last=1;
-                *p='\0';
-                n=name;
-                name=p+1;
-                if (*n == '\0') break;
-
-                tot+=RAND_load_file(n,1);
-                if (last) break;
-                }
-        return(tot);
-        }
 #endif