Merge pull request #51 from mazurin/master

Attempt to correct the issue #50 (Encryption fails with perl-5.22.1 on HP-UX-ia64)

3 files changed, 9 insertions, 9 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);
 
diff --git a/lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm b/lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm
index 87d73dc..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('L', $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('L', $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 9c1c381..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('L', $i) . $hash);
+            $hash = $self->{hashProc}->(pack('L<', $i) . $hash);
         }
         $self->{pregeneratedKey} = $hash;
     }