diff options
author | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-12-11 01:31:30 +0100 |
---|---|---|
committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-12-15 04:39:58 +0100 |
commit | cb75a155b67942d32b808031199a7c947098e1e6 (patch) | |
tree | 4a320abfd4670f5f9cdb7fa8c2510608a849ce2d /apps/list.c | |
parent | 908465be599df1531457a476fc3a894c7dfbc6c8 (diff) |
Deprecate -cipher-commands and -digest-commands options
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13669)
Diffstat (limited to 'apps/list.c')
-rw-r--r-- | apps/list.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/list.c b/apps/list.c index 20973298a8..cf63394107 100644 --- a/apps/list.c +++ b/apps/list.c @@ -1295,8 +1295,10 @@ const OPTIONS list_options[] = { {"select", OPT_SELECT_NAME, 's', "Select a single algorithm"}, {"commands", OPT_COMMANDS, '-', "List of standard commands"}, {"standard-commands", OPT_COMMANDS, '-', "List of standard commands"}, +#ifndef OPENSSL_NO_DEPRECATED_3_0 {"digest-commands", OPT_DIGEST_COMMANDS, '-', - "List of message digest commands"}, + "List of message digest commands (deprecated)"}, +#endif {"digest-algorithms", OPT_DIGEST_ALGORITHMS, '-', "List of message digest algorithms"}, {"kdf-algorithms", OPT_KDF_ALGORITHMS, '-', @@ -1307,7 +1309,10 @@ const OPTIONS list_options[] = { "List of random number generators"}, {"mac-algorithms", OPT_MAC_ALGORITHMS, '-', "List of message authentication code algorithms"}, - {"cipher-commands", OPT_CIPHER_COMMANDS, '-', "List of cipher commands"}, +#ifndef OPENSSL_NO_DEPRECATED_3_0 + {"cipher-commands", OPT_CIPHER_COMMANDS, '-', + "List of cipher commands (deprecated)"}, +#endif {"cipher-algorithms", OPT_CIPHER_ALGORITHMS, '-', "List of cipher algorithms"}, {"encoders", OPT_ENCODERS, '-', "List of encoding methods" }, |