summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-03-19 08:06:22 +0100
committerRichard Levitte <levitte@openssl.org>2018-03-19 08:46:35 +0100
commitb4ea929d51c6d0ec0aab78072b81f39289b6de84 (patch)
treeaf6f1d1300b37078671abc3c02fea521abf8bcc5 /util
parent1f71819af527883d2438cfc7f6cd9962eb155155 (diff)
In TLSProxy::Proxy, specify TLSv1.2 as maximum allowable protocol
Partially fixes #5661 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5662)
Diffstat (limited to 'util')
-rw-r--r--util/perl/TLSProxy/Proxy.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index 88b048ecc3..7d9cb37f77 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -178,7 +178,7 @@ sub start
$pid = fork();
if ($pid == 0) {
my $execcmd = $self->execute
- ." s_server -no_comp -rev -engine ossltest -accept "
+ ." s_server -max_protocol TLSv1.2 -no_comp -rev -engine ossltest -accept "
.($self->server_port)
." -cert ".$self->cert." -naccept ".$self->serverconnects;
unless ($self->supports_IPv6) {
@@ -215,7 +215,7 @@ sub clientstart
$echostr = "test";
}
my $execcmd = "echo ".$echostr." | ".$self->execute
- ." s_client -engine ossltest -connect "
+ ." s_client -max_protocol TLSv1.2 -engine ossltest -connect "
.($self->proxy_addr).":".($self->proxy_port);
unless ($self->supports_IPv6) {
$execcmd .= " -4";