The branch master has been updated via 0e3ecaec3ebf2ed0dfbcff07b7fa1cfdd8240d5c (commit) from 1b9f41a0df6ed2fac1c5303be909c2f70c404f20 (commit)
- Log ----------------------------------------------------------------- commit 0e3ecaec3ebf2ed0dfbcff07b7fa1cfdd8240d5c Author: Bernd Edlinger <bernd.edlin...@hotmail.de> Date: Fri Apr 13 18:48:06 2018 +0200 Rework partial packet handling once more Address the concern that commit c53c2fec raised differently. The original direction of the traffic is encoded in bit 0 of the flight number. Reviewed-by: Andy Polyakov <ap...@openssl.org> Reviewed-by: Richard Levitte <levi...@openssl.org> Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5923) ----------------------------------------------------------------------- Summary of changes: util/perl/TLSProxy/Proxy.pm | 2 +- util/perl/TLSProxy/Record.pm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm index 45d88bf..752b572 100644 --- a/util/perl/TLSProxy/Proxy.pm +++ b/util/perl/TLSProxy/Proxy.pm @@ -479,7 +479,7 @@ sub process_packet print "\n"; - if (scalar(@{$ret[0]}) == 0) { + if (scalar(@{$ret[0]}) == 0 or length($ret[2]) != 0) { return ""; } diff --git a/util/perl/TLSProxy/Record.pm b/util/perl/TLSProxy/Record.pm index acace36..49a0084 100644 --- a/util/perl/TLSProxy/Record.pm +++ b/util/perl/TLSProxy/Record.pm @@ -279,7 +279,8 @@ sub reconstruct_record my $server = shift; my $data; - if ($self->{sent}) { + #We only replay the records in the same direction + if ($self->{sent} || ($self->flight & 1) != $server) { return ""; } $self->{sent} = 1; _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits