Address DanLeh's Comments

1) Move to an explicit `free` call.
2) Only do `Argon2id`
3) Use `tCost = 3` rather than 2 per best practices.
4) Lower iteration count from 50 -> 30 and worst case from 4 -> 3

Author: kmiller68

JetStreamDriver.js

@@ -2063,7 +2063,8 @@ const BENCHMARKS = [
         preload: {
             wasmBinary: "./wasm/argon2/build/argon2.wasm"
         },
-        iterations: 50,
+        iterations: 30,
+        worstCaseCount: 3,
         testGroup: WasmGroup,
         deterministicRandom: true,
     }),

wasm/argon2/benchmark.js

@@ -27,6 +27,7 @@ let passwordStrings = [
     '123456',
     'p@assw0rd',
     'qwerty',
+    'letmein',
     '汉字漢字',
     'كلمة المرور',
     'Z7ihQxGE93',
@@ -35,28 +36,41 @@ let passwordStrings = [
 ];
 
 // Emscripten doesn't have a way to manage your pointers for you so these will free them when the wrapper dies.
-const mallocRegistry = new FinalizationRegistry((ptr) => Module._free(ptr));
 
+// If/when https://github.com/tc39/proposal-explicit-resource-management becomes a thing we should use that syntax/symbol instead of a dispose call.
 class CString {
     constructor(string) {
         this.ptr = Module.stringToNewUTF8(string);
         this.length = Module._strlen(this.ptr);
-        mallocRegistry.register(this, this.ptr);
+    }
+
+    dispose() {
+        Module._free(this.ptr);
     }
 }
 
 class MallocPtr {
     constructor(size) {
         this.ptr = Module._malloc(size);
         this.size = size;
-        mallocRegistry.register(this, this.ptr);
+    }
+
+    dispose() {
+        Module._free(this.ptr);
     }
 }
 
-const tCost = 2;
+const tCost = 3;
 const mCost = 1024;
 const parallelism = 1;
-const argon2NumberOfTypes = 2;
+// There are three argon2 types (modes), we test all three. See wasm/argon2/include/argon2.h for the enum:
+// /* Argon2 primitive type */
+// typedef enum Argon2_type {
+//   Argon2_d = 0,
+//   Argon2_i = 1,
+//   Argon2_id = 2
+// } argon2_type;
+const argon2Type = 2;
 const version = 0x13;
 const saltLength = 12;
 
@@ -68,7 +82,7 @@ class Benchmark {
         }
 
         for (let i = 0; i < passwordStrings.length; ++i)
-            this.hashAndVerify(passwordStrings[i], i % argon2NumberOfTypes);
+            this.hashAndVerify(passwordStrings[i], argon2Type);
     }
 
     randomSalt() {
@@ -82,15 +96,20 @@ class Benchmark {
     hashAndVerify(password, argon2Type) {
         password = new CString(password);
         let salt = this.randomSalt();
-        this.hashBuffer = new MallocPtr(24);
-        this.encodedBuffer = new MallocPtr(Module._argon2_encodedlen(tCost, mCost, parallelism, saltLength, this.hashBuffer.size, argon2Type) + 1);
+        let hashBuffer = new MallocPtr(24);
+        let encodedBuffer = new MallocPtr(Module._argon2_encodedlen(tCost, mCost, parallelism, salt.size, hashBuffer.size, argon2Type) + 1);
 
-        let status = Module._argon2_hash(tCost, mCost, parallelism, password.ptr, password.length, salt.ptr, salt.size, this.hashBuffer.ptr, this.hashBuffer.size, this.encodedBuffer.ptr, this.encodedBuffer.size, argon2Type, version);
+        let status = Module._argon2_hash(tCost, mCost, parallelism, password.ptr, password.length, salt.ptr, salt.size, hashBuffer.ptr, hashBuffer.size, encodedBuffer.ptr, encodedBuffer.size, argon2Type, version);
         if (status !== 0)
             throw new Error(`argon2_hash exited with status: ${status} (${Module.UTF8ToString(Module._argon2_error_message(status))})`);
 
-        status = Module._argon2_verify(this.encodedBuffer.ptr, password.ptr, password.length, argon2Type);
+        status = Module._argon2_verify(encodedBuffer.ptr, password.ptr, password.length, argon2Type);
         if (status !== 0)
             throw new Error(`argon2_verify exited with status: ${status} (${Module.UTF8ToString(Module._argon2_error_message(status))})`);
+
+        password.dispose();
+        salt.dispose();
+        hashBuffer.dispose();
+        encodedBuffer.dispose();
     }
 }

wasm/argon2/build-wasm.sh

@@ -11,7 +11,7 @@ echo "Built on $(date -u '+%Y-%m-%dT%H:%M:%SZ')" | tee "$BUILD_LOG"
 echo "Toolchain versions" | tee -a "$BUILD_LOG"
 emcc --version | head -n1 | tee -a "$BUILD_LOG"
 
-# FIXME: Redownload the source if argon2 ever has source updates. At the time of writing it was last changed 5 years ago so this is probably not a high priority.
+# FIXME: Redownload the source (from https://github.com/P-H-C/phc-winner-argon2) if argon2 ever has source updates. At the time of writing it was last changed 5 years ago so this is probably not a high priority.
 SOURCES=(
     src/blake2/blake2b.c