From d333c31130bca16f3d3b3ab6c3b674772e95ba0a Mon Sep 17 00:00:00 2001
From: Rich Salz <rsalz@akamai.com>
Date: Thu, 30 Jan 2020 12:19:13 -0500
Subject: [PATCH] Update command list

Add -standard-commands option to list command (documented)
Update standard commands list in openssl.pod

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/10972)
---
 apps/list.c          |  1 +
 doc/man1/openssl.pod | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/apps/list.c b/apps/list.c
index ed6f1c71ac..e8bb8533bb 100644
--- a/apps/list.c
+++ b/apps/list.c
@@ -629,6 +629,7 @@ const OPTIONS list_options[] = {
     {"1", OPT_ONE, '-', "List in one column"},
     {"verbose", OPT_VERBOSE, '-', "Verbose listing"},
     {"commands", OPT_COMMANDS, '-', "List of standard commands"},
+    {"standard-commands", OPT_COMMANDS, '-', "List of standard commands"},
     {"digest-commands", OPT_DIGEST_COMMANDS, '-',
      "List of message digest commands"},
     {"digest-algorithms", OPT_DIGEST_ALGORITHMS, '-',
diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod
index c1492d1028..a1e97cd9ce 100644
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod
@@ -119,11 +119,6 @@ CRL to PKCS#7 Conversion.
 Message Digest calculation. MAC calculations are superseded by
 L<openssl-mac(1)>.
 
-=item B<dh>
-
-Diffie-Hellman Parameter Management.
-Obsoleted by L<openssl-dhparam(1)>.
-
 =item B<dhparam>
 
 Generation and Management of Diffie-Hellman Parameters. Superseded by
@@ -158,10 +153,9 @@ Engine (loadable module) information and manipulation.
 
 Error Number to Error String Conversion.
 
-=item B<gendh>
+=item B<fipsinstall>
 
-Generation of Diffie-Hellman Parameters.
-Obsoleted by L<openssl-dhparam(1)>.
+FIPS configuration installation.
 
 =item B<gendsa>
 
@@ -176,6 +170,10 @@ Generation of Private Key or Parameters.
 
 Generation of RSA Private Key. Superseded by L<openssl-genpkey(1)>.
 
+=item B<help>
+
+Display information about a command's options.
+
 =item B<info>
 
 Display diverse information built into the OpenSSL libraries.
@@ -184,6 +182,10 @@ Display diverse information built into the OpenSSL libraries.
 
 Key Derivation Functions.
 
+=item B<list>
+
+List algorithms and features.
+
 =item B<mac>
 
 Message Authentication Code Calculation.
@@ -228,6 +230,10 @@ Public key algorithm cryptographic operation utility.
 
 Compute prime numbers.
 
+=item B<provider>
+
+Load and query providers.
+
 =item B<rand>
 
 Generate pseudo-random bytes.
-- 
2.25.1