Merge branch '5.4' into 6.3

derrabus · derrabus · commit f694f4c85e0d · 2023-08-29T08:52:14.000+02:00
* 5.4:
  Update Pbkdf2PasswordHasher.php
diff --git a/Hasher/Pbkdf2PasswordHasher.php b/Hasher/Pbkdf2PasswordHasher.php
@@ -69,7 +69,7 @@ public function hash(#[\SensitiveParameter] string $plainPassword, string $salt
             throw new LogicException(sprintf('The algorithm "%s" is not supported.', $this->algorithm));
         }
 
-        $digest = hash_pbkdf2($this->algorithm, $plainPassword, $salt, $this->iterations, $this->length, true);
+        $digest = hash_pbkdf2($this->algorithm, $plainPassword, $salt ?? '', $this->iterations, $this->length, true);
 
         return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest);
     }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function hash(#[\SensitiveParameter] string $plainPassword, string $salt`
`69`	`69`	`throw new LogicException(sprintf('The algorithm "%s" is not supported.', $this->algorithm));`
`70`	`70`	`}`
`71`	`71`
`72`		`- $digest = hash_pbkdf2($this->algorithm, $plainPassword, $salt, $this->iterations, $this->length, true);`
	`72`	`+ $digest = hash_pbkdf2($this->algorithm, $plainPassword, $salt ?? '', $this->iterations, $this->length, true);`
`73`	`73`
`74`	`74`	`return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest);`
`75`	`75`	`}`