Commit 16e1b281 authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Rich Salz
Browse files

GH932: Add more help messages to some apps options. 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent b273fcc5

apps/asn1pars.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ OPTIONS asn1parse_options[] = { 
    {"in", OPT_IN, '<', "input file"},

    {"out", OPT_OUT, '>', "output file (output format is always DER)"},

    {"i", OPT_INDENT, 0, "indents the output"},

    {"noout", OPT_NOOUT, 0, "don't produce any output"},

    {"noout", OPT_NOOUT, 0, "do not produce any output"},

    {"offset", OPT_OFFSET, 'p', "offset into file"},

    {"length", OPT_LENGTH, 'p', "length of section in file"},

    {"oid", OPT_OID, '<', "file of extra oid definitions"},

apps/ca.c

+6 −6
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ OPTIONS ca_options[] = { 
    {"policy", OPT_POLICY, 's', "The CA 'policy' to support"},

    {"keyfile", OPT_KEYFILE, 's', "Private key"},

    {"keyform", OPT_KEYFORM, 'f', "Private key file format (PEM or ENGINE)"},

    {"passin", OPT_PASSIN, 's'},

    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},

    {"key", OPT_KEY, 's', "Key to decode the private key if it is encrypted"},

    {"cert", OPT_CERT, '<', "The CA cert"},

    {"selfsign", OPT_SELFSIGN, '-',
@@ -228,17 +228,17 @@ OPTIONS ca_options[] = { 
    {"in", OPT_IN, '<', "The input PEM encoded cert request(s)"},

    {"out", OPT_OUT, '>', "Where to put the output file(s)"},

    {"outdir", OPT_OUTDIR, '/', "Where to put output cert"},

    {"sigopt", OPT_SIGOPT, 's'},

    {"notext", OPT_NOTEXT, '-'},

    {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},

    {"notext", OPT_NOTEXT, '-', "Do not print the generated certificate"},

    {"batch", OPT_BATCH, '-', "Don't ask questions"},

    {"preserveDN", OPT_PRESERVEDN, '-', "Don't re-order the DN"},

    {"noemailDN", OPT_NOEMAILDN, '-', "Don't add the EMAIL field to the DN"},

    {"gencrl", OPT_GENCRL, '-', "Generate a new CRL"},

    {"msie_hack", OPT_MSIE_HACK, '-',

     "msie modifications to handle all those universal strings"},

    {"crldays", OPT_CRLDAYS, 'p', "Days is when the next CRL is due"},

    {"crlhours", OPT_CRLHOURS, 'p', "Hours is when the next CRL is due"},

    {"crlsec", OPT_CRLSEC, 'p'},

    {"crldays", OPT_CRLDAYS, 'p', "Days until the next CRL is due"},

    {"crlhours", OPT_CRLHOURS, 'p', "Hours until the next CRL is due"},

    {"crlsec", OPT_CRLSEC, 'p', "Seconds until the next CRL is due"},

    {"infiles", OPT_INFILES, '-', "The last argument, requests to process"},

    {"ss_cert", OPT_SS_CERT, '<', "File contains a self signed cert to sign"},

    {"spkac", OPT_SPKAC, '<',

apps/cms.c

+4 −4
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ OPTIONS cms_options[] = { 
    {"encrypt", OPT_ENCRYPT, '-', "Encrypt message"},

    {"decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message"},

    {"sign", OPT_SIGN, '-', "Sign message"},

    {"sign_receipt", OPT_SIGN_RECEIPT, '-'},

    {"sign_receipt", OPT_SIGN_RECEIPT, '-', "Generate a signed receipt for the message"},

    {"resign", OPT_RESIGN, '-'},

    {"verify", OPT_VERIFY, '-', "Verify signed message"},

    {"verify_retcode", OPT_VERIFY_RETCODE, '-'},
@@ -177,7 +177,7 @@ OPTIONS cms_options[] = { 
    {"noindef", OPT_NOINDEF, '-'},

    {"nooldmime", OPT_NOOLDMIME, '-'},

    {"crlfeol", OPT_CRLFEOL, '-'},

    {"noout", OPT_NOOUT, '-'},

    {"noout", OPT_NOOUT, '-', "For the -cmsout operation do not output the parsed CMS structure"},

    {"receipt_request_print", OPT_RR_PRINT, '-'},

    {"receipt_request_all", OPT_RR_ALL, '-'},

    {"receipt_request_first", OPT_RR_FIRST, '-'},
@@ -191,7 +191,7 @@ OPTIONS cms_options[] = { 
     "Do not load certificates from the default certificates directory"},

    {"content", OPT_CONTENT, '<',

     "Supply or override content for detached signature"},

    {"print", OPT_PRINT, '-'},

    {"print", OPT_PRINT, '-', "For the -cmsout operation print out all fields of the CMS structure"},

    {"secretkey", OPT_SECRETKEY, 's'},

    {"secretkeyid", OPT_SECRETKEYID, 's'},

    {"pwri_password", OPT_PWRI_PASSWORD, 's'},
@@ -205,7 +205,7 @@ OPTIONS cms_options[] = { 
    {"signer", OPT_SIGNER, 's', "Signer certificate file"},

    {"recip", OPT_RECIP, '<', "Recipient cert file for decryption"},

    {"certsout", OPT_CERTSOUT, '>', "Certificate output file"},

    {"md", OPT_MD, 's'},

    {"md", OPT_MD, 's', "Digest algorithm to use when signing or resigning"},

    {"inkey", OPT_INKEY, 's',

     "Input private key (if not signer or recipient)"},

    {"keyform", OPT_KEYFORM, 'f', "Input private key format (PEM or ENGINE)"},

apps/crl.c

+4 −4
Original line number Diff line number Diff line
@@ -80,15 +80,15 @@ OPTIONS crl_options[] = { 
    {"in", OPT_IN, '<', "Input file - default stdin"},

    {"outform", OPT_OUTFORM, 'F', "Output format - default PEM"},

    {"out", OPT_OUT, '>', "output file - default stdout"},

    {"keyform", OPT_KEYFORM, 'F'},

    {"key", OPT_KEY, '<'},

    {"keyform", OPT_KEYFORM, 'F', "Private key file format (PEM or ENGINE)"},

    {"key", OPT_KEY, '<', "CRL signing Private key to use"},

    {"issuer", OPT_ISSUER, '-', "Print issuer DN"},

    {"lastupdate", OPT_LASTUPDATE, '-', "Set lastUpdate field"},

    {"nextupdate", OPT_NEXTUPDATE, '-', "Set nextUpdate field"},

    {"noout", OPT_NOOUT, '-', "No CRL output"},

    {"fingerprint", OPT_FINGERPRINT, '-', "Print the crl fingerprint"},

    {"crlnumber", OPT_CRLNUMBER, '-', "Print CRL number"},

    {"badsig", OPT_BADSIG, '-'},

    {"badsig", OPT_BADSIG, '-', "Corrupt last byte of loaded CRL signature (for test)" },

    {"gendelta", OPT_GENDELTA, '<'},

    {"CApath", OPT_CAPATH, '/', "Verify CRL using certificates in dir"},

    {"CAfile", OPT_CAFILE, '<', "Verify CRL using certificates in file name"},
@@ -96,7 +96,7 @@ OPTIONS crl_options[] = { 
     "Do not load the default certificates file"},

    {"no-CApath", OPT_NOCAPATH, '-',

     "Do not load certificates from the default certificates directory"},

    {"verify", OPT_VERIFY, '-'},

    {"verify", OPT_VERIFY, '-', "Verify CRL signature"},

    {"text", OPT_TEXT, '-', "Print out a text format version"},

    {"hash", OPT_HASH, '-', "Print hash value"},

    {"nameopt", OPT_NAMEOPT, 's', "Various certificate name options"},

apps/dhparam.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ OPTIONS dhparam_options[] = { 
    {"out", OPT_OUT, '>', "Output file"},

    {"check", OPT_CHECK, '-', "Check the DH parameters"},

    {"text", OPT_TEXT, '-', "Print a text form of the DH parameters"},

    {"noout", OPT_NOOUT, '-'},

    {"noout", OPT_NOOUT, '-', "Don't output any DH parameters"},

    {"rand", OPT_RAND, 's',

     "Load the file(s) into the random number generator"},

    {"C", OPT_C, '-', "Print C code"},