Wordpress 3.1.1

[autoinstalls/wordpress.git] / wp-includes / class-phpass.php

diff --git a/wp-includes/class-phpass.php b/wp-includes/class-phpass.php
index 93f4536cfbe5fa695fa3f4f4c23d119e776a3ce7..6d77a1cce9fd57870cfe3750ec227a404ddaeef9 100644 (file)
--- a/wp-includes/class-phpass.php
+++ b/wp-includes/class-phpass.php
@@ -3,7 +3,7 @@
  * Portable PHP password hashing framework.
  * @package phpass
  * @since 2.5
- * @version 0.1
+ * @version 0.2 / genuine.
  * @link http://www.openwall.com/phpass/
  */
 
@@ -29,7 +29,7 @@
  * Portable PHP password hashing framework.
  *
  * @package phpass
- * @version 0.1 / genuine
+ * @version 0.2 / genuine.
  * @link http://www.openwall.com/phpass/
  * @since 2.5
  */
@@ -49,14 +49,14 @@ class PasswordHash {
 
                $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)
        {
                $output = '';
-               if (($fh = @fopen('/dev/urandom', 'rb'))) {
+               if ( @is_readable('/dev/urandom') &&
+                   ($fh = @fopen('/dev/urandom', 'rb'))) {
                        $output = fread($fh, $count);
                        fclose($fh);
                }