diff options
| author | A J Mohan Rao <mohan@computer.com> | 2016-02-06 23:12:35 +0530 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-06 14:06:52 -0500 |
| commit | 6755ff11286b8eb6fdfa17719af9e7bf606bb94b (patch) | |
| tree | e01d412db1dd04c99307e2b6eb83dc703132b1c8 /apps | |
| parent | 0ca2e82ab1575f9c4eed259c4d66ca9372a45bf5 (diff) | |
commands help cleanup
opt_valtype 0 is same as '-' while printing cmd usage
asn1parse/ca/ciphers help cleanup
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.h | 5 | ||||
| -rw-r--r-- | apps/asn1pars.c | 2 | ||||
| -rw-r--r-- | apps/ca.c | 14 | ||||
| -rw-r--r-- | apps/opt.c | 1 |
4 files changed, 14 insertions, 8 deletions
diff --git a/apps/apps.h b/apps/apps.h index 15a044e678..2951fb7ac1 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -356,8 +356,9 @@ typedef struct options_st { int retval; /* * value type: - no value (also the value zero), n number, p positive - * number, u unsigned, s string, < input file, > output file, f der/pem - * format, F any format identifier. n and u include zero; p does not. + * number, u unsigned, l long, s string, < input file, > output file, + * f any format, F der/pem format , E der/pem/engine format identifier. + * l, n and u include zero; p does not. */ int valtype; const char *helpstr; diff --git a/apps/asn1pars.c b/apps/asn1pars.c index 6f88a1dca4..f7fa8f3531 100644 --- a/apps/asn1pars.c +++ b/apps/asn1pars.c @@ -81,7 +81,7 @@ OPTIONS asn1parse_options[] = { {"inform", OPT_INFORM, 'F', "input format - one of DER PEM"}, {"in", OPT_IN, '<', "input file"}, {"out", OPT_OUT, '>', "output file (output format is always DER)"}, - {"i", OPT_INDENT, 0, "entries"}, + {"i", OPT_INDENT, 0, "indents the output"}, {"noout", OPT_NOOUT, 0, "don't produce any output"}, {"offset", OPT_OFFSET, 'p', "offset into file"}, {"length", OPT_LENGTH, 'p', "length of section in file"}, @@ -209,7 +209,8 @@ OPTIONS ca_options[] = { {"name", OPT_NAME, 's', "The particular CA definition to use"}, {"subj", OPT_SUBJ, 's', "Use arg instead of request's subject"}, {"utf8", OPT_UTF8, '-', "Input characters are UTF8 (default ASCII)"}, - {"create_serial", OPT_CREATE_SERIAL, '-'}, + {"create_serial", OPT_CREATE_SERIAL, '-', + "If reading serial fails, create a new random serial"}, {"multivalue-rdn", OPT_MULTIVALUE_RDN, '-', "Enable support for multivalued RDNs"}, {"startdate", OPT_STARTDATE, 's', "Cert notBefore, YYMMDDHHMMSSZ"}, @@ -253,10 +254,13 @@ OPTIONS ca_options[] = { {"updatedb", OPT_UPDATEDB, '-', "Updates db for expired cert"}, {"crlexts", OPT_CRLEXTS, 's', "CRL extension section (override value in config file)"}, - {"crl_reason", OPT_CRL_REASON, 's'}, - {"crl_hold", OPT_CRL_HOLD, 's'}, - {"crl_compromise", OPT_CRL_COMPROMISE, 's'}, - {"crl_CA_compromise", OPT_CRL_CA_COMPROMISE, 's'}, + {"crl_reason", OPT_CRL_REASON, 's', "revocation reason"}, + {"crl_hold", OPT_CRL_HOLD, 's', + "the hold instruction, an OID. Sets revocation reason to certificateHold"}, + {"crl_compromise", OPT_CRL_COMPROMISE, 's', + "sets compromise time to val and the revocation reason to keyCompromise"}, + {"crl_CA_compromise", OPT_CRL_CA_COMPROMISE, 's', + "sets compromise time to val and the revocation reason to CACompromise"}, #ifndef OPENSSL_NO_ENGINE {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"}, #endif diff --git a/apps/opt.c b/apps/opt.c index badff26aac..49db5b66e4 100644 --- a/apps/opt.c +++ b/apps/opt.c @@ -815,6 +815,7 @@ int opt_num_rest(void) static const char *valtype2param(const OPTIONS *o) { switch (o->valtype) { + case 0: case '-': return ""; case 's': |