From: Pauli <pauli@openssl.org>
Date: Mon, 17 May 2021 00:08:13 +0000 (+1000)
Subject: test: conditionally exclude unused code for no-tls1.2 build
X-Git-Tag: openssl-3.0.0-alpha17~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9cddf05424c3292956123e7fa4c16cb80867b3f;p=thirdparty%2Fopenssl.git

test: conditionally exclude unused code for no-tls1.2 build

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15301)
---

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 21220d5834d..0a7295c5cb1 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)
 {