[openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  3bd5319b5d0df9ecf05c8baba2c401ad8e3ba130 (commit)
      from  d101700dffa710f3de0ab6465dff688f55214bcc (commit)


- Log -----------------------------------------------------------------
commit 3bd5319b5d0df9ecf05c8baba2c401ad8e3ba130
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Tue Jul 6 07:49:39 2021 -0700

    Fix comment for test_negotiated_group() test order
    
    Because of how the 'client_multi' variable is set, we end up
    running the tests where the client configures multiple groups (and
    the server only configures one) before the ones where the server configures
    multiple groups (and the client only configures one).
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16007)

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

Summary of changes:
 test/sslapitest.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 1b3db55d6b..49f7ef639d 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -4751,14 +4751,14 @@ static int set_ssl_groups(SSL *serverssl, SSL *clientssl, int clientmulti,
  * was offered in the resumption ClientHello.
  *
  * Using E for the number of EC groups and F for the number of FF groups:
- * E tests of ECDHE with TLS 1.3, client sends only one group
- * F tests of FFDHE with TLS 1.3, client sends only one group
- * E tests of ECDHE with TLS 1.2, client sends only one group
- * F tests of FFDHE with TLS 1.2, client sends only one group
  * E tests of ECDHE with TLS 1.3, server only has one group
  * F tests of FFDHE with TLS 1.3, server only has one group
  * E tests of ECDHE with TLS 1.2, server only has one group
  * F tests of FFDHE with TLS 1.2, server only has one group
+ * E tests of ECDHE with TLS 1.3, client sends only one group
+ * F tests of FFDHE with TLS 1.3, client sends only one group
+ * E tests of ECDHE with TLS 1.2, client sends only one group
+ * F tests of FFDHE with TLS 1.2, client sends only one group
  */
 static int test_negotiated_group(int idx)
 {