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

Fixups in libssl test harness

Browse Source 
- select an actual file handle for devnull
- do not declare $msgdata twice
- SKE records sometimes seem to come without sig
- in SKE parsing, use and use $pub_key_len when parsing $pub_key

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Richard Levitte 2015-08-13 19:14:34 +02:00
parent b3a231db49
commit 4deefd6567
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/TLSProxy/Message.pm
View File

@ -350,7 +350,7 @@ sub repack
$lenlo = length($self->data) & 0xff;
$lenhi = length($self->data) >> 8;
my $msgdata = pack('CnC', $self->mt, $lenhi, $lenlo).$self->data;
$msgdata = pack('CnC', $self->mt, $lenhi, $lenlo).$self->data;
if ($numrecs == 0) {

3
util/TLSProxy/Proxy.pm
View File

@ -142,7 +142,8 @@ sub start
my $oldstdout;
if(!$self->debug) {
$oldstdout = select(File::Spec->devnull());
open DEVNULL, ">", File::Spec->devnull();
$oldstdout = select(DEVNULL);
}
# Create the Proxy socket

11
util/TLSProxy/ServerKeyExchange.pm
View File

@ -104,13 +104,16 @@ sub parse
my $pub_key_len = unpack('n', substr($self->data, $ptr));
$ptr += 2;
my $pub_key = substr($self->data, $ptr, $pub_key_len);
$ptr += $g_len;
$ptr += $pub_key_len;
#We assume its signed
my $sig_len = unpack('n', substr($self->data, $ptr));
$ptr += 2;
my $sig = substr($self->data, $ptr, $sig_len);
$ptr += $sig_len;
my $sig = "";
if (defined $sig_len) {
$ptr += 2;
$sig = substr($self->data, $ptr, $sig_len);
$ptr += $sig_len;
}
$self->p($p);
$self->g($g);