[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  018632ae986af33b2dddb2c1496bf91446d35abe (commit)
      from  9f5671c7e9f30dfa53b1a2b553f234c2761ceb66 (commit)


- Log -----------------------------------------------------------------
commit 018632ae986af33b2dddb2c1496bf91446d35abe
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Nov 3 10:43:06 2017 +0000

    Fix race condition in TLSProxy
    
    Normally TLSProxy waits for the s_server process to finish before
    continuing. However in cases where serverconnects > 1 we need to keep the
    s_server process around for a later test so we continue immediately. This
    means that TAP test output can end up being printed to stdout at the same
    time as s_server is printing stuff. This confuses the test runner and can
    cause spurious test failures. This commit introduces a small delay in cases
    where serverconnects > 1 in order to give s_server enough time to finish
    what it was doing before we continue to the next test.
    
    Fixes #4129
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4660)

-----------------------------------------------------------------------

Summary of changes:
 util/perl/TLSProxy/Proxy.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index f3e76bf..83a6494 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -23,6 +23,7 @@ use TLSProxy::Certificate;
 use TLSProxy::CertificateVerify;
 use TLSProxy::ServerKeyExchange;
 use TLSProxy::NewSessionTicket;
+use Time::HiRes qw/usleep/;
 
 my $have_IPv6 = 0;
 my $IP_factory;
@@ -343,6 +344,9 @@ sub clientstart
               .$self->serverpid."\n";
         waitpid( $self->serverpid, 0);
         die "exit code $? from server process\n" if $? != 0;
+    } else {
+        # Give s_server sufficient time to finish what it was doing
+        usleep(250000);
     }
     die "clientpid is zero\n" if $self->clientpid == 0;
     print "Waiting for client process to close: ".$self->clientpid."\n";