WordPress 4.1.1-scripts

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

diff --git a/wp-includes/class-phpass.php b/wp-includes/class-phpass.php
index c964b09b10e41834a39afe87431e647ceba7d5b0..f2dadae3ff2fbacd1cb319410bcdaceb30235606 100644 (file)
--- a/wp-includes/class-phpass.php
+++ b/wp-includes/class-phpass.php
@@ -2,25 +2,17 @@
 /**
  * Portable PHP password hashing framework.
  * @package phpass
- * @since 2.5
- * @version 0.1
+ * @since 2.5.0
+ * @version 0.3 / WordPress
  * @link http://www.openwall.com/phpass/
  */
 
-#
-# Portable PHP password hashing framework.
-#
-# Version 0.1 / genuine.
 #
 # 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.
 #
-# The homepage URL for this framework is:
-#
-#      http://www.openwall.com/phpass/
-#
 # Please be sure to update the Version line if you edit this file in any way.
 # It is suggested that you leave the main version number intact, but indicate
 # your project name (after the slash) and add your own revision information.
@@ -32,6 +24,15 @@
 # Obviously, since this code is in the public domain, the above are not
 # requirements (there can be none), but merely suggestions.
 #
+
+/**
+ * Portable PHP password hashing framework.
+ *
+ * @package phpass
+ * @version 0.3 / WordPress
+ * @link http://www.openwall.com/phpass/
+ * @since 2.5.0
+ */
 class PasswordHash {
        var $itoa64;
        var $iteration_count_log2;
@@ -48,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 compatibility 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);
                }
@@ -113,7 +114,9 @@ class PasswordHash {
                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]);
@@ -211,6 +214,10 @@ class PasswordHash {
 
        function HashPassword($password)
        {
+               if ( strlen( $password ) > 4096 ) {
+                       return '*';
+               }
+
                $random = '';
 
                if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
@@ -246,11 +253,15 @@ class PasswordHash {
 
        function CheckPassword($password, $stored_hash)
        {
+               if ( strlen( $password ) > 4096 ) {
+                       return false;
+               }
+
                $hash = $this->crypt_private($password, $stored_hash);
                if ($hash[0] == '*')
                        $hash = crypt($password, $stored_hash);
 
-               return $hash == $stored_hash;
+               return $hash === $stored_hash;
        }
 }