Commit 90edd7ad authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Rich Salz
Browse files

Fix various missing option help messages ... 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1585)
(cherry picked from commit 12d56b29)
parent 57106f55

apps/cms.c

+10 −9
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ OPTIONS cms_options[] = { 
    {"decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message"},

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

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

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

    {"resign", OPT_RESIGN, '-', "Resign a signed message"},

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

    {"verify_retcode", OPT_VERIFY_RETCODE, '-'},

    {"verify_receipt", OPT_VERIFY_RECEIPT, '<'},
@@ -122,22 +122,22 @@ OPTIONS cms_options[] = { 
     "Don't include signers certificate when signing"},

    {"noattr", OPT_NOATTR, '-', "Don't include any signed attributes"},

    {"nodetach", OPT_NODETACH, '-', "Use opaque signing"},

    {"nosmimecap", OPT_NOSMIMECAP, '-'},

    {"nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute"},

    {"binary", OPT_BINARY, '-', "Don't translate message to text"},

    {"keyid", OPT_KEYID, '-', "Use subject key identifier"},

    {"nosigs", OPT_NOSIGS, '-', "Don't verify message signature"},

    {"no_content_verify", OPT_NO_CONTENT_VERIFY, '-'},

    {"no_attr_verify", OPT_NO_ATTR_VERIFY, '-'},

    {"stream", OPT_INDEF, '-'},

    {"indef", OPT_INDEF, '-'},

    {"noindef", OPT_NOINDEF, '-'},

    {"stream", OPT_INDEF, '-', "Enable CMS streaming"},

    {"indef", OPT_INDEF, '-', "Same as -stream"},

    {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"},

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

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

    {"crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of CR only" },

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

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

    {"receipt_request_print", OPT_RR_PRINT, '-', "Print CMS Receipt Request" },

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

    {"receipt_request_first", OPT_RR_FIRST, '-'},

    {"rctform", OPT_RCTFORM, 'F'},

    {"rctform", OPT_RCTFORM, 'F', "Receipt file format"},

    {"certfile", OPT_CERTFILE, '<', "Other certificates file"},

    {"CAfile", OPT_CAFILE, '<', "Trusted certificates file"},

    {"CApath", OPT_CAPATH, '/', "trusted certificates directory"},
@@ -147,7 +147,8 @@ 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, '-', "For the -cmsout operation print out all fields of the CMS structure"},

    {"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'},

apps/crl.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ OPTIONS crl_options[] = { 
    {"fingerprint", OPT_FINGERPRINT, '-', "Print the crl fingerprint"},

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

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

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

    {"gendelta", OPT_GENDELTA, '<', "Other CRL to compare/diff to the Input one"},

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

    {"CAfile", OPT_CAFILE, '<', "Verify CRL using certificates in file name"},

    {"no-CAfile", OPT_NOCAFILE, '-',

apps/gendsa.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ OPTIONS gendsa_options[] = { 
    {OPT_HELP_STR, 1, '-', "Valid options are:\n"},

    {"help", OPT_HELP, '-', "Display this summary"},

    {"out", OPT_OUT, '>', "Output the key to the specified file"},

    {"passout", OPT_PASSOUT, 's'},

    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},

    {"rand", OPT_RAND, 's',

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

    {"", OPT_CIPHER, '-', "Encrypt the output with any supported cipher"},

apps/ocsp.c

+4 −2
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ OPTIONS ocsp_options[] = { 
    {"url", OPT_URL, 's', "Responder URL"},

    {"host", OPT_HOST, 's', "TCP/IP hostname:port to connect to"},

    {"port", OPT_PORT, 'p', "Port to run responder on"},

    {"ignore_err", OPT_IGNORE_ERR, '-'},

    {"ignore_err", OPT_IGNORE_ERR, '-',

     "Ignore Error response from OCSP responder, and retry "},

    {"noverify", OPT_NOVERIFY, '-', "Don't verify response at all"},

    {"nonce", OPT_NONCE, '-', "Add OCSP nonce to request"},

    {"no_nonce", OPT_NO_NONCE, '-', "Don't add OCSP nonce to request"},
@@ -124,7 +125,8 @@ OPTIONS ocsp_options[] = { 
    {"no_chain", OPT_NO_CHAIN, '-', "Don't chain verify response"},

    {"no_cert_checks", OPT_NO_CERT_CHECKS, '-',

     "Don't do additional checks on signing certificate"},

    {"no_explicit", OPT_NO_EXPLICIT, '-'},

    {"no_explicit", OPT_NO_EXPLICIT, '-',

     "Do not explicitly check the chain, just verify the root"},

    {"trust_other", OPT_TRUST_OTHER, '-',

     "Don't verify additional certificates"},

    {"no_intern", OPT_NO_INTERN, '-',

apps/pkcs7.c

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

    {"noout", OPT_NOOUT, '-', "Don't output encoded data"},

    {"text", OPT_TEXT, '-', "Print full details of certificates"},

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

    {"print", OPT_PRINT, '-', "Print out all fields of the PKCS7 structure"},

    {"print_certs", OPT_PRINT_CERTS, '-',

     "Print_certs  print any certs or crl in the input"},

#ifndef OPENSSL_NO_ENGINE