Commit b4ea929d authored by Richard Levitte's avatar Richard Levitte
Browse files

In TLSProxy::Proxy, specify TLSv1.2 as maximum allowable protocol 



Partially fixes #5661

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5662)
parent 1f71819a

util/perl/TLSProxy/Proxy.pm

+2 −2
Original line number Diff line number Diff line
@@ -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";