Handle salt in Crypto classes

mlojewski-me · mlojewski-me · commit 8eb99e66bb04 · 2018-12-16T16:58:13.000+01:00
diff --git a/lib/Crypto/AbstractAlgorithm.php b/lib/Crypto/AbstractAlgorithm.php
@@ -65,13 +65,13 @@ protected abstract function getAlgorithmName();
     /**
      * @inheritdoc
      */
-    public function checkPassword($password, $dbHash)
+    public function checkPassword($password, $dbHash, $salt = null)
     {
-        return hash_equals($dbHash, $this->getPasswordHash($password));
+        return hash_equals($dbHash, $this->getPasswordHash($password, $salt));
     }
 
     /**
      * @inheritdoc
      */
-    public abstract function getPasswordHash($password);
+    public abstract function getPasswordHash($password, $salt = null);
 }
diff --git a/lib/Crypto/AbstractCrypt.php b/lib/Crypto/AbstractCrypt.php
@@ -38,15 +38,15 @@ abstract class AbstractCrypt extends AbstractAlgorithm
     /**
      * @inheritdoc
      */
-    public function checkPassword($password, $dbHash)
+    public function checkPassword($password, $dbHash, $salt = null)
     {
         return hash_equals($dbHash, crypt($password, $dbHash));
     }
 
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return crypt($password, $this->getSalt());
     }
diff --git a/lib/Crypto/Cleartext.php b/lib/Crypto/Cleartext.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return $password;
     }
diff --git a/lib/Crypto/CourierMD5.php b/lib/Crypto/CourierMD5.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return '{MD5}' . Utils::hexToBase64(md5($password));
     }
diff --git a/lib/Crypto/CourierMD5Raw.php b/lib/Crypto/CourierMD5Raw.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return '{MD5RAW}' . md5($password);
     }
diff --git a/lib/Crypto/CourierSHA1.php b/lib/Crypto/CourierSHA1.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return '{SHA}' . Utils::hexToBase64(sha1($password));
     }
diff --git a/lib/Crypto/CourierSHA256.php b/lib/Crypto/CourierSHA256.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return '{SHA256}' . Utils::hexToBase64(hash('sha256', $password));
     }
diff --git a/lib/Crypto/Crypt.php b/lib/Crypto/Crypt.php
@@ -44,7 +44,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return password_hash($password, PASSWORD_DEFAULT);
     }
diff --git a/lib/Crypto/CryptArgon2.php b/lib/Crypto/CryptArgon2.php
@@ -81,15 +81,15 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function checkPassword($password, $dbHash)
+    public function checkPassword($password, $dbHash, $salt = null)
     {
         return password_verify($password, $dbHash);
     }
 
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return password_hash(
             $password, PASSWORD_ARGON2I, [
diff --git a/lib/Crypto/CryptBlowfish.php b/lib/Crypto/CryptBlowfish.php
@@ -52,15 +52,15 @@ public function __construct(IL10N $localization, $cost = 10)
     /**
      * @inheritdoc
      */
-    public function checkPassword($password, $dbHash)
+    public function checkPassword($password, $dbHash, $salt = null)
     {
         return password_verify($password, $dbHash);
     }
 
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return password_hash(
             $password, PASSWORD_BCRYPT, ["cost" => $this->cost]
diff --git a/lib/Crypto/IPasswordAlgorithm.php b/lib/Crypto/IPasswordAlgorithm.php
@@ -42,18 +42,20 @@ public function getVisibleName();
      * This value is stored in the database, when the password is changed.
      *
      * @param String $password The new password.
+     * @param String $salt     Optional. Salt value.
      *
      * @return boolean True if the password was hashed successfully, false otherwise.
      */
-    public function getPasswordHash($password);
+    public function getPasswordHash($password, $salt = null);
 
     /**
      * Check password given by the user against hash stored in the database.
      *
      * @param String $password Password given by the user.
      * @param String $dbHash   Password hash stored in the database.
+     * @param String $salt     Optional. Salt value.
      *
      * @return boolean True if the password is correct, false otherwise.
      */
-    public function checkPassword($password, $dbHash);
+    public function checkPassword($password, $dbHash, $salt = null);
 }
diff --git a/lib/Crypto/Joomla.php b/lib/Crypto/Joomla.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         $salt = Utils::randomString(
             32, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
@@ -55,7 +55,7 @@ public function getPasswordHash($password)
     /**
      * @inheritdoc
      */
-    public function checkPassword($password, $dbHash)
+    public function checkPassword($password, $dbHash, $salt = null)
     {
         return hash_equals($dbHash, self::generateHash($password, $dbHash));
     }
diff --git a/lib/Crypto/MD5.php b/lib/Crypto/MD5.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return md5($password);
     }
diff --git a/lib/Crypto/Phpass.php b/lib/Crypto/Phpass.php
@@ -50,7 +50,7 @@ public function __construct(IL10N $localization, $iterationCount = 8)
     /**
      * @inheritdoc
      */
-    public function checkPassword($password, $dbHash)
+    public function checkPassword($password, $dbHash, $salt = null)
     {
         return hash_equals($dbHash, $this->crypt($password, $dbHash));
     }
@@ -136,7 +136,7 @@ private function encode64($input, $count)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return $this->crypt($password, $this->genSalt());
     }
diff --git a/lib/Crypto/SHA1.php b/lib/Crypto/SHA1.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return sha1($password);
     }
diff --git a/lib/Crypto/SHA256.php b/lib/Crypto/SHA256.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return hash('sha256', $password);
     }
