diff --git a/src/core/operations/Argon2.mjs b/src/core/operations/Argon2.mjs index 4feb881cd5..bddf5a3962 100644 --- a/src/core/operations/Argon2.mjs +++ b/src/core/operations/Argon2.mjs @@ -79,7 +79,7 @@ class Argon2 extends Operation { "Argon2id": argon2.ArgonType.Argon2id }; - const salt = Utils.convertToByteString(args[0].string || "", args[0].option), + const salt = Utils.convertToByteArray(args[0].string || "", args[0].option), time = args[1], mem = args[2], parallelism = args[3], diff --git a/tests/operations/tests/Hash.mjs b/tests/operations/tests/Hash.mjs index ba50293446..13d9e9b693 100644 --- a/tests/operations/tests/Hash.mjs +++ b/tests/operations/tests/Hash.mjs @@ -1146,6 +1146,25 @@ TestRegister.addTests([ } ] }, + { + name: "Argon2: Base64 Salt", + input: "argon2password", + expectedOutput: "$argon2i$v=19$m=4096,t=3,p=1$c29tZXNhbHQ$s43my9eBljQADuF/LWCG8vGqwAJzOorKQ0Yog8jFvbw", + recipeConfig: [ + { + op: "Argon2", + args: [ + {"option": "Base64", "string": "c29tZXNhbHQ="}, + 3, + 4096, + 1, + 32, + "Argon2i", + "Encoded hash" + ] + } + ] + }, { name: "Argon2 compare", input: "argon2password",