X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=apps%2Fdsaparam.c;h=f861ec7b1ad8cf2d1c6e31b70b5c85d30f2974a2;hb=1bc5dd3efc7495b72f2780b4ef8d502bd899c783;hp=7e3b12ebe3f17f2eee0680f3875968ba89b177b6;hpb=20d242b0dee75830b104109c6fd5955a4ce35840;p=oweals%2Fopenssl.git

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 7e3b12ebe3..f861ec7b1a 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;
 		}
@@ -215,7 +205,15 @@ bad:
 			}
 		}
 	if (outfile == NULL)
+		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef VMS
+		{
+		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+		out = BIO_push(tmpbio, out);
+		}
+#endif
+		}
 	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
@@ -227,14 +225,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)
@@ -361,7 +355,7 @@ bad:
 	ret=0;
 end:
 	if (in != NULL) BIO_free(in);
-	if (out != NULL) BIO_free(out);
+	if (out != NULL) BIO_free_all(out);
 	if (dsa != NULL) DSA_free(dsa);
 	EXIT(ret);
 	}