Skip to content

Commit 2f47e55

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Update Pbkdf2PasswordHasher.php Bump Symfony version to 6.3.5 Update VERSION for 6.3.4 Update CHANGELOG for 6.3.4 Bump Symfony version to 5.4.29 Update VERSION for 5.4.28 Update CONTRIBUTORS for 5.4.28 Update CHANGELOG for 5.4.28 Fixed attachment base64 content string in MailerSendApiTransport [Security] Prevent creating session in stateless firewalls [Serializer] Fix union of enum denormalization [Serializer] Fix wrong InvalidArgumentException Fix breaking change in AccessTokenAuthenticator
2 parents b5bb4e3 + 391acd6 commit 2f47e55

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Hasher/Pbkdf2PasswordHasher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function hash(#[\SensitiveParameter] string $plainPassword, string $salt
6969
throw new LogicException(sprintf('The algorithm "%s" is not supported.', $this->algorithm));
7070
}
7171

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);
7373

7474
return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest);
7575
}

0 commit comments

Comments
 (0)