1 files changed, 98 insertions, 67 deletions

diff --git a/src/lib/libssl/src/apps/gendsa.c b/src/lib/libssl/src/apps/gendsa.c
index e0e5afa400..1e1e9f3e4c 100644
--- a/src/lib/libssl/src/apps/gendsa.c
+++ b/src/lib/libssl/src/apps/gendsa.c
@@ -56,39 +56,36 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef OPENSSL_NO_DSA
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "bio.h"
-#include "rand.h"
-#include "err.h"
-#include "bn.h"
-#include "dsa.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS 512
 #undef PROG
 #define PROG gendsa_main
 
-#ifndef NOPROTO
-static long dsa_load_rand(char *names);
-#else
-static long dsa_load_rand();
-#endif
+int MAIN(int, char **);
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
         {
-        char buffer[200];
+        ENGINE *e = NULL;
         DSA *dsa=NULL;
-        int ret=1,num=DEFBITS;
+        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;
+        const EVP_CIPHER *enc=NULL;
+        char *engine=NULL;
 
         apps_startup();
 
@@ -96,6 +93,9 @@ 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 end;
+
         argv++;
         argc--;
         for (;;)
@@ -106,6 +106,16 @@ 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,"-engine") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        engine= *(++argv);
+                        }
                 else if (strcmp(*argv,"-rand") == 0)
                         {
                         if (--argc < 1) goto bad;
@@ -113,9 +123,27 @@ char **argv;
                         }
                 else if (strcmp(*argv,"-") == 0)
                         goto bad;
-                else if (dsaparams == NULL)
+#ifndef OPENSSL_NO_DES
+                else if (strcmp(*argv,"-des") == 0)
+                        enc=EVP_des_cbc();
+                else if (strcmp(*argv,"-des3") == 0)
+                        enc=EVP_des_ede3_cbc();
+#endif
+#ifndef OPENSSL_NO_IDEA
+                else if (strcmp(*argv,"-idea") == 0)
+                        enc=EVP_idea_cbc();
+#endif
+#ifndef OPENSSL_NO_AES
+                else if (strcmp(*argv,"-aes128") == 0)
+                        enc=EVP_aes_128_cbc();
+                else if (strcmp(*argv,"-aes192") == 0)
+                        enc=EVP_aes_192_cbc();
+                else if (strcmp(*argv,"-aes256") == 0)
+                        enc=EVP_aes_256_cbc();
+#endif
+                else if (**argv != '-' && dsaparams == NULL)
                         {
-                        dsaparams= *argv;
+                        dsaparams = *argv;
                         }
                 else
                         goto bad;
@@ -126,33 +154,64 @@ char **argv;
         if (dsaparams == NULL)
                 {
 bad:
-                BIO_printf(bio_err,"usage: gendsa [args] [numbits]\n");
-                BIO_printf(bio_err," -out file - output the key to 'file\n");
-                BIO_printf(bio_err," -rand file:file:...\n");
+                BIO_printf(bio_err,"usage: gendsa [args] dsaparam-file\n");
+                BIO_printf(bio_err," -out file - output the key to 'file'\n");
+#ifndef OPENSSL_NO_DES
+                BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
+                BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
+#endif
+#ifndef OPENSSL_NO_IDEA
+                BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
+#endif
+#ifndef OPENSSL_NO_AES
+                BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
+                BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+#endif
+                BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+                BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
                 BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
                 BIO_printf(bio_err,"             the random number generator\n");
+                BIO_printf(bio_err," dsaparam-file\n");
+                BIO_printf(bio_err,"           - a DSA parameter file as generated by the dsaparam command\n");
                 goto end;
                 }
 
+        e = setup_engine(bio_err, engine, 0);
+
+        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")))
+        if (!(BIO_read_filename(in,dsaparams)))
                 {
                 perror(dsaparams);
                 goto end;
                 }
 
-        if ((dsa=PEM_read_bio_DSAparams(in,NULL,NULL)) == NULL)
+        if ((dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL)) == NULL)
                 {
                 BIO_printf(bio_err,"unable to load DSA parameter file\n");
                 goto end;
                 }
         BIO_free(in);
+        in = NULL;
                 
         out=BIO_new(BIO_s_file());
         if (out == NULL) goto end;
 
         if (outfile == NULL)
+                {
                 BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+                {
+                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                out = BIO_push(tmpbio, out);
+                }
+#endif
+                }
         else
                 {
                 if (BIO_write_filename(out,outfile) <= 0)
@@ -162,59 +221,31 @@ 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 parameters, %d bit long prime\n",num);
-        BIO_printf(bio_err,"This could take some time\n");
+        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,EVP_des_ede3_cbc(),NULL,0,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 (out != NULL) BIO_free(out);
+        if (in != NULL) BIO_free(in);
+        if (out != NULL) BIO_free_all(out);
         if (dsa != NULL) DSA_free(dsa);
+        if(passout) OPENSSL_free(passout);
+        apps_shutdown();
         EXIT(ret);
         }
-
-static long dsa_load_rand(name)
-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