WordPress 3.3.2-scripts

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

diff --git a/wp-includes/class-phpass.php b/wp-includes/class-phpass.php
index 93f4536cfbe5fa695fa3f4f4c23d119e776a3ce7..dcdf3803b5e2bfd62313e830aede5eae00111098 100644 (file)
--- a/wp-includes/class-phpass.php
+++ b/wp-includes/class-phpass.php
@@ -3,13 +3,13 @@
  * Portable PHP password hashing framework.
  * @package phpass
  * @since 2.5
  * Portable PHP password hashing framework.
  * @package phpass
  * @since 2.5

- * @version 0.1
+ * @version 0.3 / WordPress

  * @link http://www.openwall.com/phpass/
  */
 
 #
 # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
  * @link http://www.openwall.com/phpass/
  */
 
 #
 # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in

-# the public domain.
+# the public domain.  Revised in subsequent years, still public domain.

 #
 # There's absolutely no warranty.
 #
 #
 # There's absolutely no warranty.
 #


@@ -29,7 +29,7 @@
  * Portable PHP password hashing framework.
  *
  * @package phpass
  * Portable PHP password hashing framework.
  *
  * @package phpass

- * @version 0.1 / genuine
+ * @version 0.3 / WordPress

  * @link http://www.openwall.com/phpass/
  * @since 2.5
  */
  * @link http://www.openwall.com/phpass/
  * @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 compatibility reasons

        }
 
        function get_random_bytes($count)
        {
                $output = '';
        }
 
        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);
                }
                        $output = fread($fh, $count);
                        fclose($fh);
                }


@@ -114,7 +114,9 @@ class PasswordHash {
                if (substr($setting, 0, 2) == $output)
                        $output = '*1';
 
                if (substr($setting, 0, 2) == $output)
                        $output = '*1';
 

-               if (substr($setting, 0, 3) != '$P$')
+               $id = substr($setting, 0, 3);
+               # We use "$P$", phpBB3 uses "$H$" for the same thing
+               if ($id != '$P$' && $id != '$H$')

                        return $output;
 
                $count_log2 = strpos($this->itoa64, $setting[3]);
                        return $output;
 
                $count_log2 = strpos($this->itoa64, $setting[3]);