Various randomness handling bugfixes and improvements --

[openssl.git] / apps / gendh.c

diff --git a/apps/gendh.c b/apps/gendh.c
index c69147e3704472842123263cd2f3c922d2aac28b..0284faf28d9ef0b09786351823a365fe8ac50458 100644 (file)
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
  * [including the GNU Public Licence.]
  */
 

+#ifndef NO_DH

 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>


@@ -73,14 +74,7 @@
 #undef PROG
 #define PROG gendh_main
 
 #undef PROG
 #define PROG gendh_main
 

-#ifndef NOPROTO
-static void MS_CALLBACK dh_cb(int p, int n, char *arg);
-static long dh_load_rand(char *names);
-#else
-static void MS_CALLBACK dh_cb();
-static long dh_load_rand();
-#endif
-
+static void MS_CALLBACK dh_cb(int p, int n, void *arg);

 int MAIN(int argc, char **argv)
        {
        char buffer[200];
 int MAIN(int argc, char **argv)
        {
        char buffer[200];


@@ -88,7 +82,7 @@ int MAIN(int argc, char **argv)
        int ret=1,num=DEFBITS;
        int g=2;
        char *outfile=NULL;
        int ret=1,num=DEFBITS;
        int g=2;
        char *outfile=NULL;

-       char *inrand=NULL,*randfile;
+       char *inrand=NULL;

        BIO *out=NULL;
 
        apps_startup();
        BIO *out=NULL;
 
        apps_startup();


@@ -155,28 +149,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",
-                       dh_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 DH parameters, %d bit long strong prime, generator of %d\n",num,g);
        BIO_printf(bio_err,"This is going to take a long time\n");
 
        BIO_printf(bio_err,"Generating DH parameters, %d bit long strong prime, generator of %d\n",num,g);
        BIO_printf(bio_err,"This is going to take a long time\n");

-       dh=DH_generate_parameters(num,g,dh_cb,(char *)bio_err);
+       dh=DH_generate_parameters(num,g,dh_cb,bio_err);

                
        if (dh == NULL) goto end;
 
                
        if (dh == NULL) 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_DHparams(out,dh))
                goto end;
 
        if (!PEM_write_bio_DHparams(out,dh))
                goto end;


@@ -189,7 +176,7 @@ end:
        EXIT(ret);
        }
 
        EXIT(ret);
        }
 

-static void MS_CALLBACK dh_cb(int p, int n, char *arg)
+static void MS_CALLBACK dh_cb(int p, int n, void *arg)

        {
        char c='*';
 
        {
        char c='*';
 


@@ -198,32 +185,9 @@ static void MS_CALLBACK dh_cb(int p, int n, char *arg)
        if (p == 2) c='*';
        if (p == 3) c='\n';
        BIO_write((BIO *)arg,&c,1);
        if (p == 2) c='*';
        if (p == 3) c='\n';
        BIO_write((BIO *)arg,&c,1);

-       BIO_flush((BIO *)arg);
+       (void)BIO_flush((BIO *)arg);

 #ifdef LINT
        p=n;
 #endif
        }
 #ifdef LINT
        p=n;
 #endif
        }

-
-static long dh_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