Various randomness handling bugfixes and improvements --
[openssl.git] / apps / gendh.c
index b7b6d0f..0284faf 100644 (file)
@@ -1,5 +1,5 @@
 /* apps/gendh.c */
 /* apps/gendh.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
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * [including the GNU Public Licence.]
  */
 
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_DH
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
 #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 "dh.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS        512
 #undef PROG
 #define PROG gendh_main
 
 
 #define DEFBITS        512
 #undef PROG
 #define PROG gendh_main
 
-#ifndef NOPROTO
-static void MS_CALLBACK dh_cb(int p, int n);
-static long dh_load_rand(char *names);
-#else
-static void MS_CALLBACK dh_cb();
-static long dh_load_rand();
-#endif
-
-int MAIN(argc, argv)
-int argc;
-char **argv;
+static void MS_CALLBACK dh_cb(int p, int n, void *arg);
+int MAIN(int argc, char **argv)
        {
        char buffer[200];
        DH *dh=NULL;
        int ret=1,num=DEFBITS;
        int g=2;
        char *outfile=NULL;
        {
        char buffer[200];
        DH *dh=NULL;
        int ret=1,num=DEFBITS;
        int g=2;
        char *outfile=NULL;
-       char *inrand=NULL,*randfile;
+       char *inrand=NULL;
        BIO *out=NULL;
 
        apps_startup();
 
        if (bio_err == NULL)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
        BIO *out=NULL;
 
        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);
 
        argv++;
        argc--;
 
        argv++;
        argc--;
@@ -157,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);
+       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;
@@ -191,9 +176,7 @@ end:
        EXIT(ret);
        }
 
        EXIT(ret);
        }
 
-static void MS_CALLBACK dh_cb(p, n)
-int p;
-int n;
+static void MS_CALLBACK dh_cb(int p, int n, void *arg)
        {
        char c='*';
 
        {
        char c='*';
 
@@ -201,34 +184,10 @@ int n;
        if (p == 1) c='+';
        if (p == 2) c='*';
        if (p == 3) c='\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
        }
 #ifdef LINT
        p=n;
 #endif
        }
-
-static long dh_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