From: Frederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk>
Date: Tue, 30 Jan 2024 13:51:32 +0000 (+0100)
Subject: Check if creating a tlsproxy instance per use allows to run the tests on windows.
X-Git-Tag: openssl-3.3.0-alpha1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=635b56296604fecd301d45252490458d1a9fd6da;p=thirdparty%2Fopenssl.git

Check if creating a tlsproxy instance per use allows to run the tests on windows.

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 8c95d48468d..2a4e64c50ec 100644
--- a/test/recipes/70-test_sslrecords.t
+++ b/test/recipes/70-test_sslrecords.t
@@ -33,9 +33,11 @@ my $boundary_test_type = undef;
 my $fatal_alert = undef; # set by filters at expected fatal alerts
 my $sslv2testtype = undef;
 my $proxy_start_success = 0;
+my $dtlsproxy = undef;
+my $tlsproxy = undef;
 
-my $proxy = TLSProxy::Proxy->new(
-    undef,
+my $dummyproxy = TLSProxy::Proxy->new(
+    \&add_empty_recs_filter,
     cmdstr(app([ "openssl" ]), display => 1),
     srctop_file("apps", "server.pem"),
     (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
@@ -44,41 +46,45 @@ my $proxy = 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
-$proxy->serverflags("-tls1_2");
-$proxy->clientflags("-no_tls1_3");
+$dummyproxy->serverflags("-tls1_2");
+$dummyproxy->clientflags("-no_tls1_3");
 
-$proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
+$dummyproxy->start() or plan skip_all => "Unable to start up Proxy for tests";
 plan tests => 42;
 
 SKIP: {
     skip "TLS 1.2 is disabled", 21 if disabled("tls1_2");
     # Run tests with TLS
+    $tlsproxy = TLSProxy::Proxy->new(
+        \&add_empty_recs_filter,
+        cmdstr(app([ "openssl" ]), display => 1),
+        srctop_file("apps", "server.pem"),
+        (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
+    );
     run_tests(0);
 }
 
 SKIP: {
     skip "DTLS 1.2 is disabled", 21 if disabled("dtls1_2");
     # Run tests with DTLS
+    $dtlsproxy = TLSProxy::Proxy->new_dtls(
+        \&add_empty_recs_filter,
+        cmdstr(app([ "openssl" ]), display => 1),
+        srctop_file("apps", "server.pem"),
+        (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
+    );
     run_tests(1);
 }
 
 sub run_tests
 {
     my $run_test_as_dtls = shift;
+
+    my $proxy;
     if ($run_test_as_dtls == 1) {
-        $proxy = TLSProxy::Proxy->new_dtls(
-            \&add_empty_recs_filter,
-            cmdstr(app([ "openssl" ]), display => 1),
-            srctop_file("apps", "server.pem"),
-            (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
-        );
+        $proxy = $dtlsproxy;
     } else {
-        $proxy = TLSProxy::Proxy->new(
-            \&add_empty_recs_filter,
-            cmdstr(app([ "openssl" ]), display => 1),
-            srctop_file("apps", "server.pem"),
-            (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
-        );
+        $proxy = $tlsproxy;
     }
 
     $fatal_alert = 0; # set by filters at expected fatal alerts