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

refactored the encryption class.

This commit is contained in:
Taylor Otwell 2011-08-14 21:58:11 -05:00
parent d197a97aac
commit d72f2c642b
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
system/crypt.php
View File

@ -24,14 +24,28 @@ class Crypt {
*/ */
public static function encrypt($value) public static function encrypt($value)
{ {
// Seed the system random number generator so it will produce random results. $iv = mcrypt_create_iv(static::iv_size(), static::randomizer());
if (($random = static::randomizer()) === MCRYPT_RAND) mt_srand();
$iv = mcrypt_create_iv(static::iv_size(), $random); return base64_encode($iv.mcrypt_encrypt(static::$cipher, static::key(), $value, static::$mode, $iv));
}
$value = mcrypt_encrypt(static::$cipher, static::key(), $value, static::$mode, $iv); /**
* Get the random number source available to the OS.
*
* @return int
*/
protected static function randomizer()
{
if (defined('MCRYPT_DEV_URANDOM'))
{
return MCRYPT_DEV_URANDOM;
}
elseif (defined('MCRYPT_DEV_RANDOM'))
{
return MCRYPT_DEV_RANDOM;
}
return base64_encode($iv.$value); return MCRYPT_RAND;
} }
/** /**
@ -47,32 +61,11 @@ public static function decrypt($value)
throw new \Exception('Decryption error. Input value is not valid base64 data.'); throw new \Exception('Decryption error. Input value is not valid base64 data.');
} }
$iv = substr($value, 0, static::iv_size()); list($iv, $value) = array(substr($value, 0, static::iv_size()), substr($value, static::iv_size()));
$value = substr($value, static::iv_size());
return rtrim(mcrypt_decrypt(static::$cipher, static::key(), $value, static::$mode, $iv), "\0"); return rtrim(mcrypt_decrypt(static::$cipher, static::key(), $value, static::$mode, $iv), "\0");
} }
/**
* Get the random number source that should be used for the OS.
*
* @return int
*/
private static function randomizer()
{
if (defined('MCRYPT_DEV_URANDOM'))
{
return MCRYPT_DEV_URANDOM;
}
elseif (defined('MCRYPT_DEV_RANDOM'))
{
return MCRYPT_DEV_RANDOM;
}
return MCRYPT_RAND;
}
/** /**
* Get the application key from the application configuration file. * Get the application key from the application configuration file.
* *