From: Matt Caswell <matt@openssl.org>
Date: Sat, 19 Sep 2015 19:07:33 +0000 (+0100)
Subject: Fix some test failures when Configured with zlib
X-Git-Tag: OpenSSL_1_1_0-pre1~597
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=50db968aad353756f71b844d6edc1cf58231e78c;p=oweals%2Fopenssl.git

Fix some test failures when Configured with zlib

TLSProxy was failing if we are Configured with compression because it
doesn't support it. This fix simply switches compression off for the
purposes of the test.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/util/TLSProxy/Proxy.pm b/util/TLSProxy/Proxy.pm
index 75094f1a44..6c1ea7780a 100644
--- a/util/TLSProxy/Proxy.pm
+++ b/util/TLSProxy/Proxy.pm
@@ -144,7 +144,8 @@ sub start
         open(STDOUT, ">", File::Spec->devnull())
             or die "Failed to redirect stdout";
         open(STDERR, ">&STDOUT");
-        my $execcmd = $self->execute." s_server -rev -engine ossltest -accept "
+        my $execcmd = $self->execute
+            ." s_server -no_comp -rev -engine ossltest -accept "
             .($self->server_port)
             ." -cert ".$self->cert." -naccept ".$self->serverconnects;
         if ($self->ciphers ne "") {