diff options
author | Jesse Luehrs <doy@tozt.net> | 2016-05-22 20:01:43 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2016-05-22 20:01:43 -0400 |
commit | 6d49e45380bbcd75f7621ab1690bd9652e3d414d (patch) | |
tree | f245800e15a3202f262b2a70bbfd4b635bd8d0d9 /lib/Spreadsheet/ParseXLSX/Decryptor.pm | |
parent | 6a602695f085912438c6636394d24e44660585d7 (diff) | |
parent | 6db6275045f4e71752bc890a4ccea643779e5010 (diff) | |
download | spreadsheet-parsexlsx-6d49e45380bbcd75f7621ab1690bd9652e3d414d.tar.gz spreadsheet-parsexlsx-6d49e45380bbcd75f7621ab1690bd9652e3d414d.zip |
Merge pull request #51 from mazurin/master
Attempt to correct the issue #50 (Encryption fails with perl-5.22.1 on HP-UX-ia64)
Diffstat (limited to 'lib/Spreadsheet/ParseXLSX/Decryptor.pm')
-rw-r--r-- | lib/Spreadsheet/ParseXLSX/Decryptor.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Spreadsheet/ParseXLSX/Decryptor.pm b/lib/Spreadsheet/ParseXLSX/Decryptor.pm index 7870685..4968a7d 100644 --- a/lib/Spreadsheet/ParseXLSX/Decryptor.pm +++ b/lib/Spreadsheet/ParseXLSX/Decryptor.pm @@ -29,7 +29,7 @@ sub open { my $buffer; $infoFH->read($buffer, 8); - my ($majorVers, $minorVers) = unpack('SS', $buffer); + my ($majorVers, $minorVers) = unpack('s<s<', $buffer); my $xlsx; if ($majorVers == 4 && $minorVers == 4) { @@ -72,13 +72,13 @@ sub _standardDecryption { my $buffer; my $n = $infoFH->read($buffer, 24); - my ($encryptionHeaderSize, undef, undef, $algID, $algIDHash, $keyBits) = unpack('LLLLLL', $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('L', $buffer); + my $saltSize = unpack('L<', $buffer); my ($salt, $encryptedVerifier, $verifierHashSize, $encryptedVerifierHash); @@ -86,7 +86,7 @@ sub _standardDecryption { $infoFH->read($encryptedVerifier, 16); $infoFH->read($buffer, 4); - $verifierHashSize = unpack('L', $buffer); + $verifierHashSize = unpack('L<', $buffer); $infoFH->read($encryptedVerifierHash, 32); $infoFH->close(); @@ -122,7 +122,7 @@ sub _standardDecryption { my $inbuf; $packageFH->read($inbuf, 8); - my $fileSize = unpack('L', $inbuf); + my $fileSize = unpack('L<', $inbuf); $decryptor->decryptFile($packageFH, $fh, 1024, $fileSize); @@ -176,7 +176,7 @@ sub _agileDecryption { my $inbuf; $packageFH->read($inbuf, 8); - my $fileSize = unpack('L', $inbuf); + my $fileSize = unpack('L<', $inbuf); $fileDecryptor->decryptFile($packageFH, $fh, 4096, $key, $fileSize); |