diff options
| author | Tobias Schultze <webmaster@tubo-world.de> | 2015-10-29 13:12:54 +0100 |
|---|---|---|
| committer | Tobias Schultze <webmaster@tubo-world.de> | 2015-10-29 13:12:54 +0100 |
| commit | f77c39f9f724d776f97bb8187173e0815271e55b (patch) | |
| tree | 365253b833e06a31e20f00722db369c1e3343d73 /Http | |
| parent | fe0053f6ff87a470547a1898b9bf36a32e73ae7e (diff) | |
| parent | 7c51b1c6f08ea0bfd4a44e8d0f202c6423a39587 (diff) | |
| download | symfony-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 'Http')
| -rw-r--r-- | Http/RememberMe/TokenBasedRememberMeServices.php | 3 | ||||
| -rw-r--r-- | Http/composer.json | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php index f6107ec..a443702 100644 --- a/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/Http/RememberMe/TokenBasedRememberMeServices.php @@ -17,7 +17,6 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\User\UserInterface; -use Symfony\Component\Security\Core\Util\StringUtils; /** * Concrete implementation of the RememberMeServicesInterface providing @@ -54,7 +53,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices throw new \RuntimeException(sprintf('The UserProviderInterface implementation must return an instance of UserInterface, but returned "%s".', get_class($user))); } - if (true !== StringUtils::equals($this->generateCookieHash($class, $username, $expires, $user->getPassword()), $hash)) { + if (true !== hash_equals($this->generateCookieHash($class, $username, $expires, $user->getPassword()), $hash)) { throw new AuthenticationException('The cookie\'s hash is invalid.'); } diff --git a/Http/composer.json b/Http/composer.json index b7fe686..3fad2bb 100644 --- a/Http/composer.json +++ b/Http/composer.json @@ -21,8 +21,9 @@ "symfony/event-dispatcher": "~2.8|~3.0", "symfony/http-foundation": "~2.8|~3.0", "symfony/http-kernel": "~2.8|~3.0", - "symfony/property-access": "~2.8|~3.0", - "paragonie/random_compat": "~1.0" + "symfony/polyfill-php56": "~1.0", + "symfony/polyfill-php70": "~1.0", + "symfony/property-access": "~2.8|~3.0" }, "require-dev": { "symfony/routing": "~2.8|~3.0", |