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 1970ae9da49df37083b19f27db3cc4f428c04f00..8b8b113194b71b0c62b19d85380d30f231f93ade 100644 (file)
--- a/wp-includes/class-phpass.php
+++ b/wp-includes/class-phpass.php
@@ -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';
 
@@ -52,6 +55,13 @@ class PasswordHash {
                $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)
        {
                $output = '';
@@ -214,6 +224,10 @@ class PasswordHash {
 
        function HashPassword($password)
        {
+               if ( strlen( $password ) > 4096 ) {
+                       return '*';
+               }
+
                $random = '';
 
                if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
@@ -249,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;
        }
-}
-
-?>
+}
\ No newline at end of file