Ensure = is removed from generated salt values.

cakephp · Aug 24, 2012 · 24b68ec · 24b68ec
1 parent 064fef1
commit 24b68ec
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/Cake/Utility/Security.php b/lib/Cake/Utility/Security.php
@@ -222,7 +222,12 @@ public static function rijndael($text, $key, $operation) {
  * @return string The generated salt
  */
 	public static function salt($length = 22) {
-		return substr(str_replace('+', '.', base64_encode(sha1(uniqid(Configure::read('Security.salt'), true), true))), 0, $length);
+		$salt = str_replace(
+			array('+', '='),
+			'.',
+			base64_encode(sha1(uniqid(Configure::read('Security.salt'), true), true))
+		);
+		return substr($salt, 0, $length);
 	}
 
 /**