Fix usage messages and lookup digests later in req command.

(part of PR #1887)

diff --git a/apps/dgst.c b/apps/dgst.c
index e2fb728656fbc0ccd7bb34618aaf8267439eecf4..59814908c106fe13c980d4db0ec03f373ef6c551 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -269,9 +269,12 @@ int MAIN(int argc, char **argv)
                BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
                BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
                BIO_printf(bio_err,"-keyform arg    key file format (PEM or ENGINE)\n");
+               BIO_printf(bio_err,"-out filename   output to filename rather than stdout\n");
                BIO_printf(bio_err,"-signature file signature to verify\n");
                BIO_printf(bio_err,"-sigopt nm:v    signature parameter\n");
                BIO_printf(bio_err,"-hmac key       create hashed MAC with key\n");
+               BIO_printf(bio_err,"-mac algorithm  create MAC (not neccessarily HMAC)\n"); 
+               BIO_printf(bio_err,"-macopt nm:v    MAC algorithm parameters or key\n");
 #ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
 #endif

diff --git a/apps/pkeyparam.c b/apps/pkeyparam.c
index 4319eb4de5163b68fd20600e6b75ed1e11fcd364..7f18010f9d142884e9b260aee91b19ddd610e313 100644 (file)
--- a/apps/pkeyparam.c
+++ b/apps/pkeyparam.c
@@ -179,7 +179,7 @@ int MAIN(int argc, char **argv)
        pkey = PEM_read_bio_Parameters(in, NULL);
        if (!pkey)
                {
-               BIO_printf(bio_err, "Error reading paramters\n");
+               BIO_printf(bio_err, "Error reading parameters\n");
                ERR_print_errors(bio_err);
                goto end;
                }

diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index b808e1ef499c8955428c9dbeefe9b769d6f0acd8..22a6c4bf397fe9253d3d51cbf0874bc3be2c5764 100644 (file)
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -390,7 +390,7 @@ static void usage()
        BIO_printf(bio_err, "Usage: pkeyutl [options]\n");
        BIO_printf(bio_err, "-in file        input file\n");
        BIO_printf(bio_err, "-out file       output file\n");
-       BIO_printf(bio_err, "-signature file signature file (verify operation only)\n");
+       BIO_printf(bio_err, "-sigfile file signature file (verify operation only)\n");
        BIO_printf(bio_err, "-inkey file     input key\n");
        BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");
        BIO_printf(bio_err, "-pubin          input is a public key\n");

diff --git a/apps/req.c b/apps/req.c
index e728d5bf9511d6c501506393c2453fb42de1f210..3b4ab28e5d70e7af49ca13e9a7f8ed9940860478 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -365,11 +365,6 @@ int MAIN(int argc, char **argv)
                        serial = s2i_ASN1_INTEGER(NULL, *(++argv));
                        if (!serial) goto bad;
                        }
-               else if ((md_alg=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
-                       {
-                       /* ok */
-                       digest=md_alg;
-                       }
                else if (strcmp(*argv,"-extensions") == 0)
                        {
                        if (--argc < 1) goto bad;
@@ -380,6 +375,11 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        req_exts = *(++argv);
                        }
+               else if ((md_alg=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
+                       {
+                       /* ok */
+                       digest=md_alg;
+                       }
                else
                        {
                        BIO_printf(bio_err,"unknown option %s\n",*argv);