Additions for 0.9.6.

[openssl.git] / apps / genrsa.c

diff --git a/apps/genrsa.c b/apps/genrsa.c
index 3a9995b820a839a0ae61385e50b0ddaa9ec796f2..ac0b709e7af97725a8661c0a7bd511c53e9534b5 100644 (file)
--- 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;
                }
                
@@ -175,7 +168,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)
@@ -185,16 +186,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);
@@ -222,7 +220,7 @@ bad:
        ret=0;
 err:
        if (rsa != NULL) RSA_free(rsa);
-       if (out != NULL) BIO_free(out);
+       if (out != NULL) BIO_free_all(out);
        if(passout) OPENSSL_free(passout);
        if (ret != 0)
                ERR_print_errors(bio_err);