Undo the changes I just made. I'm not sure what I was thinking of.

[openssl.git] / apps / gendh.c

diff --git a/apps/gendh.c b/apps/gendh.c
index 5ad55dae5998142655db91476cf54f552c3981af..caf5e8d736bd69545dc41b1e49d85a6d8f12acd9 100644 (file)
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -85,7 +85,7 @@ int MAIN(int argc, char **argv)
        int ret=1,num=DEFBITS;
        int g=2;
        char *outfile=NULL;
-       char *inrand=NULL,*inegd=NULL;
+       char *inrand=NULL;
        BIO *out=NULL;
 
        apps_startup();
@@ -115,11 +115,6 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        inrand= *(++argv);
                        }
-               else if (strcmp(*argv,"-egd") == 0)
-                       {
-                       if (--argc < 1) goto bad;
-                       inegd= *(++argv);
-                       }
                else
                        break;
                argv++;
@@ -130,13 +125,12 @@ int MAIN(int argc, char **argv)
 bad:
                BIO_printf(bio_err,"usage: gendh [args] [numbits]\n");
                BIO_printf(bio_err," -out file - output the key to 'file\n");
-               BIO_printf(bio_err," -2        - use 2 as the generator value\n");
-       /*      BIO_printf(bio_err," -3        - use 3 as the generator value\n"); */
-               BIO_printf(bio_err," -5        - use 5 as the generator value\n");
+               BIO_printf(bio_err," -2    use 2 as the generator value\n");
+       /*      BIO_printf(bio_err," -3    use 3 as the generator value\n"); */
+               BIO_printf(bio_err," -5    use 5 as the generator value\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," -egd file - load random seed from EGD socket\n");
                goto end;
                }
                
@@ -158,16 +152,13 @@ bad:
                        }
                }
 
-       if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL && inegd == NULL)
+       if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
                {
                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));
-       if (inegd != NULL)
-               BIO_printf(bio_err,"%ld egd bytes loaded\n",
-                       RAND_egd(inegd));
 
        BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
        BIO_printf(bio_err,"This is going to take a long time\n");