aboutsummaryrefslogtreecommitdiff
path: root/javascript/olm_pre.js
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2018-10-12 17:02:51 -0400
committerHubert Chathi <hubert@uhoreg.ca>2018-10-12 17:02:51 -0400
commit5cf074d3372f1e189fe410a075013adefabb1aa5 (patch)
treea72a96fafab69e62b5083cbe1933b4e34e9a72d5 /javascript/olm_pre.js
parentac071d9c0d69e4330a06f171e3bddc713ecd97d6 (diff)
parentaf86a9a8b899eeb3c1c464cb0c54218acd788fa6 (diff)
Merge branch 'master' into poljar
Diffstat (limited to 'javascript/olm_pre.js')
-rw-r--r--javascript/olm_pre.js44
1 files changed, 30 insertions, 14 deletions
diff --git a/javascript/olm_pre.js b/javascript/olm_pre.js
index ae7aba5..314d7da 100644
--- a/javascript/olm_pre.js
+++ b/javascript/olm_pre.js
@@ -1,10 +1,7 @@
-var olm_exports = {};
var get_random_values;
-var process; // Shadow the process object so that emscripten won't get
- // confused by browserify
if (typeof(window) !== 'undefined') {
- // We've in a browser (directly, via browserify, or via webpack).
+ // We're in a browser (directly, via browserify, or via webpack).
get_random_values = function(buf) {
window.crypto.getRandomValues(buf);
};
@@ -12,7 +9,9 @@ if (typeof(window) !== 'undefined') {
// We're running in node.
var nodeCrypto = require("crypto");
get_random_values = function(buf) {
- var bytes = nodeCrypto.randomBytes(buf.length);
+ // [''] syntax needed here rather than '.' to prevent
+ // closure compiler from mangling the import(!)
+ var bytes = nodeCrypto['randomBytes'](buf.length);
buf.set(bytes);
};
process = global["process"];
@@ -20,14 +19,31 @@ if (typeof(window) !== 'undefined') {
throw new Error("Cannot find global to attach library to");
}
-(function() {
- /* applications should define OLM_OPTIONS in the environment to override
- * emscripten module settings */
- var Module = {};
- if (typeof(OLM_OPTIONS) !== 'undefined') {
- for (var key in OLM_OPTIONS) {
- if (OLM_OPTIONS.hasOwnProperty(key)) {
- Module[key] = OLM_OPTIONS[key];
- }
+/* applications should define OLM_OPTIONS in the environment to override
+ * emscripten module settings
+ */
+if (typeof(OLM_OPTIONS) !== 'undefined') {
+ for (var olm_option_key in OLM_OPTIONS) {
+ if (OLM_OPTIONS.hasOwnProperty(olm_option_key)) {
+ Module[olm_option_key] = OLM_OPTIONS[olm_option_key];
}
}
+}
+
+/* The 'length' argument to Pointer_stringify doesn't work if the input
+ * includes characters >= 128, which makes Pointer_stringify unreliable. We
+ * could use it on strings which are known to be ascii, but that seems
+ * dangerous. Instead we add a NULL character to all of our strings and just
+ * use UTF8ToString.
+ */
+var NULL_BYTE_PADDING_LENGTH = 1;
+
+Module['onRuntimeInitialized'] = function() {
+ OLM_ERROR = Module['_olm_error']();
+ olm_exports["PRIVATE_KEY_LENGTH"] = Module['_olm_pk_private_key_length']();
+ if (onInitSuccess) onInitSuccess();
+};
+
+Module['onAbort'] = function(err) {
+ if (onInitFail) onInitFail(err);
+};