clean up help/options; remove dups etc

8 files changed, 8 insertions, 19 deletions

diff --git a/apps/apps.h b/apps/apps.h
index 20a841f362..ae920b5f71 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -266,18 +266,15 @@ extern void unbuffer(FILE* fp);
 #define OPT_S_ENUM \
 	OPT_S__FIRST=3000, \
 	OPT_S_SIGALGS, OPT_S_CLIENT_SIGALGS, OPT_S_CURVES, OPT_S_NAMED_CURVE, \
-	OPT_S_CIPHER, OPT_S_CERT, OPT_S_KEY, OPT_S_DHPARAM, \
+	OPT_S_CIPHER, \
 	OPT_S__LAST
 
 #define OPT_S_OPTIONS \
-	{ "sigalgs", OPT_S_SIGALGS, 's' }, \
-	{ "client_sigalgs", OPT_S_CLIENT_SIGALGS, 's' }, \
+	{ "sigalgs", OPT_S_SIGALGS, 's', "Server signing algorithms" }, \
+	{ "client_sigalgs", OPT_S_CLIENT_SIGALGS, 's', "Client signing algorithms" }, \
 	{ "curves", OPT_S_CURVES, 's' }, \
-	{ "named_curve", OPT_S_NAMED_CURVE, 's' }, \
-	{ "cipher", OPT_S_CIPHER, 's' }, \
-	{ "cert", OPT_S_CERT, '<' }, \
-	{ "key", OPT_S_KEY, '<' }, \
-	{ "dhparam", OPT_S_DHPARAM, '<' }
+	{ "named_curve", OPT_S_NAMED_CURVE, 's', "ECC curve to use" }, \
+	{ "cipher", OPT_S_CIPHER, 's', "Any supported cipher" }
 
 #define OPT_S_CASES \
 	OPT_S__FIRST: case OPT_S__LAST: break; \
@@ -285,10 +282,7 @@ extern void unbuffer(FILE* fp);
 	case OPT_S_CLIENT_SIGALGS: \
 	case OPT_S_CURVES: \
 	case OPT_S_NAMED_CURVE: \
-	case OPT_S_CIPHER: \
-	case OPT_S_CERT: \
-	case OPT_S_KEY: \
-	case OPT_S_DHPARAM
+	case OPT_S_CIPHER
 
 /*
  * Option parsing.
diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 5f941bdd71..0a5400cdcf 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -129,7 +129,6 @@ int asn1parse_main(int argc, char **argv)
 		switch (i) {
 		case OPT_EOF:
 		case OPT_ERR:
-			BIO_printf(bio_err,"Valid options are:\n");
 			opt_help(asn1parse_options);
 			goto end;
 		case OPT_INFORM:
diff --git a/apps/ocsp.c b/apps/ocsp.c
index 19ac64a636..ef25787118 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -235,7 +235,6 @@ int ocsp_main(int argc, char **argv)
 		case OPT_EOF:
 		case OPT_ERR:
 err:
-			BIO_printf(bio_err,"Valid options are:\n");
 			opt_help(ocsp_options);
 			goto end;
 		case OPT_OUTFILE:
diff --git a/apps/passwd.c b/apps/passwd.c
index 2cad57f9ec..cb51886fd1 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -90,7 +90,6 @@ int passwd_main(int argc, char **argv)
 		case OPT_EOF:
 		case OPT_ERR:
 bad:
-			BIO_printf(bio_err,"Valid options are:\n");
 			opt_help(passwd_options);
 			goto err;
 		case OPT_IN:
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 1dd16a6827..ac12d7cfd5 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -107,7 +107,6 @@ int pkcs7_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
-			BIO_printf(bio_err,"Valid options are:\n");
 			opt_help(pkcs7_options);
 			goto end;
 		case OPT_INFORM:
diff --git a/apps/rsa.c b/apps/rsa.c
index 4c7088981f..6f0a48c050 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -108,7 +108,7 @@ OPTIONS rsa_options[] = {
 int rsa_main(int argc, char **argv)
 	{
 	ENGINE *e = NULL;
-	BIO *out;
+	BIO *out=NULL;
 	RSA *rsa=NULL;
 	const EVP_CIPHER *enc=NULL;
 	char *engine=NULL, *infile=NULL, *outfile=NULL, *prog;
diff --git a/apps/smime.c b/apps/smime.c
index 652a56a8f6..225a136b4b 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -96,6 +96,7 @@ enum options {
 OPTIONS smime_options[] = {
 	{ OPT_HELP_STR, 1, '-', "Usage: %s [options] cert.pem...\n" },
 	{ "cert.pem", 1, '-', "Recipient certs for encryption" },
+	{ OPT_HELP_STR, 1, '-', "Valid options are:\n" },
 	{ "encrypt", OPT_ENCRYPT, '-', "Encrypt message" },
 	{ "decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message" },
 	{ "sign", OPT_SIGN, '-', "Sign message" },
@@ -179,7 +180,6 @@ int smime_main(int argc, char **argv)
 		case OPT_EOF:
 		case OPT_ERR:
 err:
-			BIO_printf(bio_err,"Valid options are:\n");
 			opt_help(smime_options);
 			goto end;
 		case OPT_INFORM:
diff --git a/apps/ts.c b/apps/ts.c
index a5a3c87c87..47ddf86382 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -177,7 +177,6 @@ int ts_main(int argc, char **argv)
 		case OPT_EOF:
 		case OPT_ERR:
 err:
-			BIO_printf(bio_err,"Valid options are:\n");
 			opt_help(ts_options);
 			goto end;
 		case OPT_CONFIG: