Update phpass to 0.2. Props hakre. fixes #10727
git-svn-id: http://svn.automattic.com/wordpress/trunk@12521 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
05e19b1cde
commit
8c799f9ad1
|
@ -3,7 +3,7 @@
|
||||||
* Portable PHP password hashing framework.
|
* Portable PHP password hashing framework.
|
||||||
* @package phpass
|
* @package phpass
|
||||||
* @since 2.5
|
* @since 2.5
|
||||||
* @version 0.1
|
* @version 0.2 / genuine.
|
||||||
* @link http://www.openwall.com/phpass/
|
* @link http://www.openwall.com/phpass/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
* Portable PHP password hashing framework.
|
* Portable PHP password hashing framework.
|
||||||
*
|
*
|
||||||
* @package phpass
|
* @package phpass
|
||||||
* @version 0.1 / genuine
|
* @version 0.2 / genuine.
|
||||||
* @link http://www.openwall.com/phpass/
|
* @link http://www.openwall.com/phpass/
|
||||||
* @since 2.5
|
* @since 2.5
|
||||||
*/
|
*/
|
||||||
|
@ -49,14 +49,14 @@ class PasswordHash {
|
||||||
|
|
||||||
$this->portable_hashes = $portable_hashes;
|
$this->portable_hashes = $portable_hashes;
|
||||||
|
|
||||||
$this->random_state = microtime() . (function_exists('getmypid') ? getmypid() : '') . uniqid(rand(), TRUE);
|
$this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compability reasons
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_random_bytes($count)
|
function get_random_bytes($count)
|
||||||
{
|
{
|
||||||
$output = '';
|
$output = '';
|
||||||
if (($fh = @fopen('/dev/urandom', 'rb'))) {
|
if (is_readable('/dev/urandom') &&
|
||||||
|
($fh = @fopen('/dev/urandom', 'rb'))) {
|
||||||
$output = fread($fh, $count);
|
$output = fread($fh, $count);
|
||||||
fclose($fh);
|
fclose($fh);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue