From: Todd Short <todd.short@me.com>
Date: Fri, 1 Apr 2022 14:54:45 +0000 (-0400)
Subject: Fix -no-tls1_2 in tests
X-Git-Tag: openssl-3.2.0-alpha1~2771
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40fb5a4ce3e90c9e8702aad0fcf43eb9f6edf419;p=thirdparty%2Fopenssl.git

Fix -no-tls1_2 in tests

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/18019)
---

diff --git a/.github/workflows/run-checker-ci.yml b/.github/workflows/run-checker-ci.yml
index 1aca0170f83..33ec553a886 100644
--- a/.github/workflows/run-checker-ci.yml
+++ b/.github/workflows/run-checker-ci.yml
@@ -28,6 +28,7 @@ jobs:
           no-tests,
           no-threads,
           no-tls,
+          no-tls1_2,
           no-tls1_3,
           enable-trace enable-fips,
           no-ts,
diff --git a/test/sslapitest.c b/test/sslapitest.c
index a490961d80e..2ab082e3e0b 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -9427,7 +9427,11 @@ static int test_ticket_lifetime(int idx)
 #define TWO_WEEK_SEC (2 * ONE_WEEK_SEC)
 
     if (idx == 0) {
+#ifdef OPENSSL_NO_TLS1_2
+        return TEST_skip("TLS 1.2 is disabled.");
+#else
         version = TLS1_2_VERSION;
+#endif
     }
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),