提交 4deefd65 编写于 作者: R Richard Levitte

Fixups in libssl test harness

- 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: NMatt Caswell <matt@openssl.org>
上级 b3a231db
......@@ -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) {
......
......@@ -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
......
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册