@wireapp/core-crypto 0.6.0-pre.4 → 0.6.0-pre.5

package/README.md

@@ -101,7 +101,7 @@ cargo make wasm
 
 ### Versioning
 
-* Run `cargo xtask bump [major|minor|patch|rc|pre]`
+* Run `cargo xtask release bump [major|minor|patch|rc|pre]`
 * Update the internal dependencies of the updated crates to use the new version
 * Update the version in the `package.json`
 * Update the version in the `build.gradle.kts` inside `./kotlin/android` and `./kotlin/jvm`

package/package.json

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

package/platforms/web/corecrypto.d.ts

@@ -423,6 +423,19 @@ export declare class CoreCrypto {
 	 * ````
 	 */
 	static init({ databaseName, key, clientId, wasmFilePath, entropySeed }: CoreCryptoParams): Promise<CoreCrypto>;
+	/**
+	 * Almost identical to {@link CoreCrypto.init} but allows a 2 phase initialization of MLS.
+	 * First, calling this will set up the keystore and will allow generating proteus prekeys.
+	 * Then, those keys can be traded for a clientId.
+	 * Use this clientId to initialize MLS with {@link CoreCrypto.mlsInit}.
+	 */
+	static deferredInit(databaseName: string, key: string, entropySeed?: Uint8Array, wasmFilePath?: string): Promise<CoreCrypto>;
+	/**
+	 * Use this after {@link CoreCrypto.deferredInit} when you have a clientId. It initializes MLS.
+	 *
+	 * @param clientId - {@link CoreCryptoParams#clientId} but required
+	 */
+	mlsInit(clientId: string): Promise<void>;
 	/** @hidden */
 	private constructor();
 	/**
@@ -767,6 +780,18 @@ export declare class CoreCrypto {
 	 * @returns Hex-encoded public key string
 	 */
 	proteusFingerprint(): Promise<string>;
+	/**
+	 * Proteus session local fingerprint
+	 *
+	 * @returns Hex-encoded public key string
+	 */
+	proteusFingerprintLocal(sessionId: string): Promise<string>;
+	/**
+	 * Proteus session remote fingerprint
+	 *
+	 * @returns Hex-encoded public key string
+	 */
+	proteusFingerprintRemote(sessionId: string): Promise<string>;
 	/**
 	 * Imports all the data stored by Cryptobox into the CoreCrypto keystore
 	 *

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();
@@ -328,7 +328,7 @@ function handleError(f, args) {
 function getArrayU8FromWasm0(ptr, len) {
     return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
 }
-function __wbg_adapter_213(arg0, arg1, arg2, arg3) {
+function __wbg_adapter_217(arg0, arg1, arg2, arg3) {
     wasm$1.wasm_bindgen__convert__closures__invoke2_mut__h880776ea65aca59d(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
@@ -519,6 +519,34 @@ class CoreCrypto$1 {
         return takeObject(ret);
     }
     /**
+    * see [core_crypto::MlsCentral::try_new]
+    * @param {string} path
+    * @param {string} key
+    * @param {Uint8Array | undefined} entropy_seed
+    * @returns {Promise<CoreCrypto>}
+    */
+    static deferred_init(path, key, entropy_seed) {
+        const ptr0 = passStringToWasm0(path, wasm$1.__wbindgen_malloc, wasm$1.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passStringToWasm0(key, wasm$1.__wbindgen_malloc, wasm$1.__wbindgen_realloc);
+        const len1 = WASM_VECTOR_LEN;
+        var ptr2 = isLikeNone(entropy_seed) ? 0 : passArray8ToWasm0(entropy_seed, wasm$1.__wbindgen_malloc);
+        var len2 = WASM_VECTOR_LEN;
+        const ret = wasm$1.corecrypto_deferred_init(ptr0, len0, ptr1, len1, ptr2, len2);
+        return takeObject(ret);
+    }
+    /**
+    * see [core_crypto::MlsCentral::mls_init]
+    * @param {string} client_id
+    * @returns {Promise<Promise<any>>}
+    */
+    mls_init(client_id) {
+        const ptr0 = passStringToWasm0(client_id, wasm$1.__wbindgen_malloc, wasm$1.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm$1.corecrypto_mls_init(this.ptr, ptr0, len0);
+        return takeObject(ret);
+    }
+    /**
     * Returns: [`WasmCryptoResult<()>`]
     *
     * see [core_crypto::MlsCentral::close]
@@ -1085,6 +1113,32 @@ class CoreCrypto$1 {
         return takeObject(ret);
     }
     /**
+    * Returns: [`WasmCryptoResult<String>`]
+    *
+    * see [core_crypto::proteus::ProteusCentral::fingerprint_local]
+    * @param {string} session_id
+    * @returns {Promise<string>}
+    */
+    proteus_fingerprint_local(session_id) {
+        const ptr0 = passStringToWasm0(session_id, wasm$1.__wbindgen_malloc, wasm$1.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm$1.corecrypto_proteus_fingerprint_local(this.ptr, ptr0, len0);
+        return takeObject(ret);
+    }
+    /**
+    * Returns: [`WasmCryptoResult<String>`]
+    *
+    * see [core_crypto::proteus::ProteusCentral::fingerprint_remote]
+    * @param {string} session_id
+    * @returns {Promise<string>}
+    */
+    proteus_fingerprint_remote(session_id) {
+        const ptr0 = passStringToWasm0(session_id, wasm$1.__wbindgen_malloc, wasm$1.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm$1.corecrypto_proteus_fingerprint_remote(this.ptr, ptr0, len0);
+        return takeObject(ret);
+    }
+    /**
     * Returns: [`WasmCryptoResult<()>`]
     *
     * see [core_crypto::proteus::ProteusCentral::cryptobox_migrate]
@@ -1443,6 +1497,9 @@ 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);
@@ -1452,9 +1509,6 @@ function getImports() {
         const ret = typeof(val) === 'object' && val !== null;
         return ret;
     };
-    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
-        takeObject(arg0);
-    };
     imports.wbg.__wbg_getwithrefkey_15c62c2b8546208d = function(arg0, arg1) {
         const ret = getObject(arg0)[getObject(arg1)];
         return addHeapObject(ret);
@@ -1586,30 +1640,22 @@ function getImports() {
         const ret = getObject(arg0)[arg1 >>> 0];
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_new_8c3f0052272a457a = function(arg0) {
-        const ret = new Uint8Array(getObject(arg0));
+    imports.wbg.__wbg_corecrypto_new = function(arg0) {
+        const ret = CoreCrypto$1.__wrap(arg0);
         return addHeapObject(ret);
     };
     imports.wbg.__wbg_call_168da88779e35f61 = function() { return handleError(function (arg0, arg1, arg2) {
         const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_corecrypto_new = function(arg0) {
-        const ret = CoreCrypto$1.__wrap(arg0);
+    imports.wbg.__wbg_new_8c3f0052272a457a = function(arg0) {
+        const ret = new Uint8Array(getObject(arg0));
         return addHeapObject(ret);
     };
     imports.wbg.__wbg_push_740e4b286702d964 = function(arg0, arg1) {
         const ret = getObject(arg0).push(getObject(arg1));
         return ret;
     };
-    imports.wbg.__wbg_call_3999bee59e9f7719 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
-        const ret = getObject(arg0).call(getObject(arg1), getObject(arg2), getObject(arg3));
-        return addHeapObject(ret);
-    }, arguments) };
-    imports.wbg.__wbg_call_e1f72c051cdab859 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
-        const ret = getObject(arg0).call(getObject(arg1), getObject(arg2), getObject(arg3), getObject(arg4));
-        return addHeapObject(ret);
-    }, arguments) };
     imports.wbg.__wbg_new_9962f939219f1820 = function(arg0, arg1) {
         try {
             var state0 = {a: arg0, b: arg1};
@@ -1617,7 +1663,7 @@ function getImports() {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wbg_adapter_213(a, state0.b, arg0, arg1);
+                    return __wbg_adapter_217(a, state0.b, arg0, arg1);
                 } finally {
                     state0.a = a;
                 }
@@ -1628,6 +1674,14 @@ function getImports() {
             state0.a = state0.b = 0;
         }
     };
+    imports.wbg.__wbg_call_3999bee59e9f7719 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
+        const ret = getObject(arg0).call(getObject(arg1), getObject(arg2), getObject(arg3));
+        return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbg_call_e1f72c051cdab859 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+        const ret = getObject(arg0).call(getObject(arg1), getObject(arg2), getObject(arg3), getObject(arg4));
+        return addHeapObject(ret);
+    }, arguments) };
     imports.wbg.__wbg_reject_72477563edad55b7 = function(arg0) {
         const ret = Promise.reject(getObject(arg0));
         return addHeapObject(ret);
@@ -1687,32 +1741,9 @@ function getImports() {
         const ret = false;
         return ret;
     };
-    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_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_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_deleteDatabase_f6454de6a88aebde = function() { return handleError(function (arg0, arg1, arg2) {
-        const ret = getObject(arg0).deleteDatabase(getStringFromWasm0(arg1, arg2));
-        return addHeapObject(ret);
-    }, arguments) };
-    imports.wbg.__wbg_close_5a04b9ce11dade22 = function(arg0) {
-        getObject(arg0).close();
-    };
     imports.wbg.__wbg_setonerror_d5771cc5bf9ea74c = function(arg0, arg1) {
         getObject(arg0).onerror = getObject(arg1);
     };
@@ -1724,17 +1755,30 @@ function getImports() {
         const ret = getObject(arg0).put(getObject(arg1));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_open_a31c3fe1fdc244eb = function() { return handleError(function (arg0, arg1, arg2) {
-        const ret = getObject(arg0).open(getStringFromWasm0(arg1, arg2));
+    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_open_c5d5fb2df44b9d10 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
-        const ret = getObject(arg0).open(getStringFromWasm0(arg1, arg2), arg3 >>> 0);
+    imports.wbg.__wbg_openCursor_f055654a98eeab7f = function() { return handleError(function (arg0) {
+        const ret = getObject(arg0).openCursor();
+        return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbg_count_b0e88953a0ea909c = function() { return handleError(function (arg0) {
+        const ret = getObject(arg0).count();
+        return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbg_count_46eda68a16dbe30e = function() { return handleError(function (arg0, arg1) {
+        const ret = getObject(arg0).count(getObject(arg1));
+        return addHeapObject(ret);
+    }, arguments) };
+    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_get_6285bf458a1ee758 = function() { return handleError(function (arg0, arg1) {
+        const ret = getObject(arg0).get(getObject(arg1));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_setonupgradeneeded_17d0b9530f1e0cac = function(arg0, arg1) {
-        getObject(arg0).onupgradeneeded = getObject(arg1);
-    };
     imports.wbg.__wbg_index_86861edf1478f49c = function() { return handleError(function (arg0, arg1, arg2) {
         const ret = getObject(arg0).index(getStringFromWasm0(arg1, arg2));
         return addHeapObject(ret);
@@ -1755,14 +1799,24 @@ function getImports() {
         const ret = getObject(arg0).openCursor(getObject(arg1));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_count_b0e88953a0ea909c = function() { return handleError(function (arg0) {
-        const ret = getObject(arg0).count();
+    imports.wbg.__wbg_deleteDatabase_f6454de6a88aebde = function() { return handleError(function (arg0, arg1, arg2) {
+        const ret = getObject(arg0).deleteDatabase(getStringFromWasm0(arg1, arg2));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_count_46eda68a16dbe30e = function() { return handleError(function (arg0, arg1) {
-        const ret = getObject(arg0).count(getObject(arg1));
+    imports.wbg.__wbg_close_5a04b9ce11dade22 = function(arg0) {
+        getObject(arg0).close();
+    };
+    imports.wbg.__wbg_open_a31c3fe1fdc244eb = function() { return handleError(function (arg0, arg1, arg2) {
+        const ret = getObject(arg0).open(getStringFromWasm0(arg1, arg2));
         return addHeapObject(ret);
     }, arguments) };
+    imports.wbg.__wbg_open_c5d5fb2df44b9d10 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
+        const ret = getObject(arg0).open(getStringFromWasm0(arg1, arg2), arg3 >>> 0);
+        return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbg_setonupgradeneeded_17d0b9530f1e0cac = function(arg0, arg1) {
+        getObject(arg0).onupgradeneeded = getObject(arg1);
+    };
     imports.wbg.__wbg_randomFillSync_6894564c2c334c42 = function() { return handleError(function (arg0, arg1, arg2) {
         getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
     }, arguments) };
@@ -2010,11 +2064,11 @@ function getImports() {
         const ret = getObject(arg0).objectStore(getStringFromWasm0(arg1, arg2));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbindgen_closure_wrapper2302 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper2358 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 123, __wbg_adapter_52);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper3740 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper3780 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 123, __wbg_adapter_55);
         return addHeapObject(ret);
     };
@@ -2083,7 +2137,7 @@ var exports = /*#__PURE__*/Object.freeze({
 var wasm = async (opt = {}) => {
                 let {importHook, serverPath} = opt;
 
-                let path = "assets/core_crypto_ffi-c0caf497.wasm";
+                let path = "assets/core_crypto_ffi-bf5877ee.wasm";
 
                 if (serverPath != null) {
                     path = serverPath + /[^\/\\]*$/.exec(path)[0];
@@ -2252,6 +2306,29 @@ class CoreCrypto {
         const cc = await __classPrivateFieldGet(this, _a, "f", _CoreCrypto_module).CoreCrypto._internal_new(databaseName, key, clientId, entropySeed);
         return new this(cc);
     }
+    /**
+     * Almost identical to {@link CoreCrypto.init} but allows a 2 phase initialization of MLS.
+     * First, calling this will set up the keystore and will allow generating proteus prekeys.
+     * Then, those keys can be traded for a clientId.
+     * Use this clientId to initialize MLS with {@link CoreCrypto.mlsInit}.
+     */
+    static async deferredInit(databaseName, key, entropySeed, wasmFilePath) {
+        if (!__classPrivateFieldGet(this, _a, "f", _CoreCrypto_module)) {
+            const wasmImportArgs = wasmFilePath ? { importHook: () => wasmFilePath } : undefined;
+            const exports = (await wasm(wasmImportArgs));
+            __classPrivateFieldSet(this, _a, exports, "f", _CoreCrypto_module);
+        }
+        const cc = await __classPrivateFieldGet(this, _a, "f", _CoreCrypto_module).CoreCrypto.deferred_init(databaseName, key, entropySeed);
+        return new this(cc);
+    }
+    /**
+     * Use this after {@link CoreCrypto.deferredInit} when you have a clientId. It initializes MLS.
+     *
+     * @param clientId - {@link CoreCryptoParams#clientId} but required
+     */
+    async mlsInit(clientId) {
+        return await __classPrivateFieldGet(this, _CoreCrypto_cc, "f").mls_init(clientId);
+    }
     /**
      * Wipes the {@link CoreCrypto} backing storage (i.e. {@link https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API | IndexedDB} database)
      *
@@ -2786,6 +2863,22 @@ class CoreCrypto {
     async proteusFingerprint() {
         return await __classPrivateFieldGet(this, _CoreCrypto_cc, "f").proteus_fingerprint();
     }
+    /**
+     * Proteus session local fingerprint
+     *
+     * @returns Hex-encoded public key string
+     */
+    async proteusFingerprintLocal(sessionId) {
+        return await __classPrivateFieldGet(this, _CoreCrypto_cc, "f").proteus_fingerprint_local(sessionId);
+    }
+    /**
+     * Proteus session remote fingerprint
+     *
+     * @returns Hex-encoded public key string
+     */
+    async proteusFingerprintRemote(sessionId) {
+        return await __classPrivateFieldGet(this, _CoreCrypto_cc, "f").proteus_fingerprint_remote(sessionId);
+    }
     /**
      * Imports all the data stored by Cryptobox into the CoreCrypto keystore
      *