Commit 4b684b54 authored by Matt Caswell's avatar Matt Caswell
Browse files

Support renegotiation in TLSProxy 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1983)
parent 6bc3bcb3

util/TLSProxy/Proxy.pm

+18 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ sub new 
        clientflags => "",

        serverconnects => 1,

        serverpid => 0,

        reneg => 0,



        #Public read

        execute => $execute,
@@ -117,6 +118,7 @@ sub clear 
    $self->{serverflags} = "";

    $self->{serverconnects} = 1;

    $self->{serverpid} = 0;

    $self->{reneg} = 0;

}



sub restart
@@ -200,7 +202,13 @@ sub clientstart 
                    or die "Failed to redirect stdout: $!";

                open(STDERR, ">&STDOUT");

            }

            my $execcmd = "echo test | ".$self->execute

            my $echostr;

            if ($self->reneg()) {

                $echostr = "R";

            } else {

                $echostr = "test";

            }

            my $execcmd = "echo ".$echostr." | ".$self->execute

                 ." s_client -engine ossltest -connect "

                 .($self->proxy_addr).":".($self->proxy_port);

            if ($self->cipherc ne "") {
@@ -505,4 +513,13 @@ sub fill_known_data 
    return $ret;

}



sub reneg

{

    my $self = shift;

    if (@_) {

      $self->{reneg} = shift;

    }

    return $self->{reneg};

}



1;