diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-06-28 16:10:56 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-06-28 16:10:56 +0000 |
| commit | 20d242b0dee75830b104109c6fd5955a4ce35840 (patch) | |
| tree | 018296e1c84d26f54c893ea16e5a531a5159c96b /apps/dhparam.c | |
| parent | dffd72f171fba5ab14ca86aafc5d5eba131206ad (diff) | |
| download | openssl-20d242b0dee75830b104109c6fd5955a4ce35840.tar.gz | |
Make it possible for users of the openssl applications to specify the
EGD should be used as seeding input, and where the named socket is.
Diffstat (limited to 'apps/dhparam.c')
| -rw-r--r-- | apps/dhparam.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/apps/dhparam.c b/apps/dhparam.c index a738c5af67..a92863373c 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -121,6 +121,7 @@ #include <openssl/dh.h> #include <openssl/x509.h> #include <openssl/pem.h> +#include <openssl/rand.h> #ifndef NO_DSA #include <openssl/dsa.h> @@ -156,7 +157,7 @@ int MAIN(int argc, char **argv) BIO *in=NULL,*out=NULL; int informat,outformat,check=0,noout=0,C=0,ret=1; char *infile,*outfile,*prog; - char *inrand=NULL; + char *inrand=NULL, *inegd=NULL; int num = 0, g = 0; apps_startup(); @@ -216,6 +217,11 @@ 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 if (((sscanf(*argv,"%d",&num) == 0) || (num <= 0))) goto bad; argv++; @@ -241,8 +247,9 @@ bad: BIO_printf(bio_err," -5 generate parameters using 5 as the generator value\n"); BIO_printf(bio_err," numbits number of bits in to generate (default 512)\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," 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"); BIO_printf(bio_err," -noout no output\n"); goto end; } @@ -271,13 +278,17 @@ bad: if(num) { - if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) + if (!app_RAND_load_file(NULL, bio_err, 1) + && inrand == NULL && inegd == 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)); #ifndef NO_DSA if (dsaparam) |