WordPress 4.0.1

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

diff --git a/wp-includes/class-phpass.php b/wp-includes/class-phpass.php
index 2fed5d76853741cf7848b14b111f476b69e7b343..f2dadae3ff2fbacd1cb319410bcdaceb30235606 100644 (file)
--- a/wp-includes/class-phpass.php
+++ b/wp-includes/class-phpass.php
@@ -2,7 +2,7 @@
 /**
  * Portable PHP password hashing framework.
  * @package phpass
 /**
  * Portable PHP password hashing framework.
  * @package phpass

- * @since 2.5
+ * @since 2.5.0

  * @version 0.3 / WordPress
  * @link http://www.openwall.com/phpass/
  */
  * @version 0.3 / WordPress
  * @link http://www.openwall.com/phpass/
  */


@@ -31,7 +31,7 @@
  * @package phpass
  * @version 0.3 / WordPress
  * @link http://www.openwall.com/phpass/
  * @package phpass
  * @version 0.3 / WordPress
  * @link http://www.openwall.com/phpass/

- * @since 2.5
+ * @since 2.5.0

  */
 class PasswordHash {
        var $itoa64;
  */
 class PasswordHash {
        var $itoa64;


@@ -214,6 +214,10 @@ class PasswordHash {
 
        function HashPassword($password)
        {
 
        function HashPassword($password)
        {

+               if ( strlen( $password ) > 4096 ) {
+                       return '*';
+               }
+

                $random = '';
 
                if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
                $random = '';
 
                if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {


@@ -249,6 +253,10 @@ class PasswordHash {
 
        function CheckPassword($password, $stored_hash)
        {
 
        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);
                $hash = $this->crypt_private($password, $stored_hash);
                if ($hash[0] == '*')
                        $hash = crypt($password, $stored_hash);