Merge pull request #198 from bas-d/master

Use UTF8String instead of Pointer_stringify
jedisct1 · May 21, 2019 · b9213d1 · b9213d1
2 parents 943ff95 + 5090bbc
commit b9213d1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/wrapper/build-wrappers.js b/wrapper/build-wrappers.js
@@ -104,7 +104,7 @@ function exportConstants(constSymbols) {
   exportsCode += "var constants_str = [" + keys.sort().join(", ") + "];\n";
   exportsCode += "for (var i = 0; i < constants_str.length; i++) {\n";
   exportsCode += '  var raw = libsodium["_" + constants_str[i].toLowerCase()];\n';
-  exportsCode += '  if (typeof raw === "function") exports[constants_str[i]] = libsodium.Pointer_stringify(raw());\n';
+  exportsCode += '  if (typeof raw === "function") exports[constants_str[i]] = libsodium.UTF8ToString(raw());\n';
   exportsCode += "}\n";
 }
 

diff --git a/wrapper/symbols/crypto_pwhash_scryptsalsa208sha256_str.json b/wrapper/symbols/crypto_pwhash_scryptsalsa208sha256_str.json
@@ -24,5 +24,5 @@
         ],
         "target": "libsodium._crypto_pwhash_scryptsalsa208sha256_str(hashed_password_address, password_address, password_length, 0, opsLimit, 0, memLimit) | 0",
         "assert_retval": [{"condition": "=== 0", "or_else_throw": "invalid usage"}],
-        "return": "libsodium.Pointer_stringify(hashed_password_address)"
+        "return": "libsodium.UTF8ToString(hashed_password_address)"
 }
diff --git a/wrapper/symbols/crypto_pwhash_str.json b/wrapper/symbols/crypto_pwhash_str.json
@@ -24,5 +24,5 @@
         ],
         "target": "libsodium._crypto_pwhash_str(hashed_password_address, password_address, password_length, 0, opsLimit, 0, memLimit) | 0",
         "assert_retval": [{"condition": "=== 0", "or_else_throw": "invalid usage"}],
-        "return": "libsodium.Pointer_stringify(hashed_password_address)"
+        "return": "libsodium.UTF8ToString(hashed_password_address)"
 }
diff --git a/wrapper/symbols/sodium_version_string.json b/wrapper/symbols/sodium_version_string.json
@@ -6,5 +6,5 @@
         "inputs": [],
         "outputs": [],
         "target": "var version = libsodium._sodium_version_string()",
-        "return": "libsodium.Pointer_stringify(version)"
+        "return": "libsodium.UTF8ToString(version)"
 }
diff --git a/wrapper/wrap-template.js b/wrapper/wrap-template.js
@@ -30,7 +30,11 @@
           return;
         }
       }
-      catch (_) {}
+      catch (err) { 
+        if (libsodium.useBackupModule == null) {
+          throw new Error("Both wasm and asm failed to load" + err)
+        }
+      }
 
       libsodium.useBackupModule();
       libsodiumInit();