summaryrefslogtreecommitdiffstats
path: root/Core/Encoder/BasePasswordEncoder.php
diff options
context:
space:
mode:
authorTobias Schultze <webmaster@tubo-world.de>2015-10-29 13:12:54 +0100
committerTobias Schultze <webmaster@tubo-world.de>2015-10-29 13:12:54 +0100
commitf77c39f9f724d776f97bb8187173e0815271e55b (patch)
tree365253b833e06a31e20f00722db369c1e3343d73 /Core/Encoder/BasePasswordEncoder.php
parentfe0053f6ff87a470547a1898b9bf36a32e73ae7e (diff)
parent7c51b1c6f08ea0bfd4a44e8d0f202c6423a39587 (diff)
downloadsymfony-security-f77c39f9f724d776f97bb8187173e0815271e55b.zip
symfony-security-f77c39f9f724d776f97bb8187173e0815271e55b.tar.gz
symfony-security-f77c39f9f724d776f97bb8187173e0815271e55b.tar.bz2
Merge branch '2.8'
Conflicts: CHANGELOG-2.3.md CHANGELOG-2.7.md composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php src/Symfony/Component/Console/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/Form/Tests/FormRegistryTest.php src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php src/Symfony/Component/Intl/composer.json src/Symfony/Component/Ldap/composer.json src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/Encoder/JsonEncoder.php src/Symfony/Component/Serializer/composer.json src/Symfony/Component/Templating/PhpEngine.php src/Symfony/Component/Translation/composer.json src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php src/Symfony/Component/VarDumper/composer.json
Diffstat (limited to 'Core/Encoder/BasePasswordEncoder.php')
-rw-r--r--Core/Encoder/BasePasswordEncoder.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/Core/Encoder/BasePasswordEncoder.php b/Core/Encoder/BasePasswordEncoder.php
index 1c9ada1..12126d8 100644
--- a/Core/Encoder/BasePasswordEncoder.php
+++ b/Core/Encoder/BasePasswordEncoder.php
@@ -11,8 +11,6 @@
namespace Symfony\Component\Security\Core\Encoder;
-use Symfony\Component\Security\Core\Util\StringUtils;
-
/**
* BasePasswordEncoder is the base class for all password encoders.
*
@@ -83,7 +81,7 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface
*/
protected function comparePasswords($password1, $password2)
{
- return StringUtils::equals($password1, $password2);
+ return hash_equals($password1, $password2);
}
/**