[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  05fa5fde10cdacb4899486da0c1a7619dd08bdb7 (commit)
      from  730bee525368eb01fbf221d9b1bcf590ccb5153f (commit)


- Log -----------------------------------------------------------------
commit 05fa5fde10cdacb4899486da0c1a7619dd08bdb7
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Dec 9 10:40:56 2020 +0000

    Fix some typos in EVP_PKEY-DH.pod
    
    A missing newline messes up how the code sample is rendered. Also a few
    miscellaneous typos are fixed.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13643)

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

Summary of changes:
 doc/man7/EVP_PKEY-DH.pod | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/man7/EVP_PKEY-DH.pod b/doc/man7/EVP_PKEY-DH.pod
index 64ba7079dc..f60ac3298e 100644
--- a/doc/man7/EVP_PKEY-DH.pod
+++ b/doc/man7/EVP_PKEY-DH.pod
@@ -14,7 +14,7 @@ applications that cannot be upgraded to use the approved safe-prime groups.
 
 See L<EVP_PKEY-FFC(7)> for more information about FFC keys.
 
-For B<DH> that is not a named group) the FIPS186-4 standard specifies that the
+For B<DH> that is not a named group the FIPS186-4 standard specifies that the
 values used for FFC parameter generation are also required for parameter
 validation. This means that optional FFC domain parameter values for
 I<seed>, I<pcounter> and I<gindex> may need to be stored for validation purposes.
@@ -24,7 +24,7 @@ For B<DH> the I<seed> and I<pcounter> can be stored in ASN1 data
 =head2 DH parameters
 
 In addition to the common FCC parameters that all FFC keytypes should support
-(see L<EVP_PKEY-FFC(7)/FFC parameters>)) the B<DH> keytype
+(see L<EVP_PKEY-FFC(7)/FFC parameters>) the B<DH> keytype
 implementation supports the following:
 
 =over 4
@@ -63,8 +63,8 @@ exchange message for the TLS protocol.
 
 =head2 DH domain parameter / key generation parameters
 
-In addition to the common FCC key generation parameters that all FFC key types
-should support (see L<EVP_PKEY-FFC(7)/FFC key generation parameters>)) the
+In addition to the common FFC key generation parameters that all FFC key types
+should support (see L<EVP_PKEY-FFC(7)/FFC key generation parameters>) the
 B<DH> keytype implementation supports the following:
 
 =over 4
@@ -138,6 +138,7 @@ An B<DH> key can be generated with a named safe prime group by calling:
     EVP_PKEY_CTX_free(pctx);
 
 Legacy B<DH> domain parameters can be generated by calling:
+
     unsigned int pbits = 2048;
     unsigned int qbits = 256;
     int gindex = 1;