Skip to content
This repository
Browse code

Attempting to get passing builds on travisci

Currently the 5.2 builds fail due to the length checks on blowfish
hashes.  Try a shorter wall to see if those builds will pass.
  • Loading branch information...
commit 61d6f716bc718c0cefb6b0ef7cfdf8c18a37bac6 1 parent c870044
Mark Story authored September 26, 2012

Showing 1 changed file with 2 additions and 1 deletion. Show diff stats Hide diff stats

  1. 3  lib/Cake/Utility/Security.php
3  lib/Cake/Utility/Security.php
@@ -272,7 +272,8 @@ protected static function _crypt($password, $type = null, $salt = false) {
272 272
 				$salt,
273 273
 			);
274 274
 			$salt = vsprintf($saltFormat[$hashType], $vspArgs);
275  
-		} elseif ($salt === true || strpos($salt, '$2a$') !== 0 || strlen($salt) < 29) {
  275
+		}
  276
+		if ($salt === true || strpos($salt, '$2a$') !== 0 || strlen($salt) < 12) {
276 277
 			trigger_error(__d(
277 278
 				'cake_dev',
278 279
 				'Invalid salt: %s for %s Please visit http://www.php.net/crypt and read the appropriate section for building %s salts.',

0 notes on commit 61d6f71

Please sign in to comment.
Something went wrong with that request. Please try again.