From 61d6f716bc718c0cefb6b0ef7cfdf8c18a37bac6 Mon Sep 17 00:00:00 2001 From: mark_story Date: Wed, 26 Sep 2012 21:48:05 -0400 Subject: [PATCH] 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. --- lib/Cake/Utility/Security.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Utility/Security.php b/lib/Cake/Utility/Security.php index 84369e04d..c884d2662 100644 --- a/lib/Cake/Utility/Security.php +++ b/lib/Cake/Utility/Security.php @@ -272,7 +272,8 @@ class Security { $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.',