[BUGFIX] Remove unused if in PasswordHashing

A useless if can be dropped since the deprecation removals. Resolves: #87208 Releases: master Change-Id: Ib664a3d50fb4aeb7956606b054e46a0be84d1e92 Reviewed-on: https://review.typo3.org/59206 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl> Tested-by: Wouter Wolters <typo3@wouterwolters.nl> Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de> Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
TYPO3 · Dec 19, 2018 · a69d474 · a69d474
1 parent c4968cf
commit a69d474
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/typo3/sysext/core/Classes/Crypto/PasswordHashing/BlowfishPasswordHash.php b/typo3/sysext/core/Classes/Crypto/PasswordHashing/BlowfishPasswordHash.php
@@ -97,9 +97,7 @@ public function getHashedPassword(string $password)
     {
         $saltedPW = null;
         if (!empty($password)) {
-            if (empty($salt) || !$this->isValidSalt($salt)) {
-                $salt = $this->getGeneratedSalt();
-            }
+            $salt = $this->getGeneratedSalt();
             $saltedPW = crypt($password, $this->applySettingsToSalt($salt));
         }
         return $saltedPW;

diff --git a/typo3/sysext/core/Classes/Crypto/PasswordHashing/Md5PasswordHash.php b/typo3/sysext/core/Classes/Crypto/PasswordHashing/Md5PasswordHash.php
@@ -69,9 +69,7 @@ public function getHashedPassword(string $password)
     {
         $saltedPW = null;
         if (!empty($password)) {
-            if (empty($salt) || !$this->isValidSalt($salt)) {
-                $salt = $this->getGeneratedSalt();
-            }
+            $salt = $this->getGeneratedSalt();
             $saltedPW = crypt($password, $this->applySettingsToSalt($salt));
         }
         return $saltedPW;

diff --git a/typo3/sysext/core/Classes/Crypto/PasswordHashing/PhpassPasswordHash.php b/typo3/sysext/core/Classes/Crypto/PasswordHashing/PhpassPasswordHash.php
@@ -97,9 +97,7 @@ public function getHashedPassword(string $password)
     {
         $saltedPW = null;
         if (!empty($password)) {
-            if (empty($salt) || !$this->isValidSalt($salt)) {
-                $salt = $this->getGeneratedSalt();
-            }
+            $salt = $this->getGeneratedSalt();
             $saltedPW = $this->cryptPassword($password, $this->applySettingsToSalt($salt));
         }
         return $saltedPW;