[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  f5680cd0eb7fdf95db5a55028b889ea56295dac9 (commit)
      from  f2ceefc3f9ffe5936b775eba69be8ffb42fd20ea (commit)


- Log -----------------------------------------------------------------
commit f5680cd0eb7fdf95db5a55028b889ea56295dac9
Author: Matt Caswell <matt at openssl.org>
Date:   Fri May 14 14:00:22 2021 +0100

    Add a CHANGES entry for fully pluggable groups
    
    Fixes #12283
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/15282)

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

Summary of changes:
 CHANGES.md | 7 +++++++
 NEWS.md    | 1 +
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8c72ac33d0..eb199fac70 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -315,6 +315,13 @@ OpenSSL 3.0
 
    *Matt Caswell*
 
+ * Implemented support for fully "pluggable" TLSv1.3 groups. This means that
+   providers may supply their own group implementations (using either the "key
+   exchange" or the "key encapsulation" methods) which will automatically be
+   detected and used by libssl.
+
+   *Matt Caswell, Nicola Tuveri*
+
  * The undocumented function X509_certificate_type() has been deprecated;
    applications can use X509_get0_pubkey() and X509_get0_signature() to
    get the same information.
diff --git a/NEWS.md b/NEWS.md
index 78d0772b9a..13b2511651 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -20,6 +20,7 @@ OpenSSL 3.0
 
 ### Major changes between OpenSSL 1.1.1 and OpenSSL 3.0 [under development]
 
+  * Implemented support for fully "pluggable" TLSv1.3 groups
   * Added suport for Kernel TLS (KTLS)
   * Changed the license to the Apache License v2.0.
   * Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2,