diff --git a/lib/Crypto/SHA512.php b/lib/Crypto/SHA512.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return hash('sha512', $password);
     }
diff --git a/lib/Crypto/SHA512Whirlpool.php b/lib/Crypto/SHA512Whirlpool.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return hash('sha512', hash('whirlpool', $password));
     }
diff --git a/lib/Crypto/SSHA.php b/lib/Crypto/SSHA.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function checkPassword($password, $dbHash)
+    public function checkPassword($password, $dbHash, $salt = null)
     {
         $saltedPassword = base64_decode(
             preg_replace("/" . $this->getPrefix() . "/i", "", $dbHash)
@@ -94,7 +94,7 @@ public abstract function getHashLength();
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return self::ssha(
             $password, Utils::randomString(
diff --git a/lib/Crypto/WCF2.php b/lib/Crypto/WCF2.php
@@ -31,15 +31,15 @@ class WCF2 extends AbstractCrypt
     /**
      * @inheritdoc
      */
-    public function checkPassword($password, $dbHash)
+    public function checkPassword($password, $dbHash, $salt = null)
     {
         return hash_equals($dbHash, crypt(crypt($password, $dbHash), $dbHash));
     }
 
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         $salt = $this->getSalt();
         return crypt(crypt($password, $salt), $salt);
diff --git a/lib/Crypto/Whirlpool.php b/lib/Crypto/Whirlpool.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)
     /**
      * @inheritdoc
      */
-    public function getPasswordHash($password)
+    public function getPasswordHash($password, $salt = null)
     {
         return hash('whirlpool', $password);
     }

Original file line number	Diff line number	Diff line change
`@@ -65,13 +65,13 @@ protected abstract function getAlgorithmName();`
`65`	`65`	`/**`
`66`	`66`	`* @inheritdoc`
`67`	`67`	`*/`
`68`		`- public function checkPassword($password, $dbHash)`
	`68`	`+ public function checkPassword($password, $dbHash, $salt = null)`
`69`	`69`	`{`
`70`		`- return hash_equals($dbHash, $this->getPasswordHash($password));`
	`70`	`+ return hash_equals($dbHash, $this->getPasswordHash($password, $salt));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`
`74`	`74`	`* @inheritdoc`
`75`	`75`	`*/`
`76`		`- public abstract function getPasswordHash($password);`
	`76`	`+ public abstract function getPasswordHash($password, $salt = null);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,15 @@ abstract class AbstractCrypt extends AbstractAlgorithm`
`38`	`38`	`/**`
`39`	`39`	`* @inheritdoc`
`40`	`40`	`*/`
`41`		`- public function checkPassword($password, $dbHash)`
	`41`	`+ public function checkPassword($password, $dbHash, $salt = null)`
`42`	`42`	`{`
`43`	`43`	`return hash_equals($dbHash, crypt($password, $dbHash));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
`47`	`47`	`* @inheritdoc`
`48`	`48`	`*/`
`49`		`- public function getPasswordHash($password)`
	`49`	`+ public function getPasswordHash($password, $salt = null)`
`50`	`50`	`{`
`51`	`51`	`return crypt($password, $this->getSalt());`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(IL10N $localization)`
`43`	`43`	`/**`
`44`	`44`	`* @inheritdoc`
`45`	`45`	`*/`
`46`		`- public function getPasswordHash($password)`
	`46`	`+ public function getPasswordHash($password, $salt = null)`
`47`	`47`	`{`
`48`	`48`	`return $password;`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(IL10N $localization)`
`44`	`44`	`/**`
`45`	`45`	`* @inheritdoc`
`46`	`46`	`*/`
`47`		`- public function getPasswordHash($password)`
	`47`	`+ public function getPasswordHash($password, $salt = null)`
`48`	`48`	`{`
`49`	`49`	`return password_hash($password, PASSWORD_DEFAULT);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,15 +81,15 @@ public function __construct(`
`81`	`81`	`/**`
`82`	`82`	`* @inheritdoc`
`83`	`83`	`*/`
`84`		`- public function checkPassword($password, $dbHash)`
	`84`	`+ public function checkPassword($password, $dbHash, $salt = null)`
`85`	`85`	`{`
`86`	`86`	`return password_verify($password, $dbHash);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`/**`
`90`	`90`	`* @inheritdoc`
`91`	`91`	`*/`
`92`		`- public function getPasswordHash($password)`
	`92`	`+ public function getPasswordHash($password, $salt = null)`
`93`	`93`	`{`
`94`	`94`	`return password_hash(`
`95`	`95`	`$password, PASSWORD_ARGON2I, [`
Original file line number	Diff line number	Diff line change
`@@ -52,15 +52,15 @@ public function __construct(IL10N $localization, $cost = 10)`
`52`	`52`	`/**`
`53`	`53`	`* @inheritdoc`
`54`	`54`	`*/`
`55`		`- public function checkPassword($password, $dbHash)`
	`55`	`+ public function checkPassword($password, $dbHash, $salt = null)`
`56`	`56`	`{`
`57`	`57`	`return password_verify($password, $dbHash);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/**`
`61`	`61`	`* @inheritdoc`
`62`	`62`	`*/`
`63`		`- public function getPasswordHash($password)`
	`63`	`+ public function getPasswordHash($password, $salt = null)`
`64`	`64`	`{`
`65`	`65`	`return password_hash(`
`66`	`66`	`$password, PASSWORD_BCRYPT, ["cost" => $this->cost]`