Use curve functions from native module

js/background.js

@@ -163,8 +163,6 @@
   window.owsDesktopApp = {};
   window.document.title = window.getTitle();
 
-  // start a background worker for ecc
-  textsecure.startWorker('js/libsignal-protocol-worker.js');
   Whisper.KeyChangeListener.init(textsecure.storage.protocol);
   textsecure.storage.protocol.on('removePreKey', () => {
     getAccountManager().refreshPreKeys();

js/curve/curve25519_wrapper.js

@@ -1,158 +0,0 @@
-/* vim: ts=4:sw=4:expandtab */
-var Internal = global.Internal || {};
-
-(function() {
-  'use strict';
-
-  // Insert some bytes into the emscripten memory and return a pointer
-  function _allocate(bytes) {
-    var address = Module._malloc(bytes.length);
-    Module.HEAPU8.set(bytes, address);
-
-    return address;
-  }
-
-  function _readBytes(address, length, array) {
-    array.set(Module.HEAPU8.subarray(address, address + length));
-  }
-
-  var basepoint = new Uint8Array(32);
-  basepoint[0] = 9;
-
-  Internal.curve25519 = {
-    keyPair: function(privKey) {
-      var priv = new Uint8Array(privKey);
-      priv[0] &= 248;
-      priv[31] &= 127;
-      priv[31] |= 64;
-
-      // Where to store the result
-      var publicKey_ptr = Module._malloc(32);
-
-      // Get a pointer to the private key
-      var privateKey_ptr = _allocate(priv);
-
-      // The basepoint for generating public keys
-      var basepoint_ptr = _allocate(basepoint);
-
-      // The return value is just 0, the operation is done in place
-      var err = Module._curve25519_donna(
-        publicKey_ptr,
-        privateKey_ptr,
-        basepoint_ptr
-      );
-
-      var res = new Uint8Array(32);
-      _readBytes(publicKey_ptr, 32, res);
-
-      Module._free(publicKey_ptr);
-      Module._free(privateKey_ptr);
-      Module._free(basepoint_ptr);
-
-      return { pubKey: res.buffer, privKey: priv.buffer };
-    },
-    sharedSecret: function(pubKey, privKey) {
-      // Where to store the result
-      var sharedKey_ptr = Module._malloc(32);
-
-      // Get a pointer to our private key
-      var privateKey_ptr = _allocate(new Uint8Array(privKey));
-
-      // Get a pointer to their public key, the basepoint when you're
-      // generating a shared secret
-      var basepoint_ptr = _allocate(new Uint8Array(pubKey));
-
-      // Return value is 0 here too of course
-      var err = Module._curve25519_donna(
-        sharedKey_ptr,
-        privateKey_ptr,
-        basepoint_ptr
-      );
-
-      var res = new Uint8Array(32);
-      _readBytes(sharedKey_ptr, 32, res);
-
-      Module._free(sharedKey_ptr);
-      Module._free(privateKey_ptr);
-      Module._free(basepoint_ptr);
-
-      return res.buffer;
-    },
-    sign: function(privKey, message) {
-      // Where to store the result
-      var signature_ptr = Module._malloc(64);
-
-      // Get a pointer to our private key
-      var privateKey_ptr = _allocate(new Uint8Array(privKey));
-
-      // Get a pointer to the message
-      var message_ptr = _allocate(new Uint8Array(message));
-
-      var err = Module._curve25519_sign(
-        signature_ptr,
-        privateKey_ptr,
-        message_ptr,
-        message.byteLength
-      );
-
-      var res = new Uint8Array(64);
-      _readBytes(signature_ptr, 64, res);
-
-      Module._free(signature_ptr);
-      Module._free(privateKey_ptr);
-      Module._free(message_ptr);
-
-      return res.buffer;
-    },
-    verify: function(pubKey, message, sig) {
-      // Get a pointer to their public key
-      var publicKey_ptr = _allocate(new Uint8Array(pubKey));
-
-      // Get a pointer to the signature
-      var signature_ptr = _allocate(new Uint8Array(sig));
-
-      // Get a pointer to the message
-      var message_ptr = _allocate(new Uint8Array(message));
-
-      var res = Module._curve25519_verify(
-        signature_ptr,
-        publicKey_ptr,
-        message_ptr,
-        message.byteLength
-      );
-
-      Module._free(publicKey_ptr);
-      Module._free(signature_ptr);
-      Module._free(message_ptr);
-
-      return res !== 0;
-    },
-  };
-
-  Internal.curve25519_async = {
-    keyPair: function(privKey) {
-      return new Promise(function(resolve) {
-        resolve(Internal.curve25519.keyPair(privKey));
-      });
-    },
-    sharedSecret: function(pubKey, privKey) {
-      return new Promise(function(resolve) {
-        resolve(Internal.curve25519.sharedSecret(pubKey, privKey));
-      });
-    },
-    sign: function(privKey, message) {
-      return new Promise(function(resolve) {
-        resolve(Internal.curve25519.sign(privKey, message));
-      });
-    },
-    verify: function(pubKey, message, sig) {
-      return new Promise(function(resolve, reject) {
-        if (Internal.curve25519.verify(pubKey, message, sig)) {
-          reject(new Error('Invalid signature'));
-        } else {
-          resolve();
-        }
-      });
-    },
-  };
-})();

js/models/conversations.js

@@ -2094,11 +2094,6 @@
           const messageId = message.id;
           const isExpiringMessage = Message.hasExpiration(messageJSON);
 
-          window.log.info('Add notification', {
-            conversationId: this.idForLogging(),
-            isExpiringMessage,
-            messageSentAt,
-          });
           Whisper.Notifications.add({
             conversationId,
             iconUrl,

js/notifications.js

@@ -58,7 +58,6 @@
       const isAudioNotificationEnabled =
         storage.get('audio-notification') || false;
       const isAudioNotificationSupported = Settings.isAudioNotificationSupported();
-      const isNotificationGroupingSupported = Settings.isNotificationGroupingSupported();
       const numNotifications = this.length;
       const userSetting = this.getUserSetting();
 
@@ -71,13 +70,6 @@
         userSetting,
       });
 
-      window.log.info(
-        'Update notifications:',
-        Object.assign({}, status, {
-          isNotificationGroupingSupported,
-        })
-      );
-
       if (status.type !== 'ok') {
         if (status.shouldClearNotifications) {
           this.reset([]);