WebSVN – lars-tiefland.ci – Diff – /system/core/compat/hash.php

+		{
 			trigger_error('hash_pbkdf2(): Length must be greater than or equal to 0: '.$length, E_USER_WARNING);
 			return FALSE;
+		}
+		$hash_length = defined('MB_OVERLOAD_STRING')
+			? mb_strlen(hash($algo, NULL, TRUE), '8bit')
-		$hash_length = strlen(hash($algo, NULL, TRUE));
+			: strlen(hash($algo, NULL, TRUE));
 		empty($length) && $length = $hash_length;
 		// Pre-hash password inputs longer than the algorithm's block size
 			'tiger160,4' => 64,
 			'tiger192,4' => 64,
 			'whirlpool' => 64
 		);
-		if (isset($block_sizes[$algo]) && strlen($password) > $block_sizes[$algo])
+		if (isset($block_sizes[$algo], $password[$block_sizes[$algo]]))
+		{
 			$password = hash($algo, $password, TRUE);
+		}
 		$hash = '';
 		// Note: Blocks are NOT 0-indexed
-		for ($bc = ceil($length / $hash_length), $bi = 1; $bi <= $bc; $bi++)
+		for ($bc = (int) ceil($length / $hash_length), $bi = 1; $bi <= $bc; $bi++)
+		{
 			$key = $derived_key = hash_hmac($algo, $salt.pack('N', $bi), $password, TRUE);
 			for ($i = 1; $i < $iterations; $i++)
 			$hash .= $derived_key;
+		}
+		// This is not RFC-compatible, but we're aiming for natural PHP compatibility
+		if ( ! $raw_output)
+		{
+			$hash = bin2hex($hash);
+		}
+		return defined('MB_OVERLOAD_STRING')
-		// This is not RFC-compatible, but we're aiming for natural PHP compatibility
+			? mb_substr($hash, 0, $length, '8bit')
-		return substr($raw_output ? $hash : bin2hex($hash), 0, $length);
+			: substr($hash, 0, $length);

Subversion-Projekte lars-tiefland.ci