dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add id attribute to error message "mw-error-cannotundelete""
[lhc/web/wiklou.git]
/
includes
/
password
/
Pbkdf2Password.php
diff --git
a/includes/password/Pbkdf2Password.php
b/includes/password/Pbkdf2Password.php
index
8ef6f8d
..
6ffada3
100644
(file)
--- a/
includes/password/Pbkdf2Password.php
+++ b/
includes/password/Pbkdf2Password.php
@@
-55,8
+55,15
@@
class Pbkdf2Password extends ParameterizedPassword {
(int)$this->params['length'],
true
);
(int)$this->params['length'],
true
);
+ if ( !is_string( $hash ) ) {
+ throw new PasswordError( 'Error when hashing password.' );
+ }
} else {
} else {
- $hashLen = strlen( hash( $this->params['algo'], '', true ) );
+ $hashLenHash = hash( $this->params['algo'], '', true );
+ if ( !is_string( $hashLenHash ) ) {
+ throw new PasswordError( 'Error when hashing password.' );
+ }
+ $hashLen = strlen( $hashLenHash );
$blockCount = ceil( $this->params['length'] / $hashLen );
$hash = '';
$blockCount = ceil( $this->params['length'] / $hashLen );
$hash = '';