Changed blowfish salt prefix to $2y$

cakephp · Nov 19, 2013 · e05215c · e05215c
1 parent 9618de1
commit e05215c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Cake/Test/TestCase/Utility/SecurityTest.php b/Cake/Test/TestCase/Utility/SecurityTest.php
@@ -138,7 +138,6 @@ public function testHash() {
 	public function testHashBlowfish() {
 		Security::setCost(10);
 		$test = Security::hash('password', 'blowfish');
-		$this->skipIf(strpos($test, '$2a$') === false, 'Blowfish hashes are incorrect.');
 
 		$_hashType = Security::$hashType;
 

diff --git a/Cake/Utility/Security.php b/Cake/Utility/Security.php
@@ -210,10 +210,10 @@ protected static function _salt($length = 22) {
 	protected static function _crypt($password, $salt = false) {
 		if ($salt === false) {
 			$salt = static::_salt(22);
-			$salt = vsprintf('$2a$%02d$%s', array(static::$hashCost, $salt));
+			$salt = vsprintf('$2y$%02d$%s', array(static::$hashCost, $salt));
 		}
 
-		if ($salt === true || strpos($salt, '$2a$') !== 0 || strlen($salt) < 29) {
+		if ($salt === true || strpos($salt, '$2y$') !== 0 || strlen($salt) < 29) {
 			throw new Error\Exception(__d(
 				'cake_dev',
 				'Invalid salt: %s for %s Please visit http://www.php.net/crypt and read the appropriate section for building %s salts.',