@wireapp/core-crypto 1.0.0-rc.2 → 1.0.0-rc.6

package/package.json

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

package/platforms/web/corecrypto.d.ts

@@ -727,6 +727,10 @@ export declare class CoreCrypto {
 	/**
 	 * Ingest a TLS-serialized MLS welcome message to join an existing MLS group
 	 *
+	 * Important: you have to catch the error with this reason "Although this Welcome seems valid, the local KeyPackage
+	 * it references has already been deleted locally. Join this group with an external commit", ignore it and then try
+	 * to join this group with an external commit.
+	 *
 	 * @param welcomeMessage - TLS-serialized MLS Welcome message
 	 * @param configuration - configuration of the MLS group
 	 * @returns The conversation ID of the newly joined group. You can use the same ID to decrypt/encrypt messages
@@ -1121,9 +1125,16 @@ export declare class CoreCrypto {
 	 * Credential generated by Wire's end-to-end identity enrollment
 	 *
 	 * @param conversationId The group's ID
-	 * @returns true if all the members have valid X509 credentials
+	 * @returns the conversation state given current members
+	 */
+	e2eiConversationState(conversationId: ConversationId): Promise<E2eiConversationState>;
+	/**
+	 * Returns true when end-to-end-identity is enabled for the given Ciphersuite
+	 *
+	 * @param ciphersuite of the credential to check
+	 * @returns true end-to-end identity is enabled for the given ciphersuite
 	 */
-	e2eiIsDegraded(conversationId: ConversationId): Promise<boolean>;
+	e2eiIsEnabled(ciphersuite: Ciphersuite): Promise<boolean>;
 	/**
 	 * Returns the current version of {@link CoreCrypto}
 	 *
@@ -1359,5 +1370,24 @@ export interface AcmeChallenge {
 	 */
 	target: string;
 }
+/**
+ * Indicates the state of a Conversation regarding end-to-end identity.
+ * Note: this does not check pending state (pending commit, pending proposals) so it does not
+ * consider members about to be added/removed
+ */
+export declare enum E2eiConversationState {
+	/**
+	 * All clients have a valid E2EI certificate
+	 */
+	Verified = 1,
+	/**
+	 * Some clients are either still Basic or their certificate is expired
+	 */
+	Degraded = 2,
+	/**
+	 * All clients are still Basic. If all client have expired certificates, Degraded is returned.
+	 */
+	NotEnabled = 3
+}
 
 export {};

package/platforms/web/corecrypto.js

