From fc959d7171c534b36c79791e5101ff4dc5edef96 Mon Sep 17 00:00:00 2001
From: Shane Lontis <shane.lontis@oracle.com>
Date: Tue, 22 Sep 2020 11:02:53 +1000
Subject: Update openssl list to support new provider objects.

Added Keymanager, signatures, kem, asymciphers and keyexchange.
Added -select option so that specific algorithms are easier to view when using -verbose

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12943)
---
 doc/man1/openssl-list.pod.in | 42 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/doc/man1/openssl-list.pod.in b/doc/man1/openssl-list.pod.in
index 26680849a2..3493fad843 100644
--- a/doc/man1/openssl-list.pod.in
+++ b/doc/man1/openssl-list.pod.in
@@ -10,6 +10,7 @@ openssl-list - list algorithms and features
 B<openssl list>
 [B<-help>]
 [B<-verbose>]
+[B<-select> I<name>]
 [B<-1>]
 [B<-commands>]
 [B<-digest-commands>]
@@ -21,10 +22,15 @@ B<openssl list>
 [B<-cipher-algorithms>]
 [B<-encoders>]
 [B<-decoders>]
+[B<-key-managers>]
+[B<-key-exchange-algorithms>]
+[B<-kem-algorithms>]
+[B<-signature-algorithms>]
+[B<-asymcipher-algorithms>]
 [B<-public-key-algorithms>]
+[B<-public-key-methods>]
 {- output_off() if $disabled{"deprecated-3.0"}; ""
--}[B<-public-key-methods>]
-[B<-engines>]
+-}[B<-engines>]
 {- output_on() if $disabled{"deprecated-3.0"}; ""
 -}[B<-disabled>]
 [B<-objects>]
@@ -49,6 +55,10 @@ Display a usage message.
 Displays extra information.
 The options below where verbosity applies say a bit more about what that means.
 
+=item B<-select> I<name>
+
+Only list algorithms that match this name.
+
 =item B<-1>
 
 List the commands, digest-commands, or cipher-commands in a single column.
@@ -106,13 +116,32 @@ information on what parameters each implementation supports.
 
 Display a list of public key algorithms, with each algorithm as
 a block of multiple lines, all but the first are indented.
-{- output_off() if $disabled{"deprecated-3.0"}; "" -}
+The options B<key-exchange-algorithms>, B<kem-algorithms>,
+B<signature-algorithms>, and B<asymcipher-algorithms> will display similar info.
 
 =item B<-public-key-methods>
 
-This option is deprecated.
+Display a list of public key methods.
+
+=item B<-key-managers>
+
+Display a list of key managers.
+
+=item B<-key-exchange-algorithms>
+
+Display a list of key exchange algorithms.
+
+=item B<-kem-algorithms>
+
+Display a list of key encapsulation algorithms.
+
+=item B<-signature-algorithms>
+
+Display a list of signature algorithms.
+
+=item B<-asymcipher-algorithms>
 
-Display a list of public key method OIDs.
+Display a list of asymmetric cipher algorithms.
 
 =item B<-engines>
 
@@ -172,8 +201,7 @@ In both cases, C<bar> is the name of the provider.
 
 =head1 HISTORY
 
-The B<-engines> and B<-public-key-methods> options were deprecated in
-OpenSSL 3.0.
+The B<-engines> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-- 
cgit v1.2.3