diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-11-08 06:08:30 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-11-08 06:08:30 +1000 |
| commit | 5388f9862d9aaf3c7cf7a70c1e36e7e983c26cfc (patch) | |
| tree | bda368ec4d8855ac5d3e2a31648769a5dabfaac9 /apps/kdf.c | |
| parent | ab14d2af5386897eba8307c9f3220a6d775c0898 (diff) | |
Add "sections" to -help output
Remove "Valid options" label, since all commands have sections (and
[almost] always the first one is "General options").
Have "list --options" ignore section headers
Reformat ts's additional help
Add output section
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9953)
Diffstat (limited to 'apps/kdf.c')
| -rw-r--r-- | apps/kdf.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/kdf.c b/apps/kdf.c index 35cc0db21c..abd21cee51 100644 --- a/apps/kdf.c +++ b/apps/kdf.c @@ -25,10 +25,14 @@ 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. " - "See 'Supported Controls' in the EVP_KDF_ docs"}, + {"kdfopt", OPT_KDFOPT, 's', "KDF algorithm control parameters in n:v form."}, + {OPT_HELP_STR, 1, '-', "See 'Supported Controls' in the EVP_KDF_ docs"}, {"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)"}, |