fix #15: disabled threads in emscripten

antelle · Dec 3, 2018 · 4b89503 · 4b89503
1 parent 36dccc8
commit 4b89503
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ It's hard to measure WebAssembly code size because the project is not finished y
 
 ## Is Argon2 modified?
 
-No, now it's fully compatible with WASM.
+The only change is disabling threading support.
 
 ## Difficulties
 

diff --git a/argon2/src/core.c b/argon2/src/core.c
@@ -322,12 +322,15 @@ static int fill_memory_blocks_mt(argon2_instance_t *instance) {
                     instance; /* preparing the thread input */
                 memcpy(&(thr_data[l].pos), &position,
                        sizeof(argon2_position_t));
+#ifdef EMSCRIPTEN
+                fill_segment(instance, position);
+#else
                 if (argon2_thread_create(&thread[l], &fill_segment_thr,
                                          (void *)&thr_data[l])) {
                     rc = ARGON2_THREAD_FAIL;
                     goto fail;
                 }
-
+#endif
                 /* fill_segment(instance, position); */
                 /*Non-thread equivalent of the lines above */
             }

diff --git a/dist/argon2-asm.min.js b/dist/argon2-asm.min.js
diff --git a/dist/argon2.js b/dist/argon2.js
diff --git a/dist/argon2.min.js b/dist/argon2.min.js
diff --git a/dist/argon2.wasm b/dist/argon2.wasm
diff --git a/docs/dist/argon2-asm.min.js b/docs/dist/argon2-asm.min.js
diff --git a/docs/dist/argon2.js b/docs/dist/argon2.js
diff --git a/docs/dist/argon2.wasm b/docs/dist/argon2.wasm
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "argon2-browser",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Argon2 library compiled for browser runtime",
   "main": "lib/argon2.js",
   "directories": {