Various randomness handling bugfixes and improvements --

[openssl.git] / apps / dsaparam.c

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index e9485c003623ccadad9992013cac025f2d370fdf..1b5380662d8a12b54dd8b1563c40a7225c6e01aa 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -1,5 +1,5 @@
 /* apps/dsaparam.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -56,18 +56,19 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_DSA
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "bn.h"
-#include "rand.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>
 
 #undef PROG
 #define PROG   dsaparam_main
@@ -80,31 +81,25 @@
  * -text
  * -C
  * -noout
+ * -genkey
  */
 
-#ifndef NOPROTO
-static void MS_CALLBACK dsa_cb(int p, int n);
-#else
-static void MS_CALLBACK dsa_cb();
-#endif
-
-int MAIN(argc, argv)
-int argc;
-char **argv;
+static void MS_CALLBACK dsa_cb(int p, int n, char *arg);
+int MAIN(int argc, char **argv)
        {
        DSA *dsa=NULL;
        int i,badops=0,text=0;
        BIO *in=NULL,*out=NULL;
        int informat,outformat,noout=0,C=0,ret=1;
        char *infile,*outfile,*prog,*inrand=NULL;
-       int numbits= -1,num;
-       char buffer[200],*randfile=NULL;
+       int numbits= -1,num,genkey=0;
+       int need_rand=0;
 
        apps_startup();
 
        if (bio_err == NULL)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-                       BIO_set_fp(bio_err,stderr,BIO_NOCLOSE);
+                       BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
        infile=NULL;
        outfile=NULL;
@@ -140,10 +135,16 @@ char **argv;
                        text=1;
                else if (strcmp(*argv,"-C") == 0)
                        C=1;
+               else if (strcmp(*argv,"-genkey") == 0)
+                       {
+                       genkey=1;
+                       need_rand=1;
+                       }
                else if (strcmp(*argv,"-rand") == 0)
                        {
                        if (--argc < 1) goto bad;
                        inrand= *(++argv);
+                       need_rand=1;
                        }
                else if (strcmp(*argv,"-noout") == 0)
                        noout=1;
@@ -151,6 +152,7 @@ char **argv;
                        {
                        /* generate a key */
                        numbits=num;
+                       need_rand=1;
                        }
                else
                        {
@@ -167,11 +169,11 @@ char **argv;
 bad:
                BIO_printf(bio_err,"%s [options] [bits] <infile >outfile\n",prog);
                BIO_printf(bio_err,"where options are\n");
-               BIO_printf(bio_err," -inform arg   input format - one of DER TXT PEM\n");
-               BIO_printf(bio_err," -outform arg  output format - one of DER TXT PEM\n");
-               BIO_printf(bio_err," -in arg       inout file\n");
+               BIO_printf(bio_err," -inform arg   input format - DER or PEM\n");
+               BIO_printf(bio_err," -outform arg  output format - DER or PEM\n");
+               BIO_printf(bio_err," -in arg       input file\n");
                BIO_printf(bio_err," -out arg      output file\n");
-               BIO_printf(bio_err," -text         check the DSA parameters\n");
+               BIO_printf(bio_err," -text         print the key in text\n");
                BIO_printf(bio_err," -C            Output C code\n");
                BIO_printf(bio_err," -noout        no output\n");
                BIO_printf(bio_err," -rand         files to use for random number input\n");
@@ -210,19 +212,26 @@ bad:
                        }
                }
 
-       if (numbits > 0)
+       if (need_rand)
                {
-               randfile=RAND_file_name(buffer,200);
-               RAND_load_file(randfile,1024L*1024L);
+               app_RAND_load_file(NULL, bio_err, (inrand != NULL));
+               if (inrand != NULL)
+                       BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+                               app_RAND_load_files(inrand));
+               }
 
+       if (numbits > 0)
+               {
+               assert(need_rand);
                BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
                BIO_printf(bio_err,"This could take some time\n");
-               dsa=DSA_generate_parameters(num,NULL,0,NULL,NULL,dsa_cb);
+               dsa=DSA_generate_parameters(num,NULL,0,NULL,NULL,
+                       dsa_cb,(char *)bio_err);
                }
        else if (informat == FORMAT_ASN1)
                dsa=d2i_DSAparams_bio(in,NULL);
        else if (informat == FORMAT_PEM)
-               dsa=PEM_read_bio_DSAparams(in,NULL,NULL);
+               dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL);
        else
                {
                BIO_printf(bio_err,"bad input format specified\n");
@@ -314,6 +323,25 @@ bad:
                        goto end;
                        }
                }
+       if (genkey)
+               {
+               DSA *dsakey;
+
+               assert(need_rand);
+               if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
+               if (!DSA_generate_key(dsakey)) goto end;
+               if      (outformat == FORMAT_ASN1)
+                       i=i2d_DSAPrivateKey_bio(out,dsakey);
+               else if (outformat == FORMAT_PEM)
+                       i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL,NULL);
+               else    {
+                       BIO_printf(bio_err,"bad output format specified for outfile\n");
+                       goto end;
+                       }
+               DSA_free(dsakey);
+               }
+       if (need_rand)
+               app_RAND_write_file(NULL, bio_err);
        ret=0;
 end:
        if (in != NULL) BIO_free(in);
@@ -322,9 +350,7 @@ end:
        EXIT(ret);
        }
 
-static void MS_CALLBACK dsa_cb(p, n)
-int p;
-int n;
+static void MS_CALLBACK dsa_cb(int p, int n, char *arg)
        {
        char c='*';
 
@@ -332,9 +358,10 @@ int n;
        if (p == 1) c='+';
        if (p == 2) c='*';
        if (p == 3) c='\n';
-       BIO_write(bio_err,&c,1);
-       BIO_flush(bio_err);
+       BIO_write((BIO *)arg,&c,1);
+       (void)BIO_flush((BIO *)arg);
 #ifdef LINT
        p=n;
 #endif
        }
+#endif