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

added pkcs7 compliant padding to encryption class instead of default 0 padding.

This commit is contained in:
Taylor Otwell 2012-02-16 14:31:11 -06:00
parent 49d9666958
commit ab5ce2a7eb
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
laravel/crypter.php
View File

@ -16,6 +16,13 @@ class Crypter {
*/
public static $mode = MCRYPT_MODE_CBC;
/**
* The block size of the cipher.
*
* @var int
*/
public static $block = 32;
/**
* Encrypt a string using Mcrypt.
*
@ -28,6 +35,8 @@ public static function encrypt($value)
{
$iv = mcrypt_create_iv(static::iv_size(), static::randomizer());
$value = static::pad($value);
$value = mcrypt_encrypt(static::$cipher, static::key(), $value, static::$mode, $iv);
return base64_encode($iv.$value);
@ -55,7 +64,9 @@ public static function decrypt($value)
// so we will trim all of the padding characters.
$key = static::key();
return rtrim(mcrypt_decrypt(static::$cipher, $key, $value, static::$mode, $iv), "\0");
$value = mcrypt_decrypt(static::$cipher, $key, $value, static::$mode, $iv);
return static::unpad($value);
}
/**
@ -97,6 +108,32 @@ protected static function iv_size()
return mcrypt_get_iv_size(static::$cipher, static::$mode);
}
/**
* Add PKCS7 compatible padding on the given value.
*
* @param string $value
* @return string
*/
protected static function pad($value)
{
$pad = static::$block - (Str::length($value) % static::$block);
return $value .= str_repeat(chr($pad), $pad);
}
/**
* Remove the PKCS7 compatible padding from the given value.
*
* @param string $value
* @return string
*/
protected static function unpad($value)
{
$pad = ord($value[($length = Str::length($value)) - 1]);
return substr($value, 0, $length - $pad);
}
/**
* Get the encryption key from the application configuration.
*