[openssl] master update

[beldmit at gmail.com]

The branch master has been updated
       via  c8636ebf4a951447754d446810349618ddc77a60 (commit)
      from  71273ab57a27e0e6a1d4356891a2eb8e2298f458 (commit)


- Log -----------------------------------------------------------------
commit c8636ebf4a951447754d446810349618ddc77a60
Author: Hubert Kario <hubert at kario.pl>
Date:   Sat Jun 6 22:23:17 2020 +0200

    fix doc typo in bn_dh.c
    
    while RFC 2312 refers to S/MIME it doesn't actually declare any groups,
    RFC 2412 actually talks about DH extensively and the group
    defined in the code below is defined on page 47 of it
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/12076)

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

Summary of changes:
 crypto/bn/bn_dh.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c
index 9a7cc17f62..74ce024004 100644
--- a/crypto/bn/bn_dh.c
+++ b/crypto/bn/bn_dh.c
@@ -29,7 +29,7 @@
  * The prime is: 2^1536 - 2^1472 - 1 + 2^64 * { [2^1406 pi] + 741804 }
  *
  * RFC3526 specifies a generator of 2.
- * RFC2312 specifies a generator of 22.
+ * RFC2412 specifies a generator of 22.
  */
 static const BN_ULONG modp_1536_p[] = {
     BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0xCA237327, 0xF1746C08),