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/fipsinstall.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/fipsinstall.c')
| -rw-r--r-- | apps/fipsinstall.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c index fd28b484b9..8846779932 100644 --- a/apps/fipsinstall.c +++ b/apps/fipsinstall.c @@ -32,18 +32,20 @@ typedef enum OPTION_choice { } OPTION_CHOICE; const OPTIONS fipsinstall_options[] = { + OPT_SECTION("General"), {"help", OPT_HELP, '-', "Display this summary"}, - {OPT_MORE_STR, 0, 0, "e.g: openssl fipsinstall -provider_name fips" - "-section_name fipsinstall -out fips.conf -module ./fips.so" - "-mac_name HMAC -macopt digest:SHA256 -macopt hexkey:00"}, {"verify", OPT_VERIFY, '-', "Verification mode, i.e verify a config file " "instead of generating one"}, - {"in", OPT_IN, '<', "Input config file, used when verifying"}, - {"out", OPT_OUT, '>', "Output config file, used when generating"}, {"module", OPT_MODULE, '<', "File name of the provider module"}, {"provider_name", OPT_PROV_NAME, 's', "FIPS provider name"}, {"section_name", OPT_SECTION_NAME, 's', "FIPS Provider config section name (optional)"}, + + OPT_SECTION("Input"), + {"in", OPT_IN, '<', "Input config file, used when verifying"}, + + OPT_SECTION("Output"), + {"out", OPT_OUT, '>', "Output config file, used when generating"}, {"mac_name", OPT_MAC_NAME, 's', "MAC name"}, {"macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form. " "See 'PARAMETER NAMES' in the EVP_MAC_ docs"}, |