Skip to content

Make ArgonHasher aware of argon provider #39046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 4, 2021
Merged

Make ArgonHasher aware of argon provider #39046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f95217
Make ArgonHasher aware of argon provider
mallardduck Sep 30, 2021
2661488
remove skips for Hashing tests
mallardduck Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Illuminate/Hashing/ArgonHasher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function __construct(array $options = [])
{
$this->time = $options['time'] ?? $this->time;
$this->memory = $options['memory'] ?? $this->memory;
$this->threads = $options['threads'] ?? $this->threads;
$this->threads = $this->threads($options);
$this->verifyAlgorithm = $options['verify'] ?? $this->verifyAlgorithm;
}

Expand Down Expand Up @@ -187,6 +187,10 @@ protected function time(array $options)
*/
protected function threads(array $options)
{
if (defined('PASSWORD_ARGON2_PROVIDER') && PASSWORD_ARGON2_PROVIDER === 'sodium') {
return 1;
}

return $options['threads'] ?? $this->threads;
}
}
12 changes: 0 additions & 12 deletions tests/Hashing/HasherTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ public function testBasicBcryptHashing()

public function testBasicArgon2iHashing()
{
if (\PHP_VERSION_ID >= 80100) {
$this->markTestSkipped('Test failing in PHP 8.1');
}

if (! defined('PASSWORD_ARGON2I')) {
$this->markTestSkipped('PHP not compiled with Argon2i hashing support.');
}
Expand All @@ -42,10 +38,6 @@ public function testBasicArgon2iHashing()

public function testBasicArgon2idHashing()
{
if (\PHP_VERSION_ID >= 80100) {
$this->markTestSkipped('Test failing in PHP 8.1');
}

if (! defined('PASSWORD_ARGON2ID')) {
$this->markTestSkipped('PHP not compiled with Argon2id hashing support.');
}
Expand All @@ -64,10 +56,6 @@ public function testBasicArgon2idHashing()
*/
public function testBasicBcryptVerification()
{
if (\PHP_VERSION_ID >= 80100) {
$this->markTestSkipped('Test failing in PHP 8.1');
}

$this->expectException(RuntimeException::class);

if (! defined('PASSWORD_ARGON2I')) {
Expand Down