hash_pbkdf2() byte-safety again ... actually tell mbstring to use 8bit

1 files changed, 2 insertions, 2 deletions

diff --git a/system/core/compat/hash.php b/system/core/compat/hash.php
index 7eb292188..c65203aaf 100644
--- a/system/core/compat/hash.php
+++ b/system/core/compat/hash.php
@@ -174,7 +174,7 @@ if ( ! function_exists('hash_pbkdf2'))
 		}
 
 		$hash_length = defined('MB_OVERLOAD_STRING')
-			? mb_strlen(hash($algo, NULL, TRUE))
+			? mb_strlen(hash($algo, NULL, TRUE), '8bit')
 			: strlen(hash($algo, NULL, TRUE));
 		empty($length) && $length = $hash_length;
 
@@ -248,7 +248,7 @@ if ( ! function_exists('hash_pbkdf2'))
 		}
 
 		return defined('MB_OVERLOAD_STRING')
-			? mb_substr($hash, 0, $length)
+			? mb_substr($hash, 0, $length, '8bit')
 			: substr($hash, 0, $length);
 	}
 }