[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  c9cddf05424c3292956123e7fa4c16cb80867b3f (commit)
      from  a227ff336fc934b4a52c4659ae423dfa10efd5f3 (commit)


- Log -----------------------------------------------------------------
commit c9cddf05424c3292956123e7fa4c16cb80867b3f
Author: Pauli <pauli at openssl.org>
Date:   Mon May 17 10:08:13 2021 +1000

    test: conditionally exclude unused code for no-tls1.2 build
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/15301)

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

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

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 21220d5834..0a7295c5cb 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -4649,7 +4649,9 @@ static int test_key_exchange(int idx)
     return testresult;
 }
 
-# if !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_DH)
+# if !defined(OPENSSL_NO_TLS1_2) \
+     && !defined(OPENSSL_NO_EC)  \
+     && !defined(OPENSSL_NO_DH)
 static int set_ssl_groups(SSL *serverssl, SSL *clientssl, int clientmulti,
                           int isecdhe, int idx)
 {