Various randomness handling bugfixes and improvements --

[openssl.git] / apps / gendsa.c

diff --git a/apps/gendsa.c b/apps/gendsa.c
index 3e198a24f96055ff58a4cab046f3b811a053b48c..44d2b42a0579213b0f6d8301e6c22142fea91e53 100644 (file)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -56,36 +56,29 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef 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 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;
        BIO *out=NULL,*in=NULL;
        EVP_CIPHER *enc=NULL;
 
@@ -112,10 +105,6 @@ int MAIN(int argc, char **argv)
                        }
                else if (strcmp(*argv,"-") == 0)
                        goto bad;
-               else if (dsaparams == NULL)
-                       {
-                       dsaparams= *argv;
-                       }
 #ifndef NO_DES
                else if (strcmp(*argv,"-des") == 0)
                        enc=EVP_des_cbc();
@@ -126,6 +115,10 @@ int MAIN(int argc, char **argv)
                else if (strcmp(*argv,"-idea") == 0)
                        enc=EVP_idea_cbc();
 #endif
+               else if (**argv != '-' && dsaparams == NULL)
+                       {
+                       dsaparams = *argv;
+                       }
                else
                        goto bad;
                argv++;
@@ -159,7 +152,7 @@ bad:
                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;
@@ -180,28 +173,21 @@ 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))
+       if (!PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL,NULL))
                goto end;
        ret=0;
 end:
@@ -211,27 +197,4 @@ end:
        if (dsa != NULL) DSA_free(dsa);
        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