[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  1127754e4877b2a4bd53112de115041d1952fa12 (commit)
      from  97b59744f2ad91adf606e6f77e355e97413e7b2c (commit)


- Log -----------------------------------------------------------------
commit 1127754e4877b2a4bd53112de115041d1952fa12
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Apr 26 17:27:32 2021 -0400

    Note that dhparam does support X9.42
    
    Fix other wording, too.
    
    Fixes: #13151
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15038)

-----------------------------------------------------------------------

Summary of changes:
 doc/man1/openssl-dhparam.pod.in | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/doc/man1/openssl-dhparam.pod.in b/doc/man1/openssl-dhparam.pod.in
index eee69a69de..7bbd04ba5d 100644
--- a/doc/man1/openssl-dhparam.pod.in
+++ b/doc/man1/openssl-dhparam.pod.in
@@ -30,6 +30,10 @@ B<openssl dhparam>
 
 This command is used to manipulate DH parameter files.
 
+See L<openssl-genpkey(1)/EXAMPLES> for examples on how to generate
+a key using a named safe prime group without generating intermediate
+parameters.
+
 =head1 OPTIONS
 
 =over 4
@@ -109,20 +113,12 @@ This option prints out the DH parameters in human readable form.
 This command replaces the B<dh> and B<gendh> commands of previous
 releases.
 
-OpenSSL currently only supports the older PKCS#3 DH, not the newer X9.42
-DH.
-
-This command manipulates DH parameters not keys.
-
-=head1 BUGS
-
-There should be a way to generate and manipulate DH keys.
-
 =head1 SEE ALSO
 
 L<openssl(1)>,
 L<openssl-pkeyparam(1)>,
-L<openssl-dsaparam(1)>
+L<openssl-dsaparam(1)>,
+L<openssl-genpkey(1)>.
 
 =head1 HISTORY