Commit 791b7bc7 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix usage messages and lookup digests later in req command. 

(part of PR #1887)
parent 19ae0907

apps/dgst.c

+3 −0
Original line number Diff line number Diff line
@@ -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

apps/pkeyparam.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

apps/pkeyutl.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

apps/req.c

+5 −5
Original line number Diff line number Diff line
@@ -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);