From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 22 Mar 2024 15:11:42 +0000 (+0100)
Subject: 82-test_ocsp_cert_chain.t: kill -HUP the server after client quits
X-Git-Tag: openssl-3.4.0-alpha1~623
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4fcc21fdccfde90bda6f8a94d7f4e07f947e38f;p=thirdparty%2Fopenssl.git

82-test_ocsp_cert_chain.t: kill -HUP the server after client quits

This ensures even if the connection for some reason
fails, the server will terminate and the test won't get
stuck.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/23857)
---

diff --git a/test/recipes/82-test_ocsp_cert_chain.t b/test/recipes/82-test_ocsp_cert_chain.t
index 1328776a145..a0c3737be89 100644
--- a/test/recipes/82-test_ocsp_cert_chain.t
+++ b/test/recipes/82-test_ocsp_cert_chain.t
@@ -120,6 +120,9 @@ sub run_test {
     my @s_client_cmd = ("s_client", "-connect", "localhost:$server_port", "-status", "-verify_return_error");
     my $s_client_pid = open3(my $s_client_i, my $s_client_o, my $s_client_e = gensym, $shlib_wrap, $apps_openssl, @s_client_cmd);
 
+    waitpid($s_client_pid, 0);
+    kill 'HUP', $s_server_pid, $ocsp_pid;
+
     ### the output from s_server that we want to check is written to its stderr
     ###    cert_status: ocsp response sent:
 
@@ -133,9 +136,6 @@ sub run_test {
         }
     }
     ok($resp == 1, "check s_server sent ocsp response");
-
-    waitpid($s_client_pid, 0);
-    kill 'HUP', $s_server_pid, $ocsp_pid;
 }
 
 run_test();