Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code Review; minor changes to salt handling, corrected some comments

Browse Source
This commit is contained in:
Lenz Weber 2017-03-13 16:22:04 +01:00
parent 76246630ce
commit 71574d1fe2
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/PhpWord/Metadata/Protection.php
View File

@ -34,7 +34,7 @@ class Protection
private $editing; private $editing;
/** /**
* Hashed password * password
* *
* @var string * @var string
*/ */
@ -55,7 +55,7 @@ class Protection
private $mswordAlgorithmSid = 4; private $mswordAlgorithmSid = 4;
/** /**
* Hashed salt * salt
* *
* @var string * @var string
*/ */
@ -95,7 +95,7 @@ class Protection
} }
/** /**
* Get password hash * Get password
* *
* @return string * @return string
*/ */
@ -164,7 +164,7 @@ class Protection
} }
/** /**
* Get salt hash * Get salt
* *
* @return string * @return string
*/ */
@ -174,13 +174,18 @@ class Protection
} }
/** /**
* Set salt hash * Set salt. Salt HAS to be 16 characters, or an exception will be thrown.
* *
* @param $salt * @param $salt
* @return self * @return self
* @throws \InvalidArgumentException
*/ */
public function setSalt($salt) public function setSalt($salt)
{ {
if ($salt !== null && strlen($salt) !== 16){
throw new \InvalidArgumentException('salt has to be of exactly 16 bytes length');
}
$this->salt = $salt; $this->salt = $salt;
return $this; return $this;

23
src/PhpWord/Writer/Word2007/Part/Settings.php
View File

@ -225,8 +225,8 @@ class Settings extends AbstractPart
'w:cryptAlgorithmType' => 'typeAny', 'w:cryptAlgorithmType' => 'typeAny',
'w:cryptAlgorithmSid' => $protection->getMswordAlgorithmSid(), 'w:cryptAlgorithmSid' => $protection->getMswordAlgorithmSid(),
'w:cryptSpinCount' => $protection->getSpinCount(), 'w:cryptSpinCount' => $protection->getSpinCount(),
'w:hash' => $this->getPasswordHash($protection), 'w:hash' => $this->getEncodedPasswordHash($protection),
'w:salt' => $this->getSaltHash($protection->getSalt()), 'w:salt' => base64_encode($protection->getSalt()),
) )
); );
} }
@ -255,11 +255,12 @@ class Settings extends AbstractPart
/** /**
* Create a hashed password that MS Word will be able to work with * Create a hashed password that MS Word will be able to work with
* @link https://blogs.msdn.microsoft.com/vsod/2010/04/05/how-to-set-the-editing-restrictions-in-word-using-open-xml-sdk-2-0/
* *
* @param \PhpOffice\PhpWord\Metadata\Protection $protection * @param \PhpOffice\PhpWord\Metadata\Protection $protection
* @return string * @return string
*/ */
private function getPasswordHash($protection) private function getEncodedPasswordHash($protection)
{ {
$orig_encoding = mb_internal_encoding(); $orig_encoding = mb_internal_encoding();
mb_internal_encoding("UTF-8"); mb_internal_encoding("UTF-8");
@ -267,7 +268,6 @@ class Settings extends AbstractPart
$password = $protection->getPassword(); $password = $protection->getPassword();
$password = mb_substr($password, 0, min(self::$passwordMaxLength, mb_strlen($password))); $password = mb_substr($password, 0, min(self::$passwordMaxLength, mb_strlen($password)));
// Construct a new NULL-terminated string consisting of single-byte characters:
// Get the single-byte values by iterating through the Unicode characters of the truncated password. // Get the single-byte values by iterating through the Unicode characters of the truncated password.
// For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte. // For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte.
$pass_utf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8'); $pass_utf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
@ -291,7 +291,7 @@ class Settings extends AbstractPart
// Word requires that the initial hash of the password with the salt not be considered in the count. // Word requires that the initial hash of the password with the salt not be considered in the count.
// The initial hash of salt + key is not included in the iteration count. // The initial hash of salt + key is not included in the iteration count.
$algorithm = $this->getAlgorithm($protection->getMswordAlgorithmSid()); $algorithm = $this->getAlgorithm($protection->getMswordAlgorithmSid());
$generatedKey = hash($algorithm, base64_decode($this->getSaltHash($protection->getSalt())) . $generatedKey, true); $generatedKey = hash($algorithm, $protection->getSalt() . $generatedKey, true);
for ($i = 0; $i < $protection->getSpinCount(); $i++) { for ($i = 0; $i < $protection->getSpinCount(); $i++) {
$generatedKey = hash($algorithm, $generatedKey . pack("CCCC", $i, $i >> 8, $i >> 16, $i >> 24), true); $generatedKey = hash($algorithm, $generatedKey . pack("CCCC", $i, $i >> 8, $i >> 16, $i >> 24), true);
@ -319,17 +319,6 @@ class Settings extends AbstractPart
return $algorithm; return $algorithm;
} }
/**
* Get salt hash
*
* @param string $salt
* @return string
*/
private function getSaltHash($salt)
{
return base64_encode(str_pad(substr($salt, 0, 16), 16, '1'));
}
/** /**
* Build combined key from low-order word and high-order word * Build combined key from low-order word and high-order word
* *
@ -372,7 +361,7 @@ class Settings extends AbstractPart
} }
/** /**
* Simulate behaviour of int32 * Simulate behaviour of (signed) int32
* *
* @param int $value * @param int $value
* @return int * @return int