diff --git a/libsodium b/libsodium index 758dbe79..14206b7e 160000 --- a/libsodium +++ b/libsodium @@ -1 +1 @@ -Subproject commit 758dbe791e23c7a61419fdb7fd72d5002f6d2c4e +Subproject commit 14206b7e694b2242594954282ee24e0905cbac9e diff --git a/wrapper/libsodium-post.js b/wrapper/libsodium-post.js index 2420b840..09f8e22b 100644 --- a/wrapper/libsodium-post.js +++ b/wrapper/libsodium-post.js @@ -1,5 +1,5 @@ ENVIRONMENT_IS_NODE && !process.removeAllListeners("uncaughtException"); - return ModulePromise; + return Module; } if (typeof define === 'function' && define.amd) { diff --git a/wrapper/wrap-template.js b/wrapper/wrap-template.js index 4081d064..8e1cc74f 100644 --- a/wrapper/wrap-template.js +++ b/wrapper/wrap-template.js @@ -1,22 +1,18 @@ (function(root) { -function expose_wrappers(exports, libsodiumPromise) { +function expose_wrappers(exports, libsodiumModule) { "use strict"; var output_format = "uint8array"; var libsodium; - - libsodiumPromise = libsodiumPromise.then(function (libsodiumModule) { + var ready = libsodiumModule.ready.then(function () { libsodium = libsodiumModule; if (libsodium._sodium_init() !== 0) { throw new Error("libsodium was not correctly initialized."); } - return libsodium; }); - var ready = libsodiumPromise.then(function () {}); - // List of functions and constants defined in the wrapped libsodium function symbols() { return Object.keys(exports).sort(); @@ -469,7 +465,7 @@ function expose_wrappers(exports, libsodiumPromise) { exports.from_string = from_string; exports.increment = increment; exports.is_zero = is_zero; - exports.libsodium = libsodiumPromise; + exports.libsodium = libsodiumModule; exports.memcmp = memcmp; exports.memzero = memzero; exports.output_formats = output_formats;