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/genrsa.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/genrsa.c')
-rw-r--r-- | apps/genrsa.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/apps/genrsa.c b/apps/genrsa.c index 3a9995b820..5cf47e6921 100644 --- a/apps/genrsa.c +++ b/apps/genrsa.c @@ -69,7 +69,6 @@ #include <openssl/evp.h> #include <openssl/x509.h> #include <openssl/pem.h> -#include <openssl/rand.h> #define DEFBITS 512 #undef PROG @@ -89,7 +88,7 @@ int MAIN(int argc, char **argv) unsigned long f4=RSA_F4; char *outfile=NULL; char *passargout = NULL, *passout = NULL; - char *inrand=NULL,*inegd=NULL; + char *inrand=NULL; BIO *out=NULL; apps_startup(); @@ -122,11 +121,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); - } #ifndef NO_DES else if (strcmp(*argv,"-des") == 0) enc=EVP_des_cbc(); @@ -163,7 +157,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"); goto err; } @@ -185,16 +178,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 RSA private key, %d bit long modulus\n", num); |