summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Acl/README.md2
-rw-r--r--Acl/composer.json8
-rw-r--r--Core/Encoder/BCryptPasswordEncoder.php4
-rw-r--r--Core/Encoder/Pbkdf2PasswordEncoder.php26
-rw-r--r--Core/README.md2
-rw-r--r--Core/composer.json22
-rw-r--r--Csrf/README.md2
-rw-r--r--Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php4
-rw-r--r--Csrf/TokenStorage/NativeSessionTokenStorage.php6
-rw-r--r--Csrf/composer.json10
-rw-r--r--Http/README.md2
-rw-r--r--Http/composer.json18
-rw-r--r--README.md2
-rw-r--r--composer.json26
14 files changed, 47 insertions, 87 deletions
diff --git a/Acl/README.md b/Acl/README.md
index 458820e..96d0a28 100644
--- a/Acl/README.md
+++ b/Acl/README.md
@@ -11,7 +11,7 @@ Resources
Documentation:
-https://symfony.com/doc/2.8/book/security.html
+https://symfony.com/doc/3.0/book/security.html
Tests
-----
diff --git a/Acl/composer.json b/Acl/composer.json
index b2ac560..7819946 100644
--- a/Acl/composer.json
+++ b/Acl/composer.json
@@ -16,11 +16,11 @@
}
],
"require": {
- "php": ">=5.3.9",
- "symfony/security-core": "~2.4|~3.0.0"
+ "php": ">=5.5.9",
+ "symfony/security-core": "~2.8|~3.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7|~3.0.0",
+ "symfony/phpunit-bridge": "~2.8|~3.0",
"doctrine/common": "~2.2",
"doctrine/dbal": "~2.2",
"psr/log": "~1.0"
@@ -36,7 +36,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev"
+ "dev-master": "3.0-dev"
}
}
}
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php
index d2b0319..c0c8fe0 100644
--- a/Core/Encoder/BCryptPasswordEncoder.php
+++ b/Core/Encoder/BCryptPasswordEncoder.php
@@ -34,10 +34,6 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
*/
public function __construct($cost)
{
- if (!function_exists('password_hash')) {
- throw new \RuntimeException('To use the BCrypt encoder, you need to upgrade to PHP 5.5 or install the "ircmaxell/password-compat" via Composer.');
- }
-
$cost = (int) $cost;
if ($cost < 4 || $cost > 31) {
throw new \InvalidArgumentException('Cost must be in the range of 4-31.');
diff --git a/Core/Encoder/Pbkdf2PasswordEncoder.php b/Core/Encoder/Pbkdf2PasswordEncoder.php
index dac1cad..8422a4b 100644
--- a/Core/Encoder/Pbkdf2PasswordEncoder.php
+++ b/Core/Encoder/Pbkdf2PasswordEncoder.php
@@ -64,11 +64,7 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder
throw new \LogicException(sprintf('The algorithm "%s" is not supported.', $this->algorithm));
}
- if (function_exists('hash_pbkdf2')) {
- $digest = hash_pbkdf2($this->algorithm, $raw, $salt, $this->iterations, $this->length, true);
- } else {
- $digest = $this->hashPbkdf2($this->algorithm, $raw, $salt, $this->iterations, $this->length);
- }
+ $digest = hash_pbkdf2($this->algorithm, $raw, $salt, $this->iterations, $this->length, true);
return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest);
}
@@ -80,24 +76,4 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder
{
return !$this->isPasswordTooLong($raw) && $this->comparePasswords($encoded, $this->encodePassword($raw, $salt));
}
-
- private function hashPbkdf2($algorithm, $password, $salt, $iterations, $length = 0)
- {
- // Number of blocks needed to create the derived key
- $blocks = ceil($length / strlen(hash($algorithm, null, true)));
- $digest = '';
-
- for ($i = 1; $i <= $blocks; $i++) {
- $ib = $block = hash_hmac($algorithm, $salt.pack('N', $i), $password, true);
-
- // Iterations
- for ($j = 1; $j < $iterations; $j++) {
- $ib ^= ($block = hash_hmac($algorithm, $block, $password, true));
- }
-
- $digest .= $ib;
- }
-
- return substr($digest, 0, $this->length);
- }
}
diff --git a/Core/README.md b/Core/README.md
index f1da5b1..3c6a117 100644
--- a/Core/README.md
+++ b/Core/README.md
@@ -11,7 +11,7 @@ Resources
Documentation:
-https://symfony.com/doc/2.8/book/security.html
+https://symfony.com/doc/3.0/book/security.html
Tests
-----
diff --git a/Core/composer.json b/Core/composer.json
index 4d24053..7671993 100644
--- a/Core/composer.json
+++ b/Core/composer.json
@@ -16,24 +16,22 @@
}
],
"require": {
- "php": ">=5.3.9"
+ "php": ">=5.5.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7|~3.0.0",
- "symfony/event-dispatcher": "~2.1|~3.0.0",
- "symfony/expression-language": "~2.6|~3.0.0",
- "symfony/http-foundation": "~2.4|~3.0.0",
- "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
- "symfony/validator": "~2.5,>=2.5.5|~3.0.0",
- "psr/log": "~1.0",
- "ircmaxell/password-compat": "1.0.*"
+ "symfony/phpunit-bridge": "~2.8|~3.0",
+ "symfony/event-dispatcher": "~2.8|~3.0",
+ "symfony/expression-language": "~2.8|~3.0",
+ "symfony/http-foundation": "~2.8|~3.0",
+ "symfony/translation": "~2.8|~3.0",
+ "symfony/validator": "~2.8|~3.0",
+ "psr/log": "~1.0"
},
"suggest": {
"symfony/event-dispatcher": "",
"symfony/http-foundation": "",
"symfony/validator": "For using the user password constraint",
- "symfony/expression-language": "For using the expression voter",
- "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5"
+ "symfony/expression-language": "For using the expression voter"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Security\\Core\\": "" }
@@ -41,7 +39,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev"
+ "dev-master": "3.0-dev"
}
}
}
diff --git a/Csrf/README.md b/Csrf/README.md
index 10f4784..d331d3c 100644
--- a/Csrf/README.md
+++ b/Csrf/README.md
@@ -9,7 +9,7 @@ Resources
Documentation:
-https://symfony.com/doc/2.8/book/security.html
+https://symfony.com/doc/3.0/book/security.html
Tests
-----
diff --git a/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php b/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
index 0039deb..ef49f2f 100644
--- a/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
+++ b/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
@@ -52,10 +52,6 @@ class NativeSessionTokenStorageTest extends \PHPUnit_Framework_TestCase
public function testStoreTokenInClosedSessionWithExistingSessionId()
{
- if (PHP_VERSION_ID < 50400) {
- $this->markTestSkipped('This test requires PHP 5.4 or later.');
- }
-
session_id('foobar');
$this->assertSame(PHP_SESSION_NONE, session_status());
diff --git a/Csrf/TokenStorage/NativeSessionTokenStorage.php b/Csrf/TokenStorage/NativeSessionTokenStorage.php
index 60145c6..4229bb6 100644
--- a/Csrf/TokenStorage/NativeSessionTokenStorage.php
+++ b/Csrf/TokenStorage/NativeSessionTokenStorage.php
@@ -108,11 +108,7 @@ class NativeSessionTokenStorage implements TokenStorageInterface
private function startSession()
{
- if (PHP_VERSION_ID >= 50400) {
- if (PHP_SESSION_NONE === session_status()) {
- session_start();
- }
- } elseif (!session_id()) {
+ if (PHP_SESSION_NONE === session_status()) {
session_start();
}
diff --git a/Csrf/composer.json b/Csrf/composer.json
index 20fd2ff..c87d418 100644
--- a/Csrf/composer.json
+++ b/Csrf/composer.json
@@ -16,12 +16,12 @@
}
],
"require": {
- "php": ">=5.3.9",
- "symfony/security-core": "~2.4|~3.0.0"
+ "php": ">=5.5.9",
+ "symfony/security-core": "~2.8|~3.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7|~3.0.0",
- "symfony/http-foundation": "~2.1|~3.0.0"
+ "symfony/phpunit-bridge": "~2.8|~3.0",
+ "symfony/http-foundation": "~2.8|~3.0"
},
"suggest": {
"symfony/http-foundation": "For using the class SessionTokenStorage."
@@ -32,7 +32,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev"
+ "dev-master": "3.0-dev"
}
}
}
diff --git a/Http/README.md b/Http/README.md
index 11f6f72..af22657 100644
--- a/Http/README.md
+++ b/Http/README.md
@@ -11,7 +11,7 @@ Resources
Documentation:
-https://symfony.com/doc/2.8/book/security.html
+https://symfony.com/doc/3.0/book/security.html
Tests
-----
diff --git a/Http/composer.json b/Http/composer.json
index 1c49504..172e0d3 100644
--- a/Http/composer.json
+++ b/Http/composer.json
@@ -16,16 +16,16 @@
}
],
"require": {
- "php": ">=5.3.9",
- "symfony/security-core": "~2.6|~3.0.0",
- "symfony/event-dispatcher": "~2.1|~3.0.0",
- "symfony/http-foundation": "~2.4|~3.0.0",
- "symfony/http-kernel": "~2.4|~3.0.0"
+ "php": ">=5.5.9",
+ "symfony/security-core": "~2.8|~3.0",
+ "symfony/event-dispatcher": "~2.8|~3.0",
+ "symfony/http-foundation": "~2.8|~3.0",
+ "symfony/http-kernel": "~2.8|~3.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7|~3.0.0",
- "symfony/routing": "~2.2|~3.0.0",
- "symfony/security-csrf": "~2.4|~3.0.0",
+ "symfony/phpunit-bridge": "~2.8|~3.0",
+ "symfony/routing": "~2.8|~3.0",
+ "symfony/security-csrf": "~2.8|~3.0",
"psr/log": "~1.0"
},
"suggest": {
@@ -38,7 +38,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev"
+ "dev-master": "3.0-dev"
}
}
}
diff --git a/README.md b/README.md
index d85cd96..bd2daac 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Resources
Documentation:
-https://symfony.com/doc/2.8/book/security.html
+https://symfony.com/doc/3.0/book/security.html
Tests
-----
diff --git a/composer.json b/composer.json
index 75abcf8..1085c14 100644
--- a/composer.json
+++ b/composer.json
@@ -16,10 +16,10 @@
}
],
"require": {
- "php": ">=5.3.9",
- "symfony/event-dispatcher": "~2.2|~3.0.0",
- "symfony/http-foundation": "~2.1|~3.0.0",
- "symfony/http-kernel": "~2.4|~3.0.0"
+ "php": ">=5.5.9",
+ "symfony/event-dispatcher": "~2.8|~3.0",
+ "symfony/http-foundation": "~2.8|~3.0",
+ "symfony/http-kernel": "~2.8|~3.0"
},
"replace": {
"symfony/security-acl": "self.version",
@@ -28,16 +28,15 @@
"symfony/security-http": "self.version"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7|~3.0.0",
- "symfony/intl": "~2.3|~3.0.0",
- "symfony/routing": "~2.2|~3.0.0",
- "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
- "symfony/validator": "~2.5,>=2.5.5|~3.0.0",
+ "symfony/phpunit-bridge": "~2.8|~3.0",
+ "symfony/intl": "~2.8|~3.0",
+ "symfony/routing": "~2.8|~3.0",
+ "symfony/translation": "~2.8|~3.0",
+ "symfony/validator": "~2.8|~3.0",
"doctrine/common": "~2.2",
"doctrine/dbal": "~2.2",
"psr/log": "~1.0",
- "ircmaxell/password-compat": "~1.0",
- "symfony/expression-language": "~2.6|~3.0.0"
+ "symfony/expression-language": "~2.8|~3.0"
},
"suggest": {
"symfony/class-loader": "For using the ACL generateSql script",
@@ -45,8 +44,7 @@
"symfony/validator": "For using the user password constraint",
"symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs",
"doctrine/dbal": "For using the built-in ACL implementation",
- "symfony/expression-language": "For using the expression voter",
- "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5"
+ "symfony/expression-language": "For using the expression voter"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Security\\": "" }
@@ -54,7 +52,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev"
+ "dev-master": "3.0-dev"
}
}
}
generated by cgit v1.1 at 2025-05-11 21:26:40 +0000