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/gendsa.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/gendsa.c')
| -rw-r--r-- | apps/gendsa.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/apps/gendsa.c b/apps/gendsa.c index dd83d1bf0f..1937613849 100644 --- a/apps/gendsa.c +++ b/apps/gendsa.c @@ -68,7 +68,6 @@ #include <openssl/dsa.h> #include <openssl/x509.h> #include <openssl/pem.h> -#include <openssl/rand.h> #define DEFBITS 512 #undef PROG @@ -81,7 +80,7 @@ int MAIN(int argc, char **argv) DSA *dsa=NULL; int ret=1; char *outfile=NULL; - char *inrand=NULL,*inegd=NULL,*dsaparams=NULL; + char *inrand=NULL,*dsaparams=NULL; char *passargout = NULL, *passout = NULL; BIO *out=NULL,*in=NULL; EVP_CIPHER *enc=NULL; @@ -112,11 +111,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 if (strcmp(*argv,"-") == 0) goto bad; #ifndef NO_DES @@ -154,7 +148,6 @@ bad: 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," dsaparam-file\n"); BIO_printf(bio_err," - a DSA parameter file as generated by the dsaparam command\n"); goto end; @@ -195,16 +188,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 DSA key, %d bits\n", BN_num_bits(dsa->p)); |