php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/yiisoft/yii2 into 4469-compareString-without-shortcut

Browse Source
This commit is contained in:
tom--
2014-07-27 12:04:03 -04:00
parent c6a8b418ef 34893c9e6a
commit 4f5b7afd95
20 changed files with 1803 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/base/Security.php
View File

@ -296,7 +296,7 @@ class Security extends Component
* @throws InvalidParamException
* @return string the derived key
*/
protected function hkdf($algo, $inputKey, $salt = null, $info = null, $length = 0)
public function hkdf($algo, $inputKey, $salt = null, $info = null, $length = 0)
{
$test = @hash_hmac($algo, '', '', true);
if (!$test) {
@ -343,7 +343,7 @@ class Security extends Component
* @throws InvalidParamException
* @return string the derived key
*/
protected function pbkdf2($algo, $password, $salt, $iterations, $length = 0)
public function pbkdf2($algo, $password, $salt, $iterations, $length = 0)
{
if (function_exists('hash_pbkdf2')) {
$outputKey = hash_pbkdf2($algo, $password, $salt, $iterations, $length, true);
@ -450,7 +450,7 @@ class Security extends Component
/**
* Generates specified number of random bytes.
* Note that output may not be ASCII.
* @see generateRandomKey() if you need a string.
* @see generateRandomString() if you need a string.
*
* @param integer $length the number of bytes to generate
* @throws Exception on failure.
@ -625,4 +625,4 @@ class Security extends Component
}
return $diff === 0;
}
}
}