summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Mazurin <mazurin.alexey@gmail.com>2015-12-29 17:48:22 +0400
committerAlexey Mazurin <mazurin.alexey@gmail.com>2015-12-29 17:48:22 +0400
commit6db6275045f4e71752bc890a4ccea643779e5010 (patch)
treecd89d2b008eb3fcda46059599029576db943244b
parent81054c945a6ebf7a7d9d55a9393c76e3951b6766 (diff)
downloadspreadsheet-parsexlsx-6db6275045f4e71752bc890a4ccea643779e5010.tar.gz
spreadsheet-parsexlsx-6db6275045f4e71752bc890a4ccea643779e5010.zip
replace in pack() "V" to "L<"
-rw-r--r--lib/Spreadsheet/ParseXLSX/Decryptor.pm12
-rw-r--r--lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm4
-rw-r--r--lib/Spreadsheet/ParseXLSX/Decryptor/Standard.pm2
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/Spreadsheet/ParseXLSX/Decryptor.pm b/lib/Spreadsheet/ParseXLSX/Decryptor.pm
index fd97fac..6d09800 100644
--- a/lib/Spreadsheet/ParseXLSX/Decryptor.pm
+++ b/lib/Spreadsheet/ParseXLSX/Decryptor.pm
@@ -27,7 +27,7 @@ sub open {
my $buffer;
$infoFH->read($buffer, 8);
- my ($majorVers, $minorVers) = unpack('vv', $buffer);
+ my ($majorVers, $minorVers) = unpack('s<s<', $buffer);
my $xlsx;
if ($majorVers == 4 && $minorVers == 4) {
@@ -70,13 +70,13 @@ sub _standardDecryption {
my $buffer;
my $n = $infoFH->read($buffer, 24);
- my ($encryptionHeaderSize, undef, undef, $algID, $algIDHash, $keyBits) = unpack('VVVVVV', $buffer);
+ my ($encryptionHeaderSize, undef, undef, $algID, $algIDHash, $keyBits) = unpack('L<*', $buffer);
$infoFH->seek($encryptionHeaderSize - 0x14, IO::File::SEEK_CUR);
$infoFH->read($buffer, 4);
- my $saltSize = unpack('V', $buffer);
+ my $saltSize = unpack('L<', $buffer);
my ($salt, $encryptedVerifier, $verifierHashSize, $encryptedVerifierHash);
@@ -84,7 +84,7 @@ sub _standardDecryption {
$infoFH->read($encryptedVerifier, 16);
$infoFH->read($buffer, 4);
- $verifierHashSize = unpack('V', $buffer);
+ $verifierHashSize = unpack('L<', $buffer);
$infoFH->read($encryptedVerifierHash, 32);
$infoFH->close();
@@ -120,7 +120,7 @@ sub _standardDecryption {
my $inbuf;
$packageFH->read($inbuf, 8);
- my $fileSize = unpack('V', $inbuf);
+ my $fileSize = unpack('L<', $inbuf);
$decryptor->decryptFile($packageFH, $fh, 1024, $fileSize);
@@ -174,7 +174,7 @@ sub _agileDecryption {
my $inbuf;
$packageFH->read($inbuf, 8);
- my $fileSize = unpack('V', $inbuf);
+ my $fileSize = unpack('L<', $inbuf);
$fileDecryptor->decryptFile($packageFH, $fh, 4096, $key, $fileSize);
diff --git a/lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm b/lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm
index b480c7a..0405a68 100644
--- a/lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm
+++ b/lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm
@@ -23,7 +23,7 @@ sub _generateDecryptionKey {
unless ($self->{pregeneratedKey}) {
$hash = $self->{hashProc}->($self->{salt} . Encode::encode('UTF-16LE', $self->{password}));
for (my $i = 0; $i < $self->{spinCount}; $i++) {
- $hash = $self->{hashProc}->(pack('V', $i) . $hash);
+ $hash = $self->{hashProc}->(pack('L<', $i) . $hash);
}
$self->{pregeneratedKey} = $hash;
}
@@ -68,7 +68,7 @@ sub decryptFile {
my $i = 0;
while (($fileSize > 0) && (my $inlen = $inFile->read($inbuf, $bufferLength))) {
- my $blockId = pack('V', $i);
+ my $blockId = pack('L<', $i);
my $iv = $self->_generateInitializationVector($blockId, $self->{blockSize});
diff --git a/lib/Spreadsheet/ParseXLSX/Decryptor/Standard.pm b/lib/Spreadsheet/ParseXLSX/Decryptor/Standard.pm
index e5c569d..b637a0b 100644
--- a/lib/Spreadsheet/ParseXLSX/Decryptor/Standard.pm
+++ b/lib/Spreadsheet/ParseXLSX/Decryptor/Standard.pm
@@ -47,7 +47,7 @@ sub _generateDecryptionKey {
unless ($self->{pregeneratedKey}) {
$hash = $self->{hashProc}->($self->{salt} . Encode::encode('UTF-16LE', $self->{password}));
for (my $i = 0; $i < $self->{spinCount}; $i++) {
- $hash = $self->{hashProc}->(pack('V', $i) . $hash);
+ $hash = $self->{hashProc}->(pack('L<', $i) . $hash);
}
$self->{pregeneratedKey} = $hash;
}