summaryrefslogtreecommitdiffstats
path: root/Http
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2015-10-14 16:40:43 +0200
committerNicolas Grekas <nicolas.grekas@gmail.com>2015-10-28 03:15:07 +0100
commit1473342e7bb5d3d3080f78b196f528b4acf34db2 (patch)
tree3319333a745b78bd7b4b04c504be69d7543f729b /Http
parentd355322988b1c1d1798e19c41cc86b4169c31f2a (diff)
downloadsymfony-security-1473342e7bb5d3d3080f78b196f528b4acf34db2.zip
symfony-security-1473342e7bb5d3d3080f78b196f528b4acf34db2.tar.gz
symfony-security-1473342e7bb5d3d3080f78b196f528b4acf34db2.tar.bz2
Rely on iconv and symfony/polyfill-*
Diffstat (limited to 'Http')
-rw-r--r--Http/RememberMe/TokenBasedRememberMeServices.php3
-rw-r--r--Http/composer.json5
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 65978ee..686a629 100644
--- a/Http/composer.json
+++ b/Http/composer.json
@@ -21,8 +21,9 @@
"symfony/event-dispatcher": "~2.1|~3.0.0",
"symfony/http-foundation": "~2.4|~3.0.0",
"symfony/http-kernel": "~2.4|~3.0.0",
- "symfony/property-access": "~2.3|~3.0.0",
- "paragonie/random_compat": "~1.0"
+ "symfony/polyfill-php56": "~1.0",
+ "symfony/polyfill-php70": "~1.0",
+ "symfony/property-access": "~2.3|~3.0.0"
},
"require-dev": {
"symfony/routing": "~2.2|~3.0.0",