diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Security/Core] make encodedLength computation more generic

Browse Source
This commit is contained in:
Nicolas Grekas 2019-10-27 11:16:45 +01:00
parent 32b227d004
commit 60a4d8dc7a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php
View File

@ -22,7 +22,7 @@ class MessageDigestPasswordEncoder extends BasePasswordEncoder
{
private $algorithm;
private $encodeHashAsBase64;
private $iterations = 0;
private $iterations = 1;
private $encodedLength = -1;
/**

16
src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php
View File

@ -30,9 +30,9 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder
{
private $algorithm;
private $encodeHashAsBase64;
private $iterations;
private $iterations = 1;
private $length;
private $encodedLength;
private $encodedLength = -1;
/**
* @param string $algorithm The digest algorithm to use
@ -44,9 +44,15 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder
{
$this->algorithm = $algorithm;
$this->encodeHashAsBase64 = $encodeHashAsBase64;
$this->iterations = $iterations;
$this->length = $length;
$this->encodedLength = $encodeHashAsBase64 ? intdiv($length + 2, 3) << 2 : ($length << 1);
try {
$this->encodedLength = \strlen($this->encodePassword('', 'salt'));
} catch (\LogicException $e) {
// ignore algorithm not supported
}
$this->iterations = $iterations;
}
/**
@ -74,7 +80,7 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder
*/
public function isPasswordValid($encoded, $raw, $salt)
{
if ((0 < $this->length && \strlen($encoded) !== $this->encodedLength) || false !== strpos($encoded, '$')) {
if (\strlen($encoded) !== $this->encodedLength || false !== strpos($encoded, '$')) {
return false;
}