@wireapp/core-crypto 1.0.0-rc.57 → 1.0.0-rc.59

package/package.json

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

package/platforms/web/corecrypto.d.ts

@@ -351,10 +351,6 @@ export interface CoreCryptoDeferredParams {
 	 * This should be appropriately stored in a secure location (i.e. WebCrypto private key storage)
 	 */
 	key: string;
-	/**
-	 * All the ciphersuites this MLS client can support
-	 */
-	ciphersuites: Ciphersuite[];
 	/**
 	 * External PRNG entropy pool seed.
 	 * This **must** be exactly 32 bytes
@@ -364,10 +360,6 @@ export interface CoreCryptoDeferredParams {
 	 * .wasm file path, this will be useful in case your bundling system likes to relocate files (i.e. what webpack does)
 	 */
 	wasmFilePath?: string;
-	/**
-	 * Number of initial KeyPackage to create when initializing the client
-	 */
-	nbKeyPackage?: number;
 }
 /**
  * Params for CoreCrypto initialization
@@ -379,6 +371,14 @@ export interface CoreCryptoParams extends CoreCryptoDeferredParams {
 	 * This should stay consistent as it will be verified against the stored signature & identity to validate the persisted credential
 	 */
 	clientId: ClientId;
+	/**
+	 * All the ciphersuites this MLS client can support
+	 */
+	ciphersuites: Ciphersuite[];
+	/**
+	 * Number of initial KeyPackage to create when initializing the client
+	 */
+	nbKeyPackage?: number;
 }
 export interface ConversationInitBundle {
 	/**
@@ -799,7 +799,7 @@ export declare class CoreCrypto {
 	 * Use this clientId to initialize MLS with {@link CoreCrypto.mlsInit}.
 	 * @param params - {@link CoreCryptoDeferredParams}
 	 */
-	static deferredInit({ databaseName, key, ciphersuites, entropySeed, wasmFilePath, nbKeyPackage, }: CoreCryptoDeferredParams): Promise<CoreCrypto>;
+	static deferredInit({ databaseName, key, entropySeed, wasmFilePath, }: CoreCryptoDeferredParams): Promise<CoreCrypto>;
 	/**
 	 * Use this after {@link CoreCrypto.deferredInit} when you have a clientId. It initializes MLS.
 	 *

package/platforms/web/corecrypto.js

@@ -265,57 +265,53 @@ async function __wbg_load(module, imports) {
 var __wbg_get_imports = function() {
   const imports = {};
   imports.wbg = {};
-  imports.wbg.__wbg_acmedirectory_new = function(arg0) {
-    const ret = AcmeDirectory.__wrap(arg0);
+  imports.wbg.__wbindgen_number_new = function(arg0) {
+    const ret = arg0;
     return addHeapObject(ret);
   };
-  imports.wbg.__wbg_buffereddecryptedmessage_new = function(arg0) {
-    const ret = BufferedDecryptedMessage.__wrap(arg0);
+  imports.wbg.__wbg_commitbundle_new = function(arg0) {
+    const ret = CommitBundle.__wrap(arg0);
+    return addHeapObject(ret);
+  };
+  imports.wbg.__wbg_newacmeorder_new = function(arg0) {
+    const ret = NewAcmeOrder.__wrap(arg0);
     return addHeapObject(ret);
   };
   imports.wbg.__wbg_proteusautoprekeybundle_new = function(arg0) {
     const ret = ProteusAutoPrekeyBundle.__wrap(arg0);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbindgen_number_new = function(arg0) {
-    const ret = arg0;
+  imports.wbg.__wbg_corecrypto_new = function(arg0) {
+    const ret = CoreCrypto.__wrap(arg0);
     return addHeapObject(ret);
   };
   imports.wbg.__wbg_newacmeauthz_new = function(arg0) {
     const ret = NewAcmeAuthz.__wrap(arg0);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbg_newacmeorder_new = function(arg0) {
-    const ret = NewAcmeOrder.__wrap(arg0);
+  imports.wbg.__wbg_ffiwiree2eidentity_new = function(arg0) {
+    const ret = FfiWireE2EIdentity.__wrap(arg0);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
-    takeObject(arg0);
-  };
-  imports.wbg.__wbg_proposalbundle_new = function(arg0) {
-    const ret = ProposalBundle.__wrap(arg0);
+  imports.wbg.__wbg_acmedirectory_new = function(arg0) {
+    const ret = AcmeDirectory.__wrap(arg0);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbg_commitbundle_new = function(arg0) {
-    const ret = CommitBundle.__wrap(arg0);
-    return addHeapObject(ret);
+  imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
+    takeObject(arg0);
   };
-  imports.wbg.__wbg_corecrypto_new = function(arg0) {
-    const ret = CoreCrypto.__wrap(arg0);
+  imports.wbg.__wbg_buffereddecryptedmessage_new = function(arg0) {
+    const ret = BufferedDecryptedMessage.__wrap(arg0);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbg_ffiwiree2eidentity_new = function(arg0) {
-    const ret = FfiWireE2EIdentity.__wrap(arg0);
+  imports.wbg.__wbg_proposalbundle_new = function(arg0) {
+    const ret = ProposalBundle.__wrap(arg0);
     return addHeapObject(ret);
   };
   imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
     const ret = getObject(arg0);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbindgen_bigint_from_u64 = function(arg0) {
-    const ret = BigInt.asUintN(64, arg0);
-    return addHeapObject(ret);
-  };
   imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
     const ret = getStringFromWasm0(arg0, arg1);
     return addHeapObject(ret);
@@ -328,6 +324,10 @@ var __wbg_get_imports = function() {
     const ret = getObject(arg0) === null;
     return ret;
   };
+  imports.wbg.__wbindgen_bigint_from_u64 = function(arg0) {
+    const ret = BigInt.asUintN(64, arg0);
+    return addHeapObject(ret);
+  };
   imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
     const obj = getObject(arg1);
     const ret = typeof obj === "string" ? obj : undefined;
@@ -983,8 +983,8 @@ var __wbg_get_imports = function() {
     const ret = makeMutClosure(arg0, arg1, 667, __wbg_adapter_54);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbindgen_closure_wrapper13244 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 2142, __wbg_adapter_57);
+  imports.wbg.__wbindgen_closure_wrapper13251 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 2143, __wbg_adapter_57);
     return addHeapObject(ret);
   };
   return imports;
@@ -1051,14 +1051,6 @@ var CLOSURE_DTORS = typeof FinalizationRegistry === "undefined" ? { register: ()
 });
 var cachedUint32Memory0 = null;
 var cachedUint16Memory0 = null;
-var DeviceStatus = Object.freeze({
-  Valid: 1,
-  "1": "Valid",
-  Expired: 2,
-  "2": "Expired",
-  Revoked: 3,
-  "3": "Revoked"
-});
 var WirePolicy = Object.freeze({
   Plaintext: 1,
   "1": "Plaintext",
@@ -1071,6 +1063,14 @@ var CredentialType = Object.freeze({
   X509: 2,
   "2": "X509"
 });
+var DeviceStatus = Object.freeze({
+  Valid: 1,
+  "1": "Valid",
+  Expired: 2,
+  "2": "Expired",
+  Revoked: 3,
+  "3": "Revoked"
+});
 var Ciphersuite = Object.freeze({
   MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519: 1,
   "1": "MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519",
@@ -1550,16 +1550,14 @@ class CoreCrypto {
     const ret = wasm.corecrypto__internal_new(ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, !isLikeNone(nb_key_package), isLikeNone(nb_key_package) ? 0 : nb_key_package);
     return takeObject(ret);
   }
-  static deferred_init(path, key, ciphersuites, entropy_seed, nb_key_package) {
+  static deferred_init(path, key, entropy_seed) {
     const ptr0 = passStringToWasm0(path, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len0 = WASM_VECTOR_LEN;
     const ptr1 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len1 = WASM_VECTOR_LEN;
-    const ptr2 = passArray16ToWasm0(ciphersuites, wasm.__wbindgen_malloc);
-    const len2 = WASM_VECTOR_LEN;
-    var ptr3 = isLikeNone(entropy_seed) ? 0 : passArray8ToWasm0(entropy_seed, wasm.__wbindgen_malloc);
-    var len3 = WASM_VECTOR_LEN;
-    const ret = wasm.corecrypto_deferred_init(ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, !isLikeNone(nb_key_package), isLikeNone(nb_key_package) ? 0 : nb_key_package);
+    var ptr2 = isLikeNone(entropy_seed) ? 0 : passArray8ToWasm0(entropy_seed, wasm.__wbindgen_malloc);
+    var len2 = WASM_VECTOR_LEN;
+    const ret = wasm.corecrypto_deferred_init(ptr0, len0, ptr1, len1, ptr2, len2);
     return takeObject(ret);
   }
   mls_init(client_id, ciphersuites, nb_key_package) {
@@ -2749,14 +2747,11 @@ class CoreCrypto2 {
   static async deferredInit({
     databaseName,
     key,
-    ciphersuites,
     entropySeed,
-    wasmFilePath,
-    nbKeyPackage
+    wasmFilePath
   }) {
     await this.#loadModule(wasmFilePath);
-    let cs = ciphersuites.map((cs2) => cs2.valueOf());
-    const cc = await CoreCryptoError.asyncMapErr(CoreCrypto.deferred_init(databaseName, key, Uint16Array.of(...cs), entropySeed, nbKeyPackage));
+    const cc = await CoreCryptoError.asyncMapErr(CoreCrypto.deferred_init(databaseName, key, entropySeed));
     return new this(cc);
   }
   async mlsInit(clientId, ciphersuites, nbKeyPackage) {