From: Frederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk>
Date: Wed, 31 Jan 2024 08:16:47 +0000 (+0100)
Subject: Adds some version guards for dummy proxy.
X-Git-Tag: openssl-3.3.0-alpha1~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb62ca5fb06295f7bc7b5e2b38cfdb9769f87e21;p=thirdparty%2Fopenssl.git

Adds some version guards for dummy proxy.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)
---

diff --git a/test/recipes/70-test_sslrecords.t b/test/recipes/70-test_sslrecords.t
index f3cbe09a448..b92e7cbcd95 100644
--- a/test/recipes/70-test_sslrecords.t
+++ b/test/recipes/70-test_sslrecords.t
@@ -26,6 +26,9 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled"
 plan skip_all => "$test_name needs the sock feature enabled"
     if disabled("sock");
 
+plan skip_all => "$test_name needs TLS1.2 or TLS1.3 for running dummyproxy check"
+    if disabled("tls1_3") && disabled("tls1_2");
+
 my $testplanisset = 0;
 my $inject_recs_num = undef;
 my $content_type = undef;
@@ -46,9 +49,10 @@ my $dummyproxy = TLSProxy::Proxy->new(
 # Avoid failures with tls1_3 disabled builds
 # TLSProxy defaults to use tls1_3 and tls1_2 is required by the tests so
 # set it here and check that a simple proxy works before running the tests
-$dummyproxy->serverflags("-tls1_2");
-$dummyproxy->clientflags("-no_tls1_3");
-
+if (disabled("tls1_3")) {
+    $dummyproxy->serverflags("-tls1_2");
+    $dummyproxy->clientflags("-no_tls1_3");
+}
 $dummyproxy->start() or plan skip_all => "Unable to start up Proxy for tests";
 plan tests => 42;