Skip to content

Commit

Permalink
Attempting to get passing builds on travisci
Browse files Browse the repository at this point in the history
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
markstory committed Sep 27, 2012
1 parent c870044 commit 61d6f71
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/Cake/Utility/Security.php
Expand Up @@ -272,7 +272,8 @@ protected static function _crypt($password, $type = null, $salt = false) {
$salt,
);
$salt = vsprintf($saltFormat[$hashType], $vspArgs);
} elseif ($salt === true || strpos($salt, '$2a$') !== 0 || strlen($salt) < 29) {
}
if ($salt === true || strpos($salt, '$2a$') !== 0 || strlen($salt) < 12) {
trigger_error(__d(
'cake_dev',
'Invalid salt: %s for %s Please visit http://www.php.net/crypt and read the appropriate section for building %s salts.',
Expand Down

0 comments on commit 61d6f71

Please sign in to comment.