]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Deprecate -cipher-commands and -digest-commands options
authorDmitry Belyavskiy <beldmit@gmail.com>
Fri, 11 Dec 2020 00:31:30 +0000 (01:31 +0100)
committerDmitry Belyavskiy <beldmit@gmail.com>
Tue, 15 Dec 2020 03:39:58 +0000 (04:39 +0100)
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13669)

apps/list.c

index 20973298a86a533d8a54d07f93ca64ee27c42c01..cf63394107d33e479d4b1bd60918a4b625f29173 100644 (file)
@@ -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" },