Merge "Move up devunt's name to Developers"

[lhc/web/wiklou.git] / includes / password / Pbkdf2Password.php

diff --git a/includes/password/Pbkdf2Password.php b/includes/password/Pbkdf2Password.php
index 080e3b0..6ffada3 100644 (file)
--- a/includes/password/Pbkdf2Password.php
+++ b/includes/password/Pbkdf2Password.php
@@ -30,11 +30,11 @@
  */
 class Pbkdf2Password extends ParameterizedPassword {
        protected function getDefaultParams() {
-               return array(
+               return [
                        'algo' => $this->config['algo'],
                        'rounds' => $this->config['cost'],
                        'length' => $this->config['length']
-               );
+               ];
        }
 
        protected function getDelimiter() {
@@ -55,8 +55,15 @@ class Pbkdf2Password extends ParameterizedPassword {
                                (int)$this->params['length'],
                                true
                        );
+                       if ( !is_string( $hash ) ) {
+                               throw new PasswordError( 'Error when hashing password.' );
+                       }
                } 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 = '';