diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-09-19 21:33:17 -0400 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2019-11-20 09:49:52 +0100 |
| commit | 92de469fbd62a77a36dad5fde3a0ac7034071a59 (patch) | |
| tree | bd2dfc3fc90d85af938a0e837813f66c5d3fa16c /apps/kdf.c | |
| parent | 1838580037a47b42c5b2326b0b988c50c7c64c3c (diff) | |
Document command parameters.
Add documentation for all commands that have parameters.
Fix a couple of minor doc and programming bugs, too.
Fixes #10313
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10371)
Diffstat (limited to 'apps/kdf.c')
| -rw-r--r-- | apps/kdf.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/apps/kdf.c b/apps/kdf.c index abd21cee51..66e7e7a7c1 100644 --- a/apps/kdf.c +++ b/apps/kdf.c @@ -24,18 +24,20 @@ typedef enum OPTION_choice { const OPTIONS kdf_options[] = { {OPT_HELP_STR, 1, '-', "Usage: %s [options] kdf_name\n"}, - {OPT_HELP_STR, 1, '-', "kdf_name\t KDF algorithm.\n"}, OPT_SECTION("General"), {"help", OPT_HELP, '-', "Display this summary"}, - {"kdfopt", OPT_KDFOPT, 's', "KDF algorithm control parameters in n:v form."}, - {OPT_HELP_STR, 1, '-', "See 'Supported Controls' in the EVP_KDF_ docs"}, + {"kdfopt", OPT_KDFOPT, 's', "KDF algorithm control parameters in n:v form"}, + {OPT_MORE_STR, 1, '-', "See 'Supported Controls' in the EVP_KDF_ docs\n"}, {"keylen", OPT_KEYLEN, 's', "The size of the output derived key"}, OPT_SECTION("Output"), {"out", OPT_OUT, '>', "Output to filename rather than stdout"}, - {"binary", OPT_BIN, '-', "Output in binary format (Default is hexadecimal " - "output)"}, + {"binary", OPT_BIN, '-', + "Output in binary format (default is hexadecimal)"}, + + OPT_PARAMETERS(), + {"kdf_name", 0, 0, "Name of the KDF algorithm"}, {NULL} }; |