On Thu, Jul 27, 2017 at 08:14:45AM -0700, Daniel Schepler wrote: > On Thu, Jul 27, 2017 at 12:02 AM, Kurt Roeckx <k...@roeckx.be> wrote: > > Is that reproducible? > > Yes, it's definitely reproducible on my machine.
Does the attached patch fix it? Kurt
>From b72668a0d3586ee2560f0536c43e18991a4cfc6f Mon Sep 17 00:00:00 2001 From: Matt Caswell <m...@openssl.org> Date: Fri, 26 May 2017 13:06:08 +0100 Subject: [PATCH] Fix a Proxy race condition Issue #3562 describes a problem where a race condition can occur in the Proxy such that a test "ok" line can appear in the middle of other text causing the test harness to miss it. The issue is that we do not wait for the client process to finish after the test is complete, so that process may continue to write data to stdout/stderr at the same time that the test harness does. This commit fixes TLSProxy so that we always wait for the client process to finish before continuing. Fixes #3562 Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3567) --- util/TLSProxy/Proxy.pm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/util/TLSProxy/Proxy.pm b/util/TLSProxy/Proxy.pm index a826cb5257..5c363e76ed 100644 --- a/util/TLSProxy/Proxy.pm +++ b/util/TLSProxy/Proxy.pm @@ -49,6 +49,7 @@ sub new clientflags => "", serverconnects => 1, serverpid => 0, + clientpid => 0, reneg => 0, sessionfile => undef, @@ -113,6 +114,7 @@ sub clearClient $self->{message_list} = []; $self->{clientflags} = ""; $self->{sessionfile} = undef; + $self->{clientpid} = 0; $is_tls13 = 0; $ciphersuite = undef; @@ -240,6 +242,7 @@ sub clientstart } exec($execcmd); } + $self->clientpid($pid); } # Wait for incoming connection from client @@ -338,6 +341,10 @@ sub clientstart waitpid( $self->serverpid, 0); die "exit code $? from server process\n" if $? != 0; } + die "clientpid is zero\n" if $self->clientpid == 0; + print "Waiting for client process to close: ".$self->clientpid."\n"; + waitpid($self->clientpid, 0); + return 1; } @@ -531,6 +538,14 @@ sub serverpid } return $self->{serverpid}; } +sub clientpid +{ + my $self = shift; + if (@_) { + $self->{clientpid} = shift; + } + return $self->{clientpid}; +} sub fill_known_data { -- 2.13.2
