Commit ceaa3894 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

TLSProxy/Record.pm: remove dead condition and improve readability. 



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

util/perl/TLSProxy/Record.pm

+45 −57
Original line number Diff line number Diff line
@@ -64,12 +64,6 @@ sub get_records 
    my $partial = "";

    my @record_list = ();

    my @message_list = ();

    my $data;

    my $content_type;

    my $version;

    my $len;

    my $len_real;

    my $decrypt_len;



    my $recnum = 1;

    while (length ($packet) > 0) {
@@ -79,26 +73,21 @@ sub get_records 
        } else {

            print " (client -> server)\n";

        }

        #Get the record header

        if (length($packet) < TLS_RECORD_HEADER_LENGTH

                || length($packet) < 5 + unpack("n", substr($packet, 3, 2))) {



        #Get the record header (unpack can't fail if $packet is too short)

        my ($content_type, $version, $len) = unpack('Cnn', $packet);



        if (length($packet) < TLS_RECORD_HEADER_LENGTH + $len) {

            print "Partial data : ".length($packet)." bytes\n";

            $partial = $packet;

            $packet = "";

        } else {

            ($content_type, $version, $len) = unpack('CnnC*', $packet);

            $data = substr($packet, 5, $len);

            last;

        }



        my $data = substr($packet, TLS_RECORD_HEADER_LENGTH, $len);



        print "  Content type: ".$record_type{$content_type}."\n";

        print "  Version: $tls_version{$version}\n";

            print "  Length: $len";

            if ($len == length($data)) {

                print "\n";

                $decrypt_len = $len_real = $len;

            } else {

                print " (expected), ".length($data)." (actual)\n";

                $decrypt_len = $len_real = length($data);

            }

        print "  Length: $len\n";



        my $record = TLSProxy::Record->new(

            $flight,
@@ -106,10 +95,10 @@ sub get_records 
            $version,

            $len,

            0,

                $len_real,

                $decrypt_len,

                substr($packet, TLS_RECORD_HEADER_LENGTH, $len_real),

                substr($packet, TLS_RECORD_HEADER_LENGTH, $len_real)

            $len,       # len_real

            $len,       # decrypt_len

            $data,      # data

            $data       # decrypt_data

        );



        if ($content_type != RT_CCS) {
@@ -135,10 +124,9 @@ sub get_records 
        my @messages = TLSProxy::Message->get_messages($server, $record);

        push @message_list, @messages;



            $packet = substr($packet, TLS_RECORD_HEADER_LENGTH + $len_real);

        $packet = substr($packet, TLS_RECORD_HEADER_LENGTH + $len);

        $recnum++;

    }

    }



    return (\@record_list, \@message_list, $partial);

}