WordPress 4.7.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 6d77a1cce9fd57870cfe3750ec227a404ddaeef9..8b8b113194b71b0c62b19d85380d30f231f93ade 100644 (file)
--- a/wp-includes/class-phpass.php
+++ b/wp-includes/class-phpass.php
@@ -2,14 +2,14 @@
 /**
  * Portable PHP password hashing framework.
  * @package phpass
- * @since 2.5
- * @version 0.2 / genuine.
+ * @since 2.5.0
+ * @version 0.3 / WordPress
  * @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.
 #
@@ -29,9 +29,9 @@
  * Portable PHP password hashing framework.
  *
  * @package phpass
- * @version 0.2 / genuine.
+ * @version 0.3 / WordPress
  * @link http://www.openwall.com/phpass/
- * @since 2.5
+ * @since 2.5.0
  */
 class PasswordHash {
        var $itoa64;
@@ -39,7 +39,10 @@ class PasswordHash {
        var $portable_hashes;
        var $random_state;
 
-       function PasswordHash($iteration_count_log2, $portable_hashes)
+       /**
+        * PHP5 constructor.
+        */
+       function __construct( $iteration_count_log2, $portable_hashes )
        {
                $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
@@ -49,7 +52,14 @@ class PasswordHash {
 
                $this->portable_hashes = $portable_hashes;
 
-               $this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compability reasons
+               $this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compatibility reasons
+       }
+
+       /**
+        * PHP4 constructor.
+        */
+       public function PasswordHash( $iteration_count_log2, $portable_hashes ) {
+               self::__construct( $iteration_count_log2, $portable_hashes );
        }
 
        function get_random_bytes($count)
@@ -114,7 +124,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]);
@@ -212,6 +224,10 @@ class PasswordHash {
 
        function HashPassword($password)
        {
+               if ( strlen( $password ) > 4096 ) {
+                       return '*';
+               }
+
                $random = '';
 
                if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
@@ -247,12 +263,14 @@ 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;
        }
-}
-
-?>
+}
\ No newline at end of file