]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix -no-tls1_2 in tests
authorTodd Short <todd.short@me.com>
Fri, 1 Apr 2022 14:54:45 +0000 (10:54 -0400)
committerTodd Short <todd.short@me.com>
Mon, 11 Apr 2022 16:01:41 +0000 (12:01 -0400)
This is specific for OpenSSL_1_1_1-stable branch

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

.github/workflows/run-checker-ci.yml
test/sslapitest.c

index a999492207b80f4fc9a0ad2bda28680535aa418d..ec208578ab8537484e19ca5cb959e816ab1c01f8 100644 (file)
@@ -20,6 +20,7 @@ jobs:
           no-tests,
           no-threads,
           no-tls,
+          no-tls1_2,
           no-tls1_3,
           no-ts,
           no-ui,
index a322f21d335dad57d90b876aa0a39698e8ac941b..ee6940cf1ec578191d4ddf60eaa65bcf976b77c7 100644 (file)
@@ -6751,7 +6751,12 @@ static int test_ticket_lifetime(int idx)
 #define TWO_WEEK_SEC (2 * ONE_WEEK_SEC)
 
     if (idx == 0) {
+#ifdef OPENSSL_NO_TLS1_2
+        TEST_info("Skipping: TLS 1.2 is disabled.");
+        return 1;
+#else
         version = TLS1_2_VERSION;
+#endif
     }
 
     if (!TEST_true(create_ssl_ctx_pair(TLS_server_method(),