Use the new PHP 5.5 password api with polyfill

elnur · Feb 4, 2013 · bf7024a · bf7024a
1 parent d69fda5
commit bf7024a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Security/Encoder/BlowfishPasswordEncoder.php b/Security/Encoder/BlowfishPasswordEncoder.php
@@ -41,12 +41,11 @@ public function __construct($cost)
 
     public function encodePassword($raw, $salt = null)
     {
-        $salt = substr(base_convert(sha1(uniqid(mt_rand(), true)), 16, 36), 0, 22);
-        return crypt($raw, '$2a$' . $this->cost . '$'. $salt . '$');
+        return password_hash($raw, PASSWORD_BCRYPT, array('cost' => $this->cost));
     }
 
     public function isPasswordValid($encoded, $raw, $salt = null)
     {
-        return $this->comparePasswords($encoded, crypt($raw, $encoded));
+        return password_verify($raw, $encoded);
     }
 }
diff --git a/composer.json b/composer.json
@@ -14,7 +14,8 @@
     "require": {
         "php": ">=5.3.2",
         "symfony/framework-bundle": ">=2.0,<2.3",
-        "symfony/security-bundle": ">=2.0,<2.3"
+        "symfony/security-bundle": ">=2.0,<2.3",
+        "ircmaxell/password-compat": "1.0.*"
     },
     "autoload": {
         "psr-0": { "Elnur\\BlowfishPasswordEncoderBundle": "" }