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"...

1 files changed, 2 insertions, 12 deletions

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 0dab7235e9..3f958943b4 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -65,7 +65,6 @@
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
-#include <openssl/rand.h>
 #include <openssl/pkcs12.h>
 
 #define PROG pkcs12_main
@@ -117,7 +116,7 @@ int MAIN(int argc, char **argv)
     char *cpass = NULL, *mpass = NULL;
     char *passargin = NULL, *passargout = NULL, *passarg = NULL;
     char *passin = NULL, *passout = NULL;
-    char *inrand = NULL,*inegd=NULL;
+    char *inrand = NULL;
 
     apps_startup();
 
@@ -179,11 +178,6 @@ int MAIN(int argc, char **argv)
 			args++;	
 			inrand = *args;
 		    } else badarg = 1;
-		} else if (!strcmp (*args, "-egd")) {
-		    if (args[1]) {
-			args++;	
-			inegd = *args;
-		    } else badarg = 1;
 		} else if (!strcmp (*args, "-inkey")) {
 		    if (args[1]) {
 			args++;	
@@ -275,7 +269,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");
     	goto end;
     }
 
@@ -303,13 +296,10 @@ int MAIN(int argc, char **argv)
     }
 
     if(export_cert || inrand) {
-    	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));
     }
     ERR_load_crypto_strings();