summaryrefslogtreecommitdiff
path: root/includes/password/MWSaltedPassword.php
diff options
context:
space:
mode:
authorroot <root@luna.archlinux.org>2016-05-21 06:38:45 +0000
committerroot <root@luna.archlinux.org>2016-05-21 06:38:45 +0000
commitb88e92b7f0ce508c55de8c6ac5159ef544d480be (patch)
tree86b188507543d2670b7ada1caa8f1139d3d5abe9 /includes/password/MWSaltedPassword.php
parenta2bbd243c85ea0e425ee3e8c380aba9f254cee61 (diff)
parent7bf2eb8ba09b54cec804446ea39a3e658773fac9 (diff)
Merge branch 'master' of https://git.archlinux.org/vhosts/wiki.archlinux.org
Diffstat (limited to 'includes/password/MWSaltedPassword.php')
-rw-r--r--includes/password/MWSaltedPassword.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/includes/password/MWSaltedPassword.php b/includes/password/MWSaltedPassword.php
index 6c6895a2..40d2b6a1 100644
--- a/includes/password/MWSaltedPassword.php
+++ b/includes/password/MWSaltedPassword.php
@@ -42,5 +42,9 @@ class MWSaltedPassword extends ParameterizedPassword {
}
$this->hash = md5( $this->args[0] . '-' . md5( $plaintext ) );
+
+ if ( !is_string( $this->hash ) || strlen( $this->hash ) < 32 ) {
+ throw new PasswordError( 'Error when hashing password.' );
+ }
}
}