From 1a1e74f0f1c1ebc5e15d17e7824304d8ab59ecb2 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Fri, 4 Dec 2015 02:10:12 -0500
Subject: clean up various nits

---
 lib/Spreadsheet/ParseXLSX/Decryptor.pm          | 22 ++++++++++++++--------
 lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm    |  7 -------
 lib/Spreadsheet/ParseXLSX/Decryptor/Standard.pm |  7 -------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/lib/Spreadsheet/ParseXLSX/Decryptor.pm b/lib/Spreadsheet/ParseXLSX/Decryptor.pm
index 6fa777f..b445f06 100644
--- a/lib/Spreadsheet/ParseXLSX/Decryptor.pm
+++ b/lib/Spreadsheet/ParseXLSX/Decryptor.pm
@@ -20,7 +20,10 @@ sub open {
 
     $password = $password || 'VelvetSweatshop';
 
-    my ($infoFH, $packageFH) = _getCompoundData($filename, ['EncryptionInfo', 'EncryptedPackage']);
+    my ($infoFH, $packageFH) = $class->_getCompoundData(
+        $filename,
+        ['EncryptionInfo', 'EncryptedPackage']
+    );
 
     my $buffer;
     $infoFH->read($buffer, 8);
@@ -28,17 +31,17 @@ sub open {
 
     my $xlsx;
     if ($majorVers == 4 && $minorVers == 4) {
-        $xlsx = agileDecryption($infoFH, $packageFH, $password);
+        $xlsx = $class->_agileDecryption($infoFH, $packageFH, $password);
     } else {
-        $xlsx = standardDecryption($infoFH, $packageFH, $password);
+        $xlsx = $class->_standardDecryption($infoFH, $packageFH, $password);
     }
 
     return $xlsx;
 }
 
 sub _getCompoundData {
-    my $filename = shift;
-    my $names = shift;
+    my $class = shift;
+    my ($filename, $names) = @_;
 
     my @files;
 
@@ -60,7 +63,8 @@ sub _getCompoundData {
     return @files;
 }
 
-sub standardDecryption {
+sub _standardDecryption {
+    my $class = shift;
     my ($infoFH, $packageFH, $password) = @_;
 
     my $buffer;
@@ -125,7 +129,8 @@ sub standardDecryption {
     return $fh;
 }
 
-sub agileDecryption {
+sub _agileDecryption {
+    my $class = shift;
     my ($infoFH, $packageFH, $password) = @_;
 
     my $xml = XML::Twig->new;
@@ -180,8 +185,9 @@ sub agileDecryption {
 
 sub new {
     my $class = shift;
-    my $self = shift;
+    my ($args) = @_;
 
+    my $self = { %$args };
     $self->{keyLength} = $self->{keyBits} / 8;
 
     if ($self->{hashAlgorithm} eq 'SHA512') {
diff --git a/lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm b/lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm
index 3b836e3..c6a0f7c 100644
--- a/lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm
+++ b/lib/Spreadsheet/ParseXLSX/Decryptor/Agile.pm
@@ -4,12 +4,6 @@ use warnings;
 
 use base 'Spreadsheet::ParseXLSX::Decryptor';
 
-sub new {
-    my $class = shift;
-    my $self = Spreadsheet::ParseXLSX::Decryptor->new(@_);
-    bless $self, $class;
-}
-
 sub decrypt {
     my $self = shift;
     my ($encryptedValue, $blockKey) = @_;
@@ -95,7 +89,6 @@ sub decryptFile {
 
 sub verifyPassword {
     my $self = shift;
-
     my ($encryptedVerifier, $encryptedVerifierHash) = @_;
 
     my $encryptedVerifierHash0 = $self->{hashProc}->($self->decrypt($encryptedVerifier, "\xfe\xa7\xd2\x76\x3b\x4b\x9e\x79"));
diff --git a/lib/Spreadsheet/ParseXLSX/Decryptor/Standard.pm b/lib/Spreadsheet/ParseXLSX/Decryptor/Standard.pm
index a940719..aafdc04 100644
--- a/lib/Spreadsheet/ParseXLSX/Decryptor/Standard.pm
+++ b/lib/Spreadsheet/ParseXLSX/Decryptor/Standard.pm
@@ -4,12 +4,6 @@ use warnings;
 
 use base 'Spreadsheet::ParseXLSX::Decryptor';
 
-sub new {
-    my $class = shift;
-    my $self = Spreadsheet::ParseXLSX::Decryptor->new(@_);
-    bless $self, $class;
-}
-
 sub decrypt {
     my $self = shift;
     my ($encryptedValue) = @_;
@@ -73,7 +67,6 @@ sub _generateDecryptionKey {
 
 sub verifyPassword {
     my $self = shift;
-
     my ($encryptedVerifier, $encryptedVerifierHash) = @_;
 
     my $verifier = $self->decrypt($encryptedVerifier);
-- 
cgit v1.2.3-54-g00ecf