Merge 16b11a4ee588ce22f0498c8a12171860cb447e35 into 4290ea753912378913b1f3f54e0fc5720afeda5d

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],

tests/operations/tests/Hash.mjs

@@ -1190,6 +1190,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",