Fix usage message on gendsa:

[openssl.git] / apps / gendsa.c

diff --git a/apps/gendsa.c b/apps/gendsa.c
index 35f299a58b187eb618ade523787b15fc8a165b4b..311d95020bc181ce8cd7b1304ddd279ff425d1d5 100644 (file)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -1,5 +1,5 @@
 /* apps/gendsa.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -85,16 +85,17 @@ char **argv;
        {
        char buffer[200];
        DSA *dsa=NULL;
-       int ret=1,num=DEFBITS;
+       int ret=1;
        char *outfile=NULL;
        char *inrand=NULL,*randfile,*dsaparams=NULL;
        BIO *out=NULL,*in=NULL;
+       EVP_CIPHER *enc=NULL;
 
        apps_startup();
 
        if (bio_err == NULL)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-                       BIO_set_fp(bio_err,stderr,BIO_NOCLOSE);
+                       BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
        argv++;
        argc--;
@@ -117,6 +118,16 @@ char **argv;
                        {
                        dsaparams= *argv;
                        }
+#ifndef NO_DES
+               else if (strcmp(*argv,"-des") == 0)
+                       enc=EVP_des_cbc();
+               else if (strcmp(*argv,"-des3") == 0)
+                       enc=EVP_des_ede3_cbc();
+#endif
+#ifndef NO_IDEA
+               else if (strcmp(*argv,"-idea") == 0)
+                       enc=EVP_idea_cbc();
+#endif
                else
                        goto bad;
                argv++;
@@ -126,16 +137,25 @@ char **argv;
        if (dsaparams == NULL)
                {
 bad:
-               BIO_printf(bio_err,"usage: gendsa [args] [numbits]\n");
-               BIO_printf(bio_err," -out file - output the key to 'file\n");
+               BIO_printf(bio_err,"usage: gendsa [args] dsaparam-file\n");
+               BIO_printf(bio_err," -out file - output the key to 'file'\n");
+#ifndef NO_DES
+               BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
+               BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
+#endif
+#ifndef NO_IDEA
+               BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
+#endif
                BIO_printf(bio_err," -rand file:file:...\n");
                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," dsaparam-file\n");
+               BIO_printf(bio_err,"           - a DSA parameter file as generated by the dsaparam command\n");
                goto end;
                }
 
        in=BIO_new(BIO_s_file());
-       if (!(BIO_read_filename(in,"r")))
+       if (!(BIO_read_filename(in,dsaparams)))
                {
                perror(dsaparams);
                goto end;
@@ -174,8 +194,8 @@ bad:
                        dsa_load_rand(inrand));
                }
 
-       BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
-       BIO_printf(bio_err,"This could take some time\n");
+       BIO_printf(bio_err,"Generating DSA key, %d bits\n",
+                                                       BN_num_bits(dsa->p));
        if (!DSA_generate_key(dsa)) goto end;
 
        if (randfile == NULL)
@@ -183,7 +203,7 @@ bad:
        else
                RAND_write_file(randfile);
 
-       if (!PEM_write_bio_DSAPrivateKey(out,dsa,EVP_des_ede3_cbc(),NULL,0,NULL))
+       if (!PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL))
                goto end;
        ret=0;
 end: