@wireapp/core-crypto 2.0.0 → 3.0.0

package/package.json

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

package/platforms/web/corecrypto.d.ts

@@ -1,3 +1,23 @@
+declare enum WirePolicy {
+	/**
+	* Handshake messages are never encrypted
+	*/
+	Plaintext = 1,
+	/**
+	* Handshake messages are always encrypted
+	*/
+	Ciphertext = 2
+}
+declare enum CredentialType {
+	/**
+	* Just a KeyPair
+	*/
+	Basic = 1,
+	/**
+	* A certificate obtained through e2e identity enrollment process
+	*/
+	X509 = 2
+}
 declare enum Ciphersuite {
 	/**
 	* DH KEM x25519 | AES-GCM 128 | SHA2-256 | Ed25519
@@ -28,26 +48,6 @@ declare enum Ciphersuite {
 	*/
 	MLS_256_DHKEMP384_AES256GCM_SHA384_P384 = 7
 }
-declare enum WirePolicy {
-	/**
-	* Handshake messages are never encrypted
-	*/
-	Plaintext = 1,
-	/**
-	* Handshake messages are always encrypted
-	*/
-	Ciphertext = 2
-}
-declare enum CredentialType {
-	/**
-	* Just a KeyPair
-	*/
-	Basic = 1,
-	/**
-	* A certificate obtained through e2e identity enrollment process
-	*/
-	X509 = 2
-}
 /**
 * For creating a challenge.
 * @see https://www.rfc-editor.org/rfc/rfc8555.html#section-7.5.1
@@ -437,6 +437,13 @@ declare class CoreCryptoContext {
 	/**
 	* Returns: [`WasmCryptoResult<()>`]
 	*
+	* see [core_crypto::proteus::ProteusCentral::try_new]
+	* @returns {Promise<any>}
+	*/
+	proteus_init(): Promise<any>;
+	/**
+	* Returns: [`WasmCryptoResult<()>`]
+	*
 	* See [core_crypto::context::CentralContext::proteus_session_from_prekey]
 	* @param {string} session_id
 	* @param {Uint8Array} prekey
@@ -1281,6 +1288,10 @@ declare class CoreCryptoContext$1 {
 	 * @returns A `Uint8Array` buffer that contains `length` cryptographically-secure random bytes
 	 */
 	randomBytes(length: number): Promise<Uint8Array>;
+	/**
+	 * Initializes the proteus client
+	 */
+	proteusInit(): Promise<void>;
 	/**
 	 * Create a Proteus session using a prekey
 	 *
@@ -2661,6 +2672,9 @@ export declare class CoreCrypto {
 	reseedRng(seed: Uint8Array): Promise<void>;
 	/**
 	 * Initializes the proteus client
+	 *
+	 * @deprecated Create a transaction with {@link CoreCrypto.transaction}
+	 * and use {@link CoreCryptoContext.proteusInit} instead.
 	 */
 	proteusInit(): Promise<void>;
 	/**

package/platforms/web/corecrypto.js

@@ -187,7 +187,7 @@ function __wbg_adapter_54(arg0, arg1, arg2) {
   wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h5286e98832f56995(arg0, arg1, addHeapObject(arg2));
 }
 function __wbg_adapter_57(arg0, arg1, arg2) {
-  wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h4499f6ce9f25a86a(arg0, arg1, addHeapObject(arg2));
+  wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hc681a33fe1ead8b3(arg0, arg1, addHeapObject(arg2));
 }
 function __wbg_adapter_60(arg0, arg1, arg2) {
   wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h2e1bdf8eee89b946(arg0, arg1, addHeapObject(arg2));
@@ -245,22 +245,7 @@ function handleError(f, args) {
 function __wbg_adapter_512(arg0, arg1, arg2, arg3) {
   wasm.wasm_bindgen__convert__closures__invoke2_mut__h5d1db9fa3036c038(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
-var Ciphersuite = Object.freeze({
-  MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519: 1,
-  "1": "MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519",
-  MLS_128_DHKEMP256_AES128GCM_SHA256_P256: 2,
-  "2": "MLS_128_DHKEMP256_AES128GCM_SHA256_P256",
-  MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519: 3,
-  "3": "MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519",
-  MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448: 4,
-  "4": "MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448",
-  MLS_256_DHKEMP521_AES256GCM_SHA512_P521: 5,
-  "5": "MLS_256_DHKEMP521_AES256GCM_SHA512_P521",
-  MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448: 6,
-  "6": "MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448",
-  MLS_256_DHKEMP384_AES256GCM_SHA384_P384: 7,
-  "7": "MLS_256_DHKEMP384_AES256GCM_SHA384_P384"
-});
+var CoreCryptoLogLevel = Object.freeze({ Off: 1, "1": "Off", Trace: 2, "2": "Trace", Debug: 3, "3": "Debug", Info: 4, "4": "Info", Warn: 5, "5": "Warn", Error: 6, "6": "Error" });
 var DeviceStatus = Object.freeze({
   Valid: 1,
   "1": "Valid",
@@ -269,7 +254,6 @@ var DeviceStatus = Object.freeze({
   Revoked: 3,
   "3": "Revoked"
 });
-var CoreCryptoLogLevel = Object.freeze({ Off: 1, "1": "Off", Trace: 2, "2": "Trace", Debug: 3, "3": "Debug", Info: 4, "4": "Info", Warn: 5, "5": "Warn", Error: 6, "6": "Error" });
 var WirePolicy = Object.freeze({
   Plaintext: 1,
   "1": "Plaintext",
@@ -282,6 +266,22 @@ var CredentialType = Object.freeze({
   X509: 2,
   "2": "X509"
 });
+var Ciphersuite = Object.freeze({
+  MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519: 1,
+  "1": "MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519",
+  MLS_128_DHKEMP256_AES128GCM_SHA256_P256: 2,
+  "2": "MLS_128_DHKEMP256_AES128GCM_SHA256_P256",
+  MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519: 3,
+  "3": "MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519",
+  MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448: 4,
+  "4": "MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448",
+  MLS_256_DHKEMP521_AES256GCM_SHA512_P521: 5,
+  "5": "MLS_256_DHKEMP521_AES256GCM_SHA512_P521",
+  MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448: 6,
+  "6": "MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448",
+  MLS_256_DHKEMP384_AES256GCM_SHA384_P384: 7,
+  "7": "MLS_256_DHKEMP384_AES256GCM_SHA384_P384"
+});
 var AcmeChallengeFinalization = typeof FinalizationRegistry === "undefined" ? { register: () => {
 }, unregister: () => {
 } } : new FinalizationRegistry((ptr) => wasm.__wbg_acmechallenge_free(ptr >>> 0, 1));
@@ -870,10 +870,6 @@ class CoreCrypto {
     const ret = wasm.corecrypto_reseed_rng(this.__wbg_ptr, ptr0, len0);
     return takeObject(ret);
   }
-  proteus_init() {
-    const ret = wasm.corecrypto_proteus_init(this.__wbg_ptr);
-    return takeObject(ret);
-  }
   proteus_session_exists(session_id) {
     const ptr0 = passStringToWasm0(session_id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len0 = WASM_VECTOR_LEN;
@@ -1221,6 +1217,10 @@ class CoreCryptoContext {
     const ret = wasm.corecryptocontext_get_client_ids(this.__wbg_ptr, ptr0, len0);
     return takeObject(ret);
   }
+  proteus_init() {
+    const ret = wasm.corecryptocontext_proteus_init(this.__wbg_ptr);
+    return takeObject(ret);
+  }
   proteus_session_from_prekey(session_id, prekey) {
     const ptr0 = passStringToWasm0(session_id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len0 = WASM_VECTOR_LEN;
@@ -2178,10 +2178,6 @@ function __wbg_get_imports() {
   imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
     takeObject(arg0);
   };
-  imports.wbg.__wbg_newacmeauthz_new = function(arg0) {
-    const ret = NewAcmeAuthz.__wrap(arg0);
-    return addHeapObject(ret);
-  };
   imports.wbg.__wbg_ffiwiree2eidentity_new = function(arg0) {
     const ret = FfiWireE2EIdentity.__wrap(arg0);
     return addHeapObject(ret);
@@ -2190,15 +2186,7 @@ function __wbg_get_imports() {
     const ret = arg0;
     return addHeapObject(ret);
   };
-  imports.wbg.__wbg_newacmeorder_new = function(arg0) {
-    const ret = NewAcmeOrder.__wrap(arg0);
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbindgen_bigint_from_u64 = function(arg0) {
-    const ret = BigInt.asUintN(64, arg0);
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_execute_0b146cfd7fac1205 = function() {
+  imports.wbg.__wbg_execute_a85f95e9599e213e = function() {
     return handleError(function(arg0, arg1) {
       const ret = getObject(arg0).execute(CoreCryptoContext.__wrap(arg1));
       return addHeapObject(ret);
@@ -2208,14 +2196,26 @@ function __wbg_get_imports() {
     const ret = ProteusAutoPrekeyBundle.__wrap(arg0);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
-    const ret = getStringFromWasm0(arg0, arg1);
+  imports.wbg.__wbg_newacmeorder_new = function(arg0) {
+    const ret = NewAcmeOrder.__wrap(arg0);
     return addHeapObject(ret);
   };
   imports.wbg.__wbg_acmedirectory_new = function(arg0) {
     const ret = AcmeDirectory.__wrap(arg0);
     return addHeapObject(ret);
   };
+  imports.wbg.__wbg_newacmeauthz_new = function(arg0) {
+    const ret = NewAcmeAuthz.__wrap(arg0);
+    return addHeapObject(ret);
+  };
+  imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
+    const ret = getStringFromWasm0(arg0, arg1);
+    return addHeapObject(ret);
+  };
+  imports.wbg.__wbindgen_bigint_from_u64 = function(arg0) {
+    const ret = BigInt.asUintN(64, arg0);
+    return addHeapObject(ret);
+  };
   imports.wbg.__wbg_buffereddecryptedmessage_new = function(arg0) {
     const ret = BufferedDecryptedMessage.__wrap(arg0);
     return addHeapObject(ret);
@@ -2224,14 +2224,14 @@ function __wbg_get_imports() {
     const ret = CommitBundle.__wrap(arg0);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbg_corecrypto_new = function(arg0) {
-    const ret = CoreCrypto.__wrap(arg0);
-    return addHeapObject(ret);
-  };
   imports.wbg.__wbg_proposalbundle_new = function(arg0) {
     const ret = ProposalBundle.__wrap(arg0);
     return addHeapObject(ret);
   };
+  imports.wbg.__wbg_corecrypto_new = function(arg0) {
+    const ret = CoreCrypto.__wrap(arg0);
+    return addHeapObject(ret);
+  };
   imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
     const ret = getObject(arg0);
     return addHeapObject(ret);
@@ -2985,15 +2985,15 @@ function __wbg_get_imports() {
     const ret = v0;
     return addHeapObject(ret);
   };
-  imports.wbg.__wbindgen_closure_wrapper3708 = function(arg0, arg1, arg2) {
+  imports.wbg.__wbindgen_closure_wrapper3710 = function(arg0, arg1, arg2) {
     const ret = makeMutClosure(arg0, arg1, 899, __wbg_adapter_54);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbindgen_closure_wrapper13412 = function(arg0, arg1, arg2) {
+  imports.wbg.__wbindgen_closure_wrapper13415 = function(arg0, arg1, arg2) {
     const ret = makeMutClosure(arg0, arg1, 2169, __wbg_adapter_57);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbindgen_closure_wrapper15388 = function(arg0, arg1, arg2) {
+  imports.wbg.__wbindgen_closure_wrapper15391 = function(arg0, arg1, arg2) {
     const ret = makeMutClosure(arg0, arg1, 2396, __wbg_adapter_60);
     return addHeapObject(ret);
   };
@@ -3298,6 +3298,9 @@ class CoreCryptoContext2 {
   async randomBytes(length) {
     return await CoreCryptoError.asyncMapErr(this.#ctx.random_bytes(length));
   }
+  async proteusInit() {
+    return await CoreCryptoError.asyncMapErr(this.#ctx.proteus_init());
+  }
   async proteusSessionFromPrekey(sessionId, prekey) {
     return await CoreCryptoError.asyncMapErr(this.#ctx.proteus_session_from_prekey(sessionId, prekey));
   }
@@ -3650,21 +3653,20 @@ class CoreCrypto2 {
     let result;
     let error = null;
     try {
-      await this.#cc.transaction({
+      await CoreCryptoError.asyncMapErr(this.#cc.transaction({
         execute: async (ctx) => {
           try {
-            result = await callback(CoreCryptoContext2.fromFfiContext(ctx));
+            result = await CoreCryptoError.asyncMapErr(callback(CoreCryptoContext2.fromFfiContext(ctx)));
           } catch (e) {
-            if (e instanceof CoreCryptoError) {
-              error = e;
-            } else {
-              error = CoreCryptoError.fromStdError(e);
-            }
+            error = e;
             throw error;
           }
         }
-      });
-    } catch (_) {
+      }));
+    } catch (e) {
+      if (error === null) {
+        error = e;
+      }
     }
     if (error !== null) {
       throw error;
@@ -3797,7 +3799,7 @@ class CoreCrypto2 {
     return await CoreCryptoError.asyncMapErr(this.#cc.reseed_rng(seed));
   }
   async proteusInit() {
-    return await CoreCryptoError.asyncMapErr(this.#cc.proteus_init());
+    return await this.transaction(async (ctx) => await ctx.proteusInit());
   }
   async proteusSessionFromPrekey(sessionId, prekey) {
     return await this.transaction(async (ctx) => await ctx.proteusSessionFromPrekey(sessionId, prekey));