@wireapp/core-crypto 0.5.0 → 0.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wireapp/core-crypto",
-    "version": "0.5.0",
+    "version": "0.5.2",
     "description": "CoreCrypto bindings for the Web",
     "type": "module",
     "module": "platforms/web/corecrypto.js",

package/platforms/web/corecrypto.d.ts

@@ -1,35 +1,35 @@
 /**
 * see [core_crypto::prelude::CiphersuiteName]
 */
-export enum Ciphersuite {
+export declare enum Ciphersuite {
 	/**
 	* DH KEM x25519 | AES-GCM 128 | SHA2-256 | Ed25519
 	*/
-	MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519,
+	MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519 = 1,
 	/**
 	* DH KEM P256 | AES-GCM 128 | SHA2-256 | EcDSA P256
 	*/
-	MLS_128_DHKEMP256_AES128GCM_SHA256_P256,
+	MLS_128_DHKEMP256_AES128GCM_SHA256_P256 = 2,
 	/**
 	* DH KEM x25519 | Chacha20Poly1305 | SHA2-256 | Ed25519
 	*/
-	MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519,
+	MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519 = 3,
 	/**
 	* DH KEM x448 | AES-GCM 256 | SHA2-512 | Ed448
 	*/
-	MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448,
+	MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448 = 4,
 	/**
 	* DH KEM P521 | AES-GCM 256 | SHA2-512 | EcDSA P521
 	*/
-	MLS_256_DHKEMP521_AES256GCM_SHA512_P521,
+	MLS_256_DHKEMP521_AES256GCM_SHA512_P521 = 5,
 	/**
 	* DH KEM x448 | Chacha20Poly1305 | SHA2-512 | Ed448
 	*/
-	MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448,
+	MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448 = 6,
 	/**
 	* DH KEM P384 | AES-GCM 256 | SHA2-384 | EcDSA P384
 	*/
-	MLS_256_DHKEMP384_AES256GCM_SHA384_P384
+	MLS_256_DHKEMP384_AES256GCM_SHA384_P384 = 7
 }
 /**
  * Configuration object for new conversations
@@ -189,7 +189,10 @@ export interface DecryptedMessage {
 	 */
 	message?: Uint8Array;
 	/**
-	 * List of proposals that were retrieved from the decrypted message, in addition to the pending local proposals
+	 * Only when decrypted message is a commit, CoreCrypto will renew local proposal which could not make it in the commit.
+	 * This will contain either:
+	 *   * local pending proposal not in the accepted commit
+	 *   * If there is a pending commit, its proposals which are not in the accepted commit
 	 */
 	proposals: ProposalBundle[];
 	/**

package/platforms/web/corecrypto.js

@@ -36,15 +36,6 @@ function getObject(idx) { return heap[idx]; }
 
 let heap_next = heap.length;
 
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-
-    heap[idx] = obj;
-    return idx;
-}
-
 function dropObject(idx) {
     if (idx < 36) return;
     heap[idx] = heap_next;
@@ -57,6 +48,15 @@ function takeObject(idx) {
     return ret;
 }
 
+function addHeapObject(obj) {
+    if (heap_next === heap.length) heap.push(heap.length + 1);
+    const idx = heap_next;
+    heap_next = heap[idx];
+
+    heap[idx] = obj;
+    return idx;
+}
+
 const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 
 cachedTextDecoder.decode();
@@ -243,7 +243,7 @@ function makeMutClosure(arg0, arg1, dtor, f) {
 function __wbg_adapter_40(arg0, arg1, arg2) {
     try {
         const retptr = wasm$1.__wbindgen_add_to_stack_pointer(-16);
-        wasm$1._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h9a15da7f71febc51(retptr, arg0, arg1, addHeapObject(arg2));
+        wasm$1._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h9a17b153655eda08(retptr, arg0, arg1, addHeapObject(arg2));
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         if (r1) {
@@ -255,7 +255,7 @@ function __wbg_adapter_40(arg0, arg1, arg2) {
 }
 
 function __wbg_adapter_43(arg0, arg1, arg2) {
-    wasm$1._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hef97d77a2199c9e8(arg0, arg1, addHeapObject(arg2));
+    wasm$1._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hd0c9431a12465019(arg0, arg1, addHeapObject(arg2));
 }
 
 /**
@@ -318,14 +318,14 @@ function handleError(f, args) {
 function getArrayU8FromWasm0(ptr, len) {
     return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
 }
-function __wbg_adapter_176(arg0, arg1, arg2, arg3) {
-    wasm$1.wasm_bindgen__convert__closures__invoke2_mut__hc9af8652362195d0(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wbg_adapter_175(arg0, arg1, arg2, arg3) {
+    wasm$1.wasm_bindgen__convert__closures__invoke2_mut__h4f9148fafb82166d(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
 /**
 * see [core_crypto::prelude::CiphersuiteName]
 */
-const Ciphersuite = Object.freeze({
+const Ciphersuite$1 = Object.freeze({
 /**
 * DH KEM x25519 | AES-GCM 128 | SHA2-256 | Ed25519
 */
@@ -968,13 +968,6 @@ class CoreCryptoWasmCallbacks {
 */
 class DecryptedMessage {
 
-    static __wrap(ptr) {
-        const obj = Object.create(DecryptedMessage.prototype);
-        obj.ptr = ptr;
-
-        return obj;
-    }
-
     __destroy_into_raw() {
         const ptr = this.ptr;
         this.ptr = 0;
@@ -1021,6 +1014,13 @@ class DecryptedMessage {
             wasm$1.__wbindgen_add_to_stack_pointer(16);
         }
     }
+    /**
+    * @returns {Uint8Array | undefined}
+    */
+    get sender_client_id() {
+        const ret = wasm$1.decryptedmessage_sender_client_id(this.ptr);
+        return takeObject(ret);
+    }
 }
 /**
 * see [core_crypto::prelude::ConversationMember]
@@ -1224,22 +1224,18 @@ async function load(module, imports) {
 function getImports() {
     const imports = {};
     imports.wbg = {};
+    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
+        takeObject(arg0);
+    };
     imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
         const ret = getObject(arg0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
-        takeObject(arg0);
-    };
     imports.wbg.__wbindgen_is_object = function(arg0) {
         const val = getObject(arg0);
         const ret = typeof(val) === 'object' && val !== null;
         return ret;
     };
-    imports.wbg.__wbg_new_0b9bfdd97583284e = function() {
-        const ret = new Object();
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_error_new = function(arg0, arg1) {
         const ret = new Error(getStringFromWasm0(arg0, arg1));
         return addHeapObject(ret);
@@ -1252,14 +1248,28 @@ function getImports() {
         const ret = getObject(arg0).getTime();
         return ret;
     };
+    imports.wbg.__wbg_set_c943d600fa71e4dd = function(arg0, arg1, arg2) {
+        getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
+    };
     imports.wbg.__wbg_new_8c3f0052272a457a = function(arg0) {
         const ret = new Uint8Array(getObject(arg0));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_corecrypto_new = function(arg0) {
-        const ret = CoreCrypto$1.__wrap(arg0);
+    imports.wbg.__wbg_new_0b9bfdd97583284e = function() {
+        const ret = new Object();
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_new_1d9a920c6bfc44a8 = function() {
+        const ret = new Array();
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_push_740e4b286702d964 = function(arg0, arg1) {
+        const ret = getObject(arg0).push(getObject(arg1));
+        return ret;
+    };
+    imports.wbg.__wbg_set_a68214f35c417fa9 = function(arg0, arg1, arg2) {
+        getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
+    };
     imports.wbg.__wbindgen_number_new = function(arg0) {
         const ret = arg0;
         return addHeapObject(ret);
@@ -1268,18 +1278,10 @@ function getImports() {
         const ret = BigInt.asUintN(64, arg0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_decryptedmessage_new = function(arg0) {
-        const ret = DecryptedMessage.__wrap(arg0);
-        return addHeapObject(ret);
-    };
-    imports.wbg.__wbg_new_1d9a920c6bfc44a8 = function() {
-        const ret = new Array();
+    imports.wbg.__wbg_corecrypto_new = function(arg0) {
+        const ret = CoreCrypto$1.__wrap(arg0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_push_740e4b286702d964 = function(arg0, arg1) {
-        const ret = getObject(arg0).push(getObject(arg1));
-        return ret;
-    };
     imports.wbg.__wbindgen_boolean_get = function(arg0) {
         const v = getObject(arg0);
         const ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2;
@@ -1292,7 +1294,7 @@ function getImports() {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wbg_adapter_176(a, state0.b, arg0, arg1);
+                    return __wbg_adapter_175(a, state0.b, arg0, arg1);
                 } finally {
                     state0.a = a;
                 }
@@ -1307,9 +1309,6 @@ function getImports() {
         const ret = ProposalBundle.__wrap(arg0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_set_c943d600fa71e4dd = function(arg0, arg1, arg2) {
-        getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
-    };
     imports.wbg.__wbg_get_2268d91a19a98b92 = function(arg0, arg1) {
         const ret = getObject(arg0)[takeObject(arg1)];
         return addHeapObject(ret);
@@ -1399,9 +1398,6 @@ function getImports() {
         const ret = getObject(arg0).transaction(getObject(arg1), takeObject(arg2));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_set_a68214f35c417fa9 = function(arg0, arg1, arg2) {
-        getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
-    };
     imports.wbg.__wbindgen_cb_drop = function(arg0) {
         const obj = takeObject(arg0).original;
         if (obj.cnt-- == 1) {
@@ -1411,33 +1407,33 @@ function getImports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbg_openCursor_e036069f0e326708 = function() { return handleError(function (arg0, arg1) {
-        const ret = getObject(arg0).openCursor(getObject(arg1));
-        return addHeapObject(ret);
+    imports.wbg.__wbg_commit_73ecc83e291e455b = function() { return handleError(function (arg0) {
+        getObject(arg0).commit();
     }, arguments) };
-    imports.wbg.__wbg_openCursor_f055654a98eeab7f = function() { return handleError(function (arg0) {
-        const ret = getObject(arg0).openCursor();
+    imports.wbg.__wbg_setoncomplete_3e57a8cec8327f66 = function(arg0, arg1) {
+        getObject(arg0).oncomplete = getObject(arg1);
+    };
+    imports.wbg.__wbg_setonerror_00051c0213f27b2c = function(arg0, arg1) {
+        getObject(arg0).onerror = getObject(arg1);
+    };
+    imports.wbg.__wbg_get_6285bf458a1ee758 = function() { return handleError(function (arg0, arg1) {
+        const ret = getObject(arg0).get(getObject(arg1));
         return addHeapObject(ret);
     }, arguments) };
     imports.wbg.__wbg_setonsuccess_5f71593bc51653a3 = function(arg0, arg1) {
         getObject(arg0).onsuccess = getObject(arg1);
     };
-    imports.wbg.__wbg_delete_8abedd1043b4105d = function() { return handleError(function (arg0, arg1) {
-        const ret = getObject(arg0).delete(getObject(arg1));
-        return addHeapObject(ret);
-    }, arguments) };
     imports.wbg.__wbg_setonerror_d5771cc5bf9ea74c = function(arg0, arg1) {
         getObject(arg0).onerror = getObject(arg1);
     };
-    imports.wbg.__wbg_commit_73ecc83e291e455b = function() { return handleError(function (arg0) {
-        getObject(arg0).commit();
+    imports.wbg.__wbg_openCursor_e036069f0e326708 = function() { return handleError(function (arg0, arg1) {
+        const ret = getObject(arg0).openCursor(getObject(arg1));
+        return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbg_openCursor_f055654a98eeab7f = function() { return handleError(function (arg0) {
+        const ret = getObject(arg0).openCursor();
+        return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_setoncomplete_3e57a8cec8327f66 = function(arg0, arg1) {
-        getObject(arg0).oncomplete = getObject(arg1);
-    };
-    imports.wbg.__wbg_setonerror_00051c0213f27b2c = function(arg0, arg1) {
-        getObject(arg0).onerror = getObject(arg1);
-    };
     imports.wbg.__wbg_put_84e7fc93eee27b28 = function() { return handleError(function (arg0, arg1, arg2) {
         const ret = getObject(arg0).put(getObject(arg1), getObject(arg2));
         return addHeapObject(ret);
@@ -1446,16 +1442,8 @@ function getImports() {
         const ret = getObject(arg0).put(getObject(arg1));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_get_3c3e41997e95952c = function() { return handleError(function (arg0, arg1) {
-        const ret = getObject(arg0).get(getObject(arg1));
-        return addHeapObject(ret);
-    }, arguments) };
-    imports.wbg.__wbg_openCursor_2262d905dc81d11b = function() { return handleError(function (arg0) {
-        const ret = getObject(arg0).openCursor();
-        return addHeapObject(ret);
-    }, arguments) };
-    imports.wbg.__wbg_openCursor_e1660ef8b1f4662f = function() { return handleError(function (arg0, arg1) {
-        const ret = getObject(arg0).openCursor(getObject(arg1));
+    imports.wbg.__wbg_delete_8abedd1043b4105d = function() { return handleError(function (arg0, arg1) {
+        const ret = getObject(arg0).delete(getObject(arg1));
         return addHeapObject(ret);
     }, arguments) };
     imports.wbg.__wbg_count_b0e88953a0ea909c = function() { return handleError(function (arg0) {
@@ -1466,10 +1454,18 @@ function getImports() {
         const ret = getObject(arg0).count(getObject(arg1));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_get_6285bf458a1ee758 = function() { return handleError(function (arg0, arg1) {
+    imports.wbg.__wbg_get_3c3e41997e95952c = function() { return handleError(function (arg0, arg1) {
         const ret = getObject(arg0).get(getObject(arg1));
         return addHeapObject(ret);
     }, arguments) };
+    imports.wbg.__wbg_openCursor_2262d905dc81d11b = function() { return handleError(function (arg0) {
+        const ret = getObject(arg0).openCursor();
+        return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbg_openCursor_e1660ef8b1f4662f = function() { return handleError(function (arg0, arg1) {
+        const ret = getObject(arg0).openCursor(getObject(arg1));
+        return addHeapObject(ret);
+    }, arguments) };
     imports.wbg.__wbg_close_5a04b9ce11dade22 = function(arg0) {
         getObject(arg0).close();
     };
@@ -1593,10 +1589,6 @@ function getImports() {
         const ret = getObject(arg0).target;
         return isLikeNone(ret) ? 0 : addHeapObject(ret);
     };
-    imports.wbg.__wbg_error_aacf5ac191e54ed0 = function() { return handleError(function (arg0) {
-        const ret = getObject(arg0).error;
-        return isLikeNone(ret) ? 0 : addHeapObject(ret);
-    }, arguments) };
     imports.wbg.__wbg_objectStoreNames_8c06c40d2b05141c = function(arg0) {
         const ret = getObject(arg0).objectStoreNames;
         return addHeapObject(ret);
@@ -1631,6 +1623,10 @@ function getImports() {
     imports.wbg.__wbg_deleteObjectStore_1b698c5fd1bc077d = function() { return handleError(function (arg0, arg1, arg2) {
         getObject(arg0).deleteObjectStore(getStringFromWasm0(arg1, arg2));
     }, arguments) };
+    imports.wbg.__wbg_error_aacf5ac191e54ed0 = function() { return handleError(function (arg0) {
+        const ret = getObject(arg0).error;
+        return isLikeNone(ret) ? 0 : addHeapObject(ret);
+    }, arguments) };
     imports.wbg.__wbindgen_is_falsy = function(arg0) {
         const ret = !getObject(arg0);
         return ret;
@@ -1739,11 +1735,11 @@ function getImports() {
         const ret = getObject(arg0).objectStore(getStringFromWasm0(arg1, arg2));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbindgen_closure_wrapper2438 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper2456 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 106, __wbg_adapter_40);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper4416 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper4423 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 114, __wbg_adapter_43);
         return addHeapObject(ret);
     };
@@ -1793,7 +1789,7 @@ async function init(input) {
 var exports = /*#__PURE__*/Object.freeze({
     __proto__: null,
     version: version,
-    Ciphersuite: Ciphersuite,
+    Ciphersuite: Ciphersuite$1,
     CommitBundle: CommitBundle,
     ConversationConfiguration: ConversationConfiguration,
     CoreCrypto: CoreCrypto$1,
@@ -1810,7 +1806,7 @@ var exports = /*#__PURE__*/Object.freeze({
 var wasm = async (opt = {}) => {
                 let {importHook, serverPath} = opt;
 
-                let path = "assets/core_crypto_ffi-9e5ae25f.wasm";
+                let path = "assets/core_crypto_ffi-a1279c23.wasm";
 
                 if (serverPath != null) {
                     path = serverPath + /[^\/\\]*$/.exec(path)[0];
@@ -1827,6 +1823,40 @@ var wasm = async (opt = {}) => {
 // Wire
 // Copyright (C) 2022 Wire Swiss GmbH
 var _a, _CoreCrypto_module, _CoreCrypto_cc;
+/**
+* see [core_crypto::prelude::CiphersuiteName]
+*/
+var Ciphersuite;
+(function (Ciphersuite) {
+    /**
+    * DH KEM x25519 | AES-GCM 128 | SHA2-256 | Ed25519
+    */
+    Ciphersuite[Ciphersuite["MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519"] = 1] = "MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519";
+    /**
+    * DH KEM P256 | AES-GCM 128 | SHA2-256 | EcDSA P256
+    */
+    Ciphersuite[Ciphersuite["MLS_128_DHKEMP256_AES128GCM_SHA256_P256"] = 2] = "MLS_128_DHKEMP256_AES128GCM_SHA256_P256";
+    /**
+    * DH KEM x25519 | Chacha20Poly1305 | SHA2-256 | Ed25519
+    */
+    Ciphersuite[Ciphersuite["MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519"] = 3] = "MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519";
+    /**
+    * DH KEM x448 | AES-GCM 256 | SHA2-512 | Ed448
+    */
+    Ciphersuite[Ciphersuite["MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448"] = 4] = "MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448";
+    /**
+    * DH KEM P521 | AES-GCM 256 | SHA2-512 | EcDSA P521
+    */
+    Ciphersuite[Ciphersuite["MLS_256_DHKEMP521_AES256GCM_SHA512_P521"] = 5] = "MLS_256_DHKEMP521_AES256GCM_SHA512_P521";
+    /**
+    * DH KEM x448 | Chacha20Poly1305 | SHA2-512 | Ed448
+    */
+    Ciphersuite[Ciphersuite["MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448"] = 6] = "MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448";
+    /**
+    * DH KEM P384 | AES-GCM 256 | SHA2-384 | EcDSA P384
+    */
+    Ciphersuite[Ciphersuite["MLS_256_DHKEMP384_AES256GCM_SHA384_P384"] = 7] = "MLS_256_DHKEMP384_AES256GCM_SHA384_P384";
+})(Ciphersuite || (Ciphersuite = {}));
 /**
  * MLS Proposal type
  */
@@ -2011,6 +2041,7 @@ class CoreCrypto {
             message: ffiDecryptedMessage.message,
             proposals: ffiDecryptedMessage.proposals,
             isActive: ffiDecryptedMessage.is_active,
+            senderClientId: ffiDecryptedMessage.sender_client_id,
             commitDelay,
         };
         return ret;
@@ -2134,12 +2165,11 @@ class CoreCrypto {
      */
     async commitPendingProposals(conversationId) {
         const ffiCommitBundle = await __classPrivateFieldGet(this, _CoreCrypto_cc, "f").commit_pending_proposals(conversationId);
-        const ret = {
+        return ffiCommitBundle ? {
             welcome: ffiCommitBundle.welcome,
             commit: ffiCommitBundle.commit,
             publicGroupState: ffiCommitBundle.public_group_state,
-        };
-        return ret;
+        } : undefined;
     }
     /**
      * Adds new clients to a conversation, assuming the current client has the right to add new clients to the conversation.
@@ -2374,4 +2404,4 @@ _a = CoreCrypto, _CoreCrypto_cc = new WeakMap();
 /** @hidden */
 _CoreCrypto_module = { value: void 0 };
 
-export { CoreCrypto, ExternalProposalType, ProposalType };
+export { Ciphersuite, CoreCrypto, ExternalProposalType, ProposalType };