This commit was manufactured by cvs2svn to create branch

[oweals/openssl.git] / apps / gendh.c

diff --git a/apps/gendh.c b/apps/gendh.c
index 39861175945630234f1485b46d3c5cbab64d86ef..e0c7889a31e119a680f16cc112cdb071245bbf6c 100644 (file)
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -1,4 +1,5 @@
 /* apps/gendh.c */
+/* obsoleted by dhparam.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -75,6 +76,9 @@
 #define PROG gendh_main
 
 static void MS_CALLBACK dh_cb(int p, int n, void *arg);
+
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        DH *dh=NULL;
@@ -124,7 +128,7 @@ bad:
                BIO_printf(bio_err," -2    use 2 as the generator value\n");
        /*      BIO_printf(bio_err," -3    use 3 as the generator value\n"); */
                BIO_printf(bio_err," -5    use 5 as the generator value\n");
-               BIO_printf(bio_err," -rand file:file:...\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");
                goto end;
@@ -138,7 +142,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)
@@ -156,7 +168,7 @@ bad:
                BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
                        app_RAND_load_files(inrand));
 
-       BIO_printf(bio_err,"Generating DH parameters, %d bit long strong prime, generator of %d\n",num,g);
+       BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
        BIO_printf(bio_err,"This is going to take a long time\n");
        dh=DH_generate_parameters(num,g,dh_cb,bio_err);
                
@@ -170,7 +182,7 @@ bad:
 end:
        if (ret != 0)
                ERR_print_errors(bio_err);
-       if (out != NULL) BIO_free(out);
+       if (out != NULL) BIO_free_all(out);
        if (dh != NULL) DH_free(dh);
        EXIT(ret);
        }