From f365611ca32190a032db1e292ccf55f110acea9a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 28 Jun 2000 16:47:45 +0000 Subject: 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"... --- apps/smime.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'apps/smime.c') diff --git a/apps/smime.c b/apps/smime.c index f3a1ad56b8..bb8ecd7cf0 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -63,7 +63,6 @@ #include "apps.h" #include #include -#include #include #undef PROG @@ -101,7 +100,7 @@ int MAIN(int argc, char **argv) char *to = NULL, *from = NULL, *subject = NULL; char *CAfile = NULL, *CApath = NULL; char *passargin = NULL, *passin = NULL; - char *inrand = NULL,*inegd=NULL; + char *inrand = NULL; int need_rand = 0; args = argv + 1; @@ -151,12 +150,6 @@ int MAIN(int argc, char **argv) inrand = *args; } else badarg = 1; need_rand = 1; - } else if (!strcmp(*args,"-egd")) { - if (args[1]) { - args++; - inegd = *args; - } else badarg = 1; - need_rand = 1; } else if (!strcmp(*args,"-passin")) { if (args[1]) { args++; @@ -279,7 +272,6 @@ int MAIN(int argc, char **argv) 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, "cert.pem recipient certificate(s) for encryption\n"); goto end; } @@ -290,13 +282,10 @@ int MAIN(int argc, char **argv) } 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)); } ret = 2; -- cgit v1.2.3