generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Empty NewSessionTicket: test session resumption

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Emilia Kasper
2015-09-16 17:47:55 +02:00
parent 7f6d90ac75
commit cf7f85927c
4 changed files with 103 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
util/TLSProxy/Message.pm
View File

@@ -370,24 +370,34 @@ sub repack
$lenhi = length($self->data) >> 8;
$msgdata = pack('CnC', $self->mt, $lenhi, $lenlo).$self->data;
if ($numrecs == 0) {
#The message is fully contained within one record
my ($rec) = @{$self->records};
my $recdata = $rec->decrypt_data;
if (length($msgdata) != ${$self->message_frag_lens}[0]
+ TLS_MESSAGE_HEADER_LENGTH) {
#Message length has changed! Better adjust the record length
my $diff = length($msgdata) - ${$self->message_frag_lens}[0]
- TLS_MESSAGE_HEADER_LENGTH;
$rec->len($rec->len + $diff);
my $old_length;
# We use empty message_frag_lens to indicates that pre-repacking,
# the message wasn't present. The first fragment length doesn't include
# the TLS header, so we need to check and compute the right length.
if (@{$self->message_frag_lens}) {
$old_length = ${$self->message_frag_lens}[0] +
TLS_MESSAGE_HEADER_LENGTH;
} else {
$old_length = 0;
}
$rec->data(substr($recdata, 0, $self->startoffset)
.($msgdata)
.substr($recdata, ${$self->message_frag_lens}[0]
+ TLS_MESSAGE_HEADER_LENGTH));
my $prefix = substr($recdata, 0, $self->startoffset);
my $suffix = substr($recdata, $self->startoffset + $old_length);
$rec->decrypt_data($prefix.($msgdata).($suffix));
# TODO(openssl-team): don't keep explicit lengths.
# (If a length override is ever needed to construct invalid packets,
# use an explicit override field instead.)
$rec->decrypt_len(length($rec->decrypt_data));
$rec->len($rec->len + length($msgdata) - $old_length);
# Don't support re-encryption.
$rec->data($rec->decrypt_data);
#Update the fragment len in case we changed it above
${$self->message_frag_lens}[0] = length($msgdata)
@@ -471,5 +481,10 @@ sub message_frag_lens
}
return $self->{message_frag_lens};
}
sub encoded_length
{
my $self = shift;
return TLS_MESSAGE_HEADER_LENGTH + length($self->data);
}
1;