diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-06-28 16:47:45 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-06-28 16:47:45 +0000 |
| commit | f365611ca32190a032db1e292ccf55f110acea9a (patch) | |
| tree | 5cd87b63feb2db1a4fa6c73e74d6fb3177e6aa57 /apps/dsaparam.c | |
| parent | 523c83ec9a200ccb35c21561078a258b61f51795 (diff) | |
Undo the changes I just made. I'm not sure what I was thinking of.
The message to everyone is "Do not hack OpenSSL when stressed"...
Diffstat (limited to 'apps/dsaparam.c')
| -rw-r--r-- | apps/dsaparam.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/apps/dsaparam.c b/apps/dsaparam.c index 7e3b12ebe3..a15d6ea309 100644 --- a/apps/dsaparam.c +++ b/apps/dsaparam.c @@ -69,7 +69,6 @@ #include <openssl/dsa.h> #include <openssl/x509.h> #include <openssl/pem.h> -#include <openssl/rand.h> #undef PROG #define PROG dsaparam_main @@ -95,7 +94,7 @@ int MAIN(int argc, char **argv) int i,badops=0,text=0; BIO *in=NULL,*out=NULL; int informat,outformat,noout=0,C=0,ret=1; - char *infile,*outfile,*prog,*inrand=NULL,*inegd=NULL; + char *infile,*outfile,*prog,*inrand=NULL; int numbits= -1,num,genkey=0; int need_rand=0; @@ -150,12 +149,6 @@ int MAIN(int argc, char **argv) inrand= *(++argv); need_rand=1; } - else if (strcmp(*argv,"-egd") == 0) - { - if (--argc < 1) goto bad; - inegd= *(++argv); - need_rand=1; - } else if (strcmp(*argv,"-noout") == 0) noout=1; else if (sscanf(*argv,"%d",&num) == 1) @@ -186,10 +179,7 @@ bad: BIO_printf(bio_err," -text print the key in text\n"); BIO_printf(bio_err," -C Output C code\n"); BIO_printf(bio_err," -noout no output\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"); + BIO_printf(bio_err," -rand files to use for random number input\n"); BIO_printf(bio_err," number number of bits to use for generating private key\n"); goto end; } @@ -227,14 +217,10 @@ bad: if (need_rand) { - app_RAND_load_file(NULL, bio_err, - (inrand != NULL || inegd != NULL)); + app_RAND_load_file(NULL, bio_err, (inrand != NULL)); 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)); } if (numbits > 0) |