Skip to content

Commit

Permalink
Merge pull request #13 from Benjamin-htr/fix/argon2id
Browse files Browse the repository at this point in the history
fix(argond2id):reordering parameters order during serialization to ma…
  • Loading branch information
thetutlage authored Sep 17, 2024
2 parents 7289d25 + 825118f commit b90de8d
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/drivers/argon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ export class Argon implements HashDriverContract {
id: `argon2${this.#config.variant}`,
version: this.#config.version,
params: {
t: this.#config.iterations,
m: this.#config.memory,
t: this.#config.iterations,
p: this.#config.parallelism,
},
})
Expand Down
36 changes: 36 additions & 0 deletions tests/drivers/argon2.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,42 @@ test.group('argon | verify', () => {
assert.isTrue(await argon.verify(hash, 'password'))
})

test('should verify a precomputed hash with old parameters order', async ({ assert }) => {
// Precomputed hash for "password"
const hash =
'$argon2id$v=19$t=4,m=65536,p=1$oNZeAqWynNAkeJUGcuNMSw$O47kb/ayyV1VWoQLDpI/IkDOYUCF/Ctqzxys4cyEeGc'

const argon = new Argon({
variant: 'id',
iterations: 4,
memory: 65536,
parallelism: 1,
version: 19,
saltSize: 16,
hashLength: 32,
})

assert.isTrue(await argon.verify(hash, 'test-124_arg'))
})

test('should verify a precomputed hash with new parameters order', async ({ assert }) => {
// Precomputed hash for "password"
const hash =
'$argon2id$v=19$m=65536,t=4,p=1$oNZeAqWynNAkeJUGcuNMSw$O47kb/ayyV1VWoQLDpI/IkDOYUCF/Ctqzxys4cyEeGc'

const argon = new Argon({
variant: 'id',
iterations: 4,
memory: 65536,
parallelism: 1,
version: 19,
saltSize: 16,
hashLength: 32,
})

assert.isTrue(await argon.verify(hash, 'test-124_arg'))
})

test('fail verification when value is formatted as phc string', async ({ assert }) => {
const argon = new Argon({
variant: 'id',
Expand Down

0 comments on commit b90de8d

Please sign in to comment.