fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 04:52:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Simplify IV creation routine by reusing Password class

Browse source
This commit is contained in:
Kijin Sung 2015-07-22 21:28:22 +09:00
parent 402276f4ff
commit b9237e8352
1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
classes/security/Crypto.class.php
View file

@ -295,7 +295,7 @@ class Crypto
protected static function _createSecureKey() protected static function _createSecureKey()
{ {
$oPassword = new Password(); $oPassword = new Password();
return base64_encode($oPassword->createSecureSalt(16, 'binary')); return base64_encode($oPassword->createSecureSalt(ENCRYPTION_KEY_SIZE, 'binary'));
} }
/** /**
@ -304,19 +304,8 @@ class Crypto
*/ */
protected static function _createIV() protected static function _createIV()
{ {
$is_windows = (defined('PHP_OS') && strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'); $oPassword = new Password();
if(function_exists('openssl_random_pseudo_bytes') && (!$is_windows || version_compare(PHP_VERSION, '5.4', '>='))) return $oPassword->createSecureSalt(self::ENCRYPTION_BLOCK_SIZE, 'binary');
{
return openssl_random_pseudo_bytes(self::ENCRYPTION_BLOCK_SIZE);
}
elseif(!$is_windows || version_compare(PHP_VERSION, '5.3.7', '>='))
{
return mcrypt_create_iv(self::ENCRYPTION_BLOCK_SIZE, MCRYPT_DEV_URANDOM);
}
else
{
return mcrypt_create_iv(self::ENCRYPTION_BLOCK_SIZE, MCRYPT_RAND);
}
} }