@@ -234,12 +234,12 @@ function makeMutClosure(arg0, arg1, dtor, f) {
     return real;
 }
 function __wbg_adapter_52(arg0, arg1, arg2) {
-    wasm$1.wasm_bindgen__convert__closures__invoke1_mut__h79cafe3df8446843(arg0, arg1, addHeapObject(arg2));
+    wasm$1.wasm_bindgen__convert__closures__invoke1_mut__h17baf5e1d66e67f4(arg0, arg1, addHeapObject(arg2));
 }
 function __wbg_adapter_55(arg0, arg1, arg2) {
     try {
         const retptr = wasm$1.__wbindgen_add_to_stack_pointer(-16);
-        wasm$1.wasm_bindgen__convert__closures__invoke1_mut__he1696d119fd3caab(retptr, arg0, arg1, addHeapObject(arg2));
+        wasm$1.wasm_bindgen__convert__closures__invoke1_mut__hdbae48319fb47112(retptr, arg0, arg1, addHeapObject(arg2));
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         if (r1) {
@@ -313,8 +313,8 @@ function handleError(f, args) {
         wasm$1.__wbindgen_exn_store(addHeapObject(e));
     }
 }
-function __wbg_adapter_298(arg0, arg1, arg2, arg3) {
-    wasm$1.wasm_bindgen__convert__closures__invoke2_mut__h2ada45b9b70febc7(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wbg_adapter_299(arg0, arg1, arg2, arg3) {
+    wasm$1.wasm_bindgen__convert__closures__invoke2_mut__haf4f26fdea6dc8ca(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 /**
 * see [core_crypto::prelude::MlsWirePolicy]
@@ -807,14 +807,25 @@ let CoreCrypto$1 = class CoreCrypto {
     /**
     * Returns [`WasmCryptoResult<bool>`]
     *
-    * see [core_crypto::mls::MlsCentral::e2ei_is_degraded]
+    * see [core_crypto::mls::MlsCentral::e2ei_conversation_state]
     * @param {Uint8Array} conversation_id
     * @returns {Promise<any>}
     */
-    e2ei_is_degraded(conversation_id) {
+    e2ei_conversation_state(conversation_id) {
         const ptr0 = passArray8ToWasm0(conversation_id, wasm$1.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm$1.corecrypto_e2ei_is_degraded(this.__wbg_ptr, ptr0, len0);
+        const ret = wasm$1.corecrypto_e2ei_conversation_state(this.__wbg_ptr, ptr0, len0);
+        return takeObject(ret);
+    }
+    /**
+    * Returns [`WasmCryptoResult<bool>`]
+    *
+    * see [core_crypto::mls::MlsCentral::e2ei_is_enabled]
+    * @param {number} ciphersuite
+    * @returns {Promise<any>}
+    */
+    e2ei_is_enabled(ciphersuite) {
+        const ret = wasm$1.corecrypto_e2ei_is_enabled(this.__wbg_ptr, ciphersuite);
         return takeObject(ret);
     }
     /**
@@ -1215,7 +1226,7 @@ let CoreCrypto$1 = class CoreCrypto {
     /**
     * Returns: [`WasmCryptoResult<js_sys::Uint8Array>`]
     *
-    * see [core_crypto::mls::MlsCentral::new_proposal]
+    * see [core_crypto::mls::MlsCentral::new_add_proposal]
     * @param {Uint8Array} conversation_id
     * @param {Uint8Array} keypackage
     * @returns {Promise<any>}
@@ -1231,7 +1242,7 @@ let CoreCrypto$1 = class CoreCrypto {
     /**
     * Returns: [`WasmCryptoResult<js_sys::Uint8Array>`]
     *
-    * see [core_crypto::mls::MlsCentral::new_proposal]
+    * see [core_crypto::mls::MlsCentral::new_update_proposal]
     * @param {Uint8Array} conversation_id
     * @returns {Promise<any>}
     */
@@ -1244,7 +1255,7 @@ let CoreCrypto$1 = class CoreCrypto {
     /**
     * Returns: [`WasmCryptoResult<js_sys::Uint8Array>`]
     *
-    * see [core_crypto::mls::MlsCentral::new_proposal]
+    * see [core_crypto::mls::MlsCentral::new_remove_proposal]
     * @param {Uint8Array} conversation_id
     * @param {Uint8Array} client_id
     * @returns {Promise<any>}
@@ -2858,39 +2869,50 @@ function __wbg_get_imports() {
         const ret = getObject(arg0).length;
         return ret;
     };
-    imports.wbg.__wbg_new_b51585de1b234aff = function () {
-        const ret = new Object();
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbg_call_01734de55d61e11d = function () {
         return handleError(function (arg0, arg1, arg2) {
             const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
             return addHeapObject(ret);
         }, arguments);
     };
+    imports.wbg.__wbindgen_number_new = function (arg0) {
+        const ret = arg0;
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbg_new_8125e318e6245eed = function (arg0) {
         const ret = new Uint8Array(getObject(arg0));
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_ffiwiree2eidentity_new = function (arg0) {
+        const ret = FfiWireE2EIdentity.__wrap(arg0);
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_new_b51585de1b234aff = function () {
+        const ret = new Object();
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbg_new_898a68150f225f2e = function () {
         const ret = new Array();
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_set_502d29070ea18557 = function (arg0, arg1, arg2) {
+        getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
+    };
+    imports.wbg.__wbg_set_841ac57cff3d672b = function (arg0, arg1, arg2) {
+        getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
+    };
     imports.wbg.__wbg_push_ca1c26067ef907ac = function (arg0, arg1) {
         const ret = getObject(arg0).push(getObject(arg1));
         return ret;
     };
-    imports.wbg.__wbg_ffiwiree2eidentity_new = function (arg0) {
-        const ret = FfiWireE2EIdentity.__wrap(arg0);
+    imports.wbg.__wbg_new_56693dbed0c32988 = function () {
+        const ret = new Map();
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_number_new = function (arg0) {
-        const ret = arg0;
+    imports.wbg.__wbg_set_bedc3d02d0f05eb0 = function (arg0, arg1, arg2) {
+        const ret = getObject(arg0).set(getObject(arg1), getObject(arg2));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_set_502d29070ea18557 = function (arg0, arg1, arg2) {
-        getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
-    };
     imports.wbg.__wbg_proteusautoprekeybundle_new = function (arg0) {
         const ret = ProteusAutoPrekeyBundle.__wrap(arg0);
         return addHeapObject(ret);
@@ -2899,14 +2921,6 @@ function __wbg_get_imports() {
         const ret = BigInt.asUintN(64, arg0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_new_56693dbed0c32988 = function () {
-        const ret = new Map();
-        return addHeapObject(ret);
-    };
-    imports.wbg.__wbg_set_bedc3d02d0f05eb0 = function (arg0, arg1, arg2) {
-        const ret = getObject(arg0).set(getObject(arg1), getObject(arg2));
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbg_new_d258248ed531ff54 = function (arg0, arg1) {
         const ret = new Error(getStringFromWasm0(arg0, arg1));
         return addHeapObject(ret);
@@ -2979,9 +2993,6 @@ function __wbg_get_imports() {
         const ret = CoreCrypto$1.__wrap(arg0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_set_841ac57cff3d672b = function (arg0, arg1, arg2) {
-        getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
-    };
     imports.wbg.__wbg_instanceof_Promise_0e98a5bf082e090f = function (arg0) {
         let result;
         try {
@@ -3033,7 +3044,7 @@ function __wbg_get_imports() {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wbg_adapter_298(a, state0.b, arg0, arg1);
+                    return __wbg_adapter_299(a, state0.b, arg0, arg1);
                 }
                 finally {
                     state0.a = a;
@@ -3123,6 +3134,10 @@ function __wbg_get_imports() {
             return addHeapObject(ret);
         }, arguments);
     };
+    imports.wbg.__wbg_now_9c5990bda04c7e53 = function () {
+        const ret = Date.now();
+        return ret;
+    };
     imports.wbg.__wbg_put_fb32824d87feec5c = function () {
         return handleError(function (arg0, arg1, arg2) {
             const ret = getObject(arg0).put(getObject(arg1), getObject(arg2));
@@ -3165,10 +3180,6 @@ function __wbg_get_imports() {
             return addHeapObject(ret);
         }, arguments);
     };
-    imports.wbg.__wbg_now_9c5990bda04c7e53 = function () {
-        const ret = Date.now();
-        return ret;
-    };
     imports.wbg.__wbindgen_memory = function () {
         const ret = wasm$1.memory;
         return addHeapObject(ret);
@@ -3482,12 +3493,12 @@ function __wbg_get_imports() {
             return addHeapObject(ret);
         }, arguments);
     };
-    imports.wbg.__wbindgen_closure_wrapper1985 = function (arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 168, __wbg_adapter_52);
+    imports.wbg.__wbindgen_closure_wrapper1951 = function (arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 167, __wbg_adapter_52);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper4701 = function (arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 168, __wbg_adapter_55);
+    imports.wbg.__wbindgen_closure_wrapper4727 = function (arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 167, __wbg_adapter_55);
         return addHeapObject(ret);
     };
     return imports;
@@ -3556,7 +3567,7 @@ var exports = /*#__PURE__*/Object.freeze({
 var wasm = async (opt = {}) => {
                 let {importHook, serverPath} = opt;
 
-                let path = "assets/core_crypto_ffi-b7eb1191.wasm";
+                let path = "assets/core_crypto_ffi-8c0bd9a1.wasm";
 
                 if (serverPath != null) {
                     path = serverPath + /[^\/\\]*$/.exec(path)[0];
@@ -4054,6 +4065,10 @@ class CoreCrypto {
     /**
      * Ingest a TLS-serialized MLS welcome message to join an existing MLS group
      *
+     * Important: you have to catch the error with this reason "Although this Welcome seems valid, the local KeyPackage
+     * it references has already been deleted locally. Join this group with an external commit", ignore it and then try
+     * to join this group with an external commit.
+     *
      * @param welcomeMessage - TLS-serialized MLS Welcome message
      * @param configuration - configuration of the MLS group
      * @returns The conversation ID of the newly joined group. You can use the same ID to decrypt/encrypt messages
@@ -4646,7 +4661,13 @@ class CoreCrypto {
      * @param newKeyPackageCount - number of KeyPackages with new identity to generate
      */
     async e2eiRotateAll(enrollment, certificateChain, newKeyPackageCount) {
-        return await __classPrivateFieldGet(this, _CoreCrypto_cc, "f").e2ei_rotate_all(enrollment.inner(), certificateChain, newKeyPackageCount);
+        const ffiRet = await __classPrivateFieldGet(this, _CoreCrypto_cc, "f").e2ei_rotate_all(enrollment.inner(), certificateChain, newKeyPackageCount);
+        const ret = {
+            commits: ffiRet.commits,
+            newKeyPackages: ffiRet.new_key_packages,
+            keyPackageRefsToRemove: ffiRet.key_package_refs_to_remove,
+        };
+        return ret;
     }
     /**
      * Allows persisting an active enrollment (for example while redirecting the user during OAuth) in order to resume
@@ -4673,10 +4694,21 @@ class CoreCrypto {
      * Credential generated by Wire's end-to-end identity enrollment
      *
      * @param conversationId The group's ID
-     * @returns true if all the members have valid X509 credentials
+     * @returns the conversation state given current members
      */
-    async e2eiIsDegraded(conversationId) {
-        return await CoreCryptoError.asyncMapErr(__classPrivateFieldGet(this, _CoreCrypto_cc, "f").e2ei_is_degraded(conversationId));
+    async e2eiConversationState(conversationId) {
+        let state = await CoreCryptoError.asyncMapErr(__classPrivateFieldGet(this, _CoreCrypto_cc, "f").e2ei_conversation_state(conversationId));
+        // @ts-ignore
+        return E2eiConversationState[E2eiConversationState[state]];
+    }
+    /**
+     * Returns true when end-to-end-identity is enabled for the given Ciphersuite
+     *
+     * @param ciphersuite of the credential to check
+     * @returns true end-to-end identity is enabled for the given ciphersuite
+     */
+    async e2eiIsEnabled(ciphersuite) {
+        return await CoreCryptoError.asyncMapErr(__classPrivateFieldGet(this, _CoreCrypto_cc, "f").e2ei_is_enabled(ciphersuite));
     }
     /**
      * Returns the current version of {@link CoreCrypto}
@@ -4951,5 +4983,25 @@ class WireE2eIdentity {
     }
 }
 _WireE2eIdentity_e2ei = new WeakMap();
+/**
+ * Indicates the state of a Conversation regarding end-to-end identity.
+ * Note: this does not check pending state (pending commit, pending proposals) so it does not
+ * consider members about to be added/removed
+ */
+var E2eiConversationState;
+(function (E2eiConversationState) {
+    /**
+     * All clients have a valid E2EI certificate
+     */
+    E2eiConversationState[E2eiConversationState["Verified"] = 1] = "Verified";
+    /**
+     * Some clients are either still Basic or their certificate is expired
+     */
+    E2eiConversationState[E2eiConversationState["Degraded"] = 2] = "Degraded";
+    /**
+     * All clients are still Basic. If all client have expired certificates, Degraded is returned.
+     */
+    E2eiConversationState[E2eiConversationState["NotEnabled"] = 3] = "NotEnabled";
+})(E2eiConversationState || (E2eiConversationState = {}));
 
-export { Ciphersuite, CoreCrypto, CoreCryptoError, CredentialType, ExternalProposalType, GroupInfoEncryptionType, ProposalType, RatchetTreeType, WireE2eIdentity, WirePolicy };
+export { Ciphersuite, CoreCrypto, CoreCryptoError, CredentialType, E2eiConversationState, ExternalProposalType, GroupInfoEncryptionType, ProposalType, RatchetTreeType, WireE2eIdentity, WirePolicy };