Update some usage messages.

diff --git a/apps/genpkey.c b/apps/genpkey.c
index 70e2e31971323b84586e476519e2e2fdb212feb9..96801c7045373e0c896fa2b724418573b04464d1 100644 (file)
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -198,15 +198,22 @@ int MAIN(int argc, char **argv)
        if (badarg)
                {
                bad:
        if (badarg)
                {
                bad:

-               BIO_printf(bio_err, "Usage genpkey [options]\n");
-               BIO_printf(bio_err, "where options are\n");
-               BIO_printf(bio_err, "-paramfile file parameter file\n");
-               BIO_printf(bio_err, "-pass arg       output file pass phrase source\n");
-               BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
-               BIO_printf(bio_err, "-out file       output file\n");
+               BIO_printf(bio_err, "Usage: genpkey [options]\n");
+               BIO_printf(bio_err, "where options may be\n");
+               BIO_printf(bio_err, "-out file          output file\n");
+               BIO_printf(bio_err, "-outform X         output format (DER or PEM)\n");
+               BIO_printf(bio_err, "-pass arg          output file pass phrase source\n");
+               BIO_printf(bio_err, "-<cipher>          use cipher <cipher> to encrypt the key\n");

 #ifndef OPENSSL_NO_ENGINE
 #ifndef OPENSSL_NO_ENGINE

-               BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+               BIO_printf(bio_err, "-engine e          use engine e, possibly a hardware device.\n");

 #endif
 #endif

+               BIO_printf(bio_err, "-paramfile file    parameters file\n");
+               BIO_printf(bio_err, "-algorithm alg     the public key algorithm\n");
+               BIO_printf(bio_err, "-pkeyopt opt:value set the public key algorithm option <opt>\n"
+                                           "                   to value <value>\n");
+               BIO_printf(bio_err, "-genparam          generate parameters, not key\n");
+               BIO_printf(bio_err, "-text              print the in text\n");
+               BIO_printf(bio_err, "NB: options order may be important!  See the manual page.\n");

                goto end;
                }
 
                goto end;
                }
 

diff --git a/apps/pkeyparam.c b/apps/pkeyparam.c
index 15a8a2bafb3bfb822aa81db20aad31911b8f13fe..8435e5ea41861b2ba4be7cfc3e5a098e447dc3c7 100644 (file)
--- a/apps/pkeyparam.c
+++ b/apps/pkeyparam.c
@@ -130,6 +130,8 @@ int MAIN(int argc, char **argv)
                BIO_printf(bio_err, "where options are\n");
                BIO_printf(bio_err, "-in file        input file\n");
                BIO_printf(bio_err, "-out file       output file\n");
                BIO_printf(bio_err, "where options are\n");
                BIO_printf(bio_err, "-in file        input file\n");
                BIO_printf(bio_err, "-out file       output file\n");

+               BIO_printf(bio_err, "-text           print parameters as text\n");
+               BIO_printf(bio_err, "-noout          don't output encoded parameters\n");

 #ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
 #endif
 #ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
 #endif