From 09d4125ff164f5ca686d12ccb0790c35ce721a6b Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sat, 27 Jun 2015 01:15:23 +0200 Subject: Rename axolotlpp as olm to avoid confusion with Axolotl-the-spec and Axolotl-the-OWS-libraries at moxie's request --- javascript/axolotl_post.js | 248 --------------------------------------------- javascript/axolotl_pre.js | 1 - javascript/build.py | 6 +- javascript/demo.html | 10 +- javascript/olm_post.js | 248 +++++++++++++++++++++++++++++++++++++++++++++ javascript/olm_pre.js | 1 + 6 files changed, 257 insertions(+), 257 deletions(-) delete mode 100644 javascript/axolotl_post.js delete mode 100644 javascript/axolotl_pre.js create mode 100644 javascript/olm_post.js create mode 100644 javascript/olm_pre.js (limited to 'javascript') diff --git a/javascript/axolotl_post.js b/javascript/axolotl_post.js deleted file mode 100644 index 570c66f..0000000 --- a/javascript/axolotl_post.js +++ /dev/null @@ -1,248 +0,0 @@ -var runtime = Module['Runtime']; -var malloc = Module['_malloc']; -var free = Module['_free']; -var Pointer_stringify = Module['Pointer_stringify']; -var AXOLOTL_ERROR = Module['_axolotl_error'](); - -function stack(size_or_array) { - return Module['allocate'](size_or_array, 'i8', Module['ALLOC_STACK']); -} - -function array_from_string(string) { - return Module['intArrayFromString'](string, true); -} - -function random_stack(size) { - var ptr = stack(size); - var array = new Uint8Array(Module['HEAPU8'].buffer, ptr, size); - window.crypto.getRandomValues(array); - return ptr; -} - -function restore_stack(wrapped) { - return function() { - var sp = runtime.stackSave(); - try { - return wrapped.apply(this, arguments); - } finally { - runtime.stackRestore(sp); - } - } -} - -function Account() { - var size = Module['_axolotl_account_size'](); - this.buf = malloc(size); - this.ptr = Module['_axolotl_account'](this.buf); -} - -function account_method(wrapped) { - return function() { - var result = wrapped.apply(this, arguments); - if (result === AXOLOTL_ERROR) { - var message = Pointer_stringify( - Module['_axolotl_account_last_error'](arguments[0]) - ); - throw new Error("AXOLOTL." + message); - } - return result; - } -} - -Account.prototype['free'] = function() { - free(this.ptr); -} - -Account.prototype['create'] = restore_stack(function() { - var random_length = account_method( - Module['_axolotl_create_account_random_length'] - )(this.ptr); - var random = random_stack(random_length); - account_method(Module['_axolotl_create_account'])( - this.ptr, random, random_length - ); -}); - -Account.prototype['identity_keys'] = restore_stack(function() { - var keys_length = account_method( - Module['_axolotl_account_identity_keys_length'] - )(this.ptr); - var keys = stack(keys_length); - account_method(Module['_axolotl_account_identity_keys'])( - this.ptr, keys, keys_length - ); - return Pointer_stringify(keys, keys_length); -}); - -Account.prototype['one_time_keys'] = restore_stack(function() { - var keys_length = account_method( - Module['_axolotl_account_one_time_keys_length'] - )(this.ptr); - var keys = stack(keys_length); - account_method(Module['_axolotl_account_one_time_keys'])( - this.ptr, keys, keys_length - ); - return Pointer_stringify(keys, keys_length); -}); - -Account.prototype['pickle'] = restore_stack(function(key) { - var key_array = array_from_string(key); - var pickle_length = account_method( - Module['_axolotl_pickle_account_length'] - )(this.ptr); - var key_buffer = stack(key_array); - var pickle_buffer = stack(pickle_length); - account_method(Module['_axolotl_pickle_account'])( - this.ptr, key_buffer, key_array.length, pickle_buffer, pickle_length - ); - return Pointer_stringify(pickle_buffer, pickle_length); -}); - -Account.prototype['unpickle'] = restore_stack(function(key, pickle) { - var key_array = array_from_string(key); - var key_buffer = stack(key_array); - var pickle_array = array_from_string(pickle); - var pickle_buffer = stack(pickle_length); - account_method(Module['_axolotl_unpickle_account'])( - this.ptr, key_buffer, key_array.length, pickle_buffer, - pickle_array.length - ); -}); - -function Session() { - var size = Module['_axolotl_session_size'](); - this.buf = malloc(size); - this.ptr = Module['_axolotl_session'](this.buf); -} - -function session_method(wrapped) { - return function() { - var result = wrapped.apply(this, arguments); - if (result === AXOLOTL_ERROR) { - var message = Pointer_stringify( - Module['_axolotl_session_last_error'](arguments[0]) - ); - throw new Error("AXOLOTL." + message); - } - return result; - } -} - -Session.prototype['free'] = function() { - free(this.ptr); -} - -Session.prototype['pickle'] = restore_stack(function(key) { - var key_array = array_from_string(key); - var pickle_length = session_method( - Module['_axolotl_pickle_session_length'] - )(this.ptr); - var key_buffer = stack(key_array); - var pickle_buffer = stack(pickle_length); - session_method(Module['_axolotl_pickle_session'])( - this.ptr, key_buffer, key_array.length, pickle_buffer, pickle_length - ); - return Pointer_stringify(pickle_buffer, pickle_length); -}); - -Session.prototype['unpickle'] = restore_stack(function(key, pickle) { - var key_array = array_from_string(key); - var key_buffer = stack(key_array); - var pickle_array = array_from_string(pickle); - var pickle_buffer = stack(pickle_array); - session_method(Module['_axolotl_unpickle_session'])( - this.ptr, key_buffer, key_array.length, pickle_buffer, - pickle_array.length - ); -}); - -Session.prototype['create_outbound'] = restore_stack(function( - account, their_identity_key, their_one_time_key_id, their_one_time_key -) { - var random_length = session_method( - Module['_axolotl_create_outbound_session_random_length'] - )(this.ptr); - var random = random_stack(random_length); - var identity_key_array = array_from_string(their_identity_key); - var one_time_key_array = array_from_string(their_one_time_key); - var identity_key_buffer = stack(identity_key_array); - var one_time_key_buffer = stack(one_time_key_array); - session_method(Module['_axolotl_create_outbound_session'])( - this.ptr, account.ptr, - identity_key_buffer, identity_key_array.length, - their_one_time_key_id, - one_time_key_buffer, one_time_key_array.length, - random, random_length - ); -}); - -Session.prototype['create_inbound'] = restore_stack(function( - account, one_time_key_message -) { - var message_array = array_from_string(one_time_key_message); - var message_buffer = stack(message_array); - session_method(Module['_axolotl_create_inbound_session'])( - this.ptr, account.ptr, message_buffer, message_array.length - ); -}); - -Session.prototype['matches_inbound'] = restore_stack(function( - account, one_time_key_message -) { - var message_array = array_from_string(one_time_key_message); - var message_buffer = stack(message_array); - return session_method(Module['_axolotl_matches_inbound_session'])( - this.ptr, account.ptr, message_buffer, message_array.length - ) ? true : false; -}); - -Session.prototype['encrypt'] = restore_stack(function( - plaintext -) { - var random_length = session_method( - Module['_axolotl_encrypt_random_length'] - )(this.ptr); - var message_type = session_method( - Module['_axolotl_encrypt_message_type'] - )(this.ptr); - var plaintext_array = array_from_string(plaintext); - var message_length = session_method( - Module['_axolotl_encrypt_message_length'] - )(this.ptr, plaintext_array.length); - var random = random_stack(random_length); - var plaintext_buffer = stack(plaintext_array); - var message_buffer = stack(message_length); - session_method(Module['_axolotl_encrypt'])( - this.ptr, - plaintext_buffer, plaintext_array.length, - random, random_length, - message_buffer, message_length - ); - return { - "type": message_type, - "body": Pointer_stringify(message_buffer, message_length) - }; -}); - -Session.prototype['decrypt'] = restore_stack(function( - message_type, message -) { - var message_array = array_from_string(message); - var message_buffer = stack(message_array); - var max_plaintext_length = session_method( - Module['_axolotl_decrypt_max_plaintext_length'] - )(this.ptr, message_type, message_buffer, message_array.length); - // caculating the length destroys the input buffer. - // So we copy the array to a new buffer - var message_buffer = stack(message_array); - var plaintext_buffer = stack(max_plaintext_length); - var plaintext_length = session_method(Module["_axolotl_decrypt"])( - this.ptr, message_type, - message_buffer, message.length, - plaintext_buffer, max_plaintext_length - ); - return Pointer_stringify(plaintext_buffer, plaintext_length); -}); - -return {"Account": Account, "Session": Session}; -}(); diff --git a/javascript/axolotl_pre.js b/javascript/axolotl_pre.js deleted file mode 100644 index 69df923..0000000 --- a/javascript/axolotl_pre.js +++ /dev/null @@ -1 +0,0 @@ -Axolotl = function() { diff --git a/javascript/build.py b/javascript/build.py index 08436fd..68b7e45 100755 --- a/javascript/build.py +++ b/javascript/build.py @@ -28,8 +28,8 @@ if not os.path.exists("build"): os.mkdir("build") functions = set() -RE_FUNCTION=re.compile("(axolotl_[^( ]*)\\(") -with open("include/axolotl/axolotl.hh") as header: +RE_FUNCTION=re.compile("(olm_[^( ]*)\\(") +with open("include/olm/olm.hh") as header: for line in header: match = RE_FUNCTION.search(line) if match: @@ -60,7 +60,7 @@ compile_args += ("--pre-js", pre_js) compile_args += ("--post-js", post_js) compile_args += ("-s", "EXPORTED_FUNCTIONS=@" + exported_functions) -library = "build/axolotl.js" +library = "build/olm.js" def run(args): print args diff --git a/javascript/demo.html b/javascript/demo.html index ce4bfed..cace119 100644 --- a/javascript/demo.html +++ b/javascript/demo.html @@ -1,6 +1,6 @@ - +