From: Benjamin Kaduk <bkaduk@akamai.com>
Date: Wed, 1 Apr 2020 20:51:40 +0000 (-0700)
Subject: sslapitest: only compile test when it will be used
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0f1f0bf99aad06008f840e1a5bf93a8745e9a774;p=oweals%2Fopenssl.git

sslapitest: only compile test when it will be used

The test_ccs_change_cipher() test routine is used only when TLS 1.2
is enabled; to fix the strict-warnings build we should not try to
compile it when TLS 1.2 is disabled, either.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11458)

(cherry picked from commit fb121631e702352d47049ac8e2e709b11c3318e4)
---

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 5c118108ef..b3cd30d9a8 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -590,7 +590,6 @@ end:
 
     return testresult;
 }
-#endif
 
 /*
  * Very focused test to exercise a single case in the server-side state
@@ -702,6 +701,7 @@ end:
 
     return testresult;
 }
+#endif
 
 static int execute_test_large_message(const SSL_METHOD *smeth,
                                       const SSL_METHOD *cmeth,