Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1962 from fpirsch/master 

fix incorrect padding with multibyte strings encryption
This commit is contained in:
Taylor Otwell 2013-05-13 22:53:15 -07:00
parent 5d63d5ad52 76db206551
commit c878a18fdb
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
laravel/crypter.php
View File

@ -116,7 +116,7 @@ protected static function iv_size()
*/ */
protected static function pad($value) protected static function pad($value)
{ {
$pad = static::$block - (Str::length($value) % static::$block); $pad = static::$block - (strlen($value) % static::$block);
return $value .= str_repeat(chr($pad), $pad); return $value .= str_repeat(chr($pad), $pad);
} }
@ -129,14 +129,7 @@ protected static function pad($value)
*/ */
protected static function unpad($value) protected static function unpad($value)
{ {
if (MB_STRING) $pad = ord(substr($value, -1));
{
$pad = ord(mb_substr($value, -1, 1, Config::get('application.encoding')));
}
else
{
$pad = ord(substr($value, -1));
}
if ($pad and $pad <= static::$block) if ($pad and $pad <= static::$block)
{ {
@ -145,12 +138,7 @@ protected static function unpad($value)
// as the padding appears to have been changed. // as the padding appears to have been changed.
if (preg_match('/'.chr($pad).'{'.$pad.'}$/', $value)) if (preg_match('/'.chr($pad).'{'.$pad.'}$/', $value))
{ {
if (MB_STRING) return substr($value, 0, strlen($value) - $pad);
{
return mb_substr($value, 0, Str::length($value) - $pad, Config::get('application.encoding'));
}
return substr($value, 0, Str::length($value) - $pad);
} }
// If the padding characters do not match the expected padding // If the padding characters do not match the expected padding