@wireapp/core-crypto 1.0.0-rc.54 → 1.0.0-rc.56

package/package.json

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

package/platforms/web/corecrypto.d.ts

@@ -516,6 +516,27 @@ export interface WireIdentity {
 	 * Unique client identifier
 	 */
 	clientId: string;
+	/**
+	 * Status of the Credential at the moment T when this object is created
+	 */
+	status: DeviceStatus;
+	/**
+	 * MLS thumbprint
+	 */
+	thumbprint: string;
+	/**
+	 * Indicates whether the credential is Basic or X509
+	 */
+	credentialType: CredentialType;
+	/**
+	 * In case {@link credentialType} is {@link CredentialType.X509} this is populated
+	 */
+	x509Identity?: X509Identity;
+}
+/**
+ * Represents the parts of {@link WireIdentity} that are specific to a X509 certificate (and not a Basic one).
+ */
+export interface X509Identity {
 	/**
 	 * User handle e.g. `john_wire`
 	 */
@@ -532,14 +553,6 @@ export interface WireIdentity {
 	 * X509 certificate identifying this client in the MLS group ; PEM encoded
 	 */
 	certificate: string;
-	/**
-	 * Status of the Credential at the moment T when this object is created
-	 */
-	status: DeviceStatus;
-	/**
-	 * MLS thumbprint
-	 */
-	thumbprint: string;
 	/**
 	 * X509 certificate serial number
 	 */

package/platforms/web/corecrypto.js

@@ -160,12 +160,12 @@ var makeMutClosure = function(arg0, arg1, dtor, f) {
   return real;
 };
 var __wbg_adapter_54 = function(arg0, arg1, arg2) {
-  wasm.wasm_bindgen__convert__closures__invoke1_mut__hca7d158ff12b0a1a(arg0, arg1, addHeapObject(arg2));
+  wasm.wasm_bindgen__convert__closures__invoke1_mut__hc7388107612c034b(arg0, arg1, addHeapObject(arg2));
 };
 var __wbg_adapter_57 = function(arg0, arg1, arg2) {
   try {
     const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-    wasm.wasm_bindgen__convert__closures__invoke1_mut__h35c7632f95579756(retptr, arg0, arg1, addHeapObject(arg2));
+    wasm.wasm_bindgen__convert__closures__invoke1_mut__h8d1dc8622972298a(retptr, arg0, arg1, addHeapObject(arg2));
     var r0 = getInt32Memory0()[retptr / 4 + 0];
     var r1 = getInt32Memory0()[retptr / 4 + 1];
     if (r1) {
@@ -235,8 +235,8 @@ var handleError = function(f, args) {
     wasm.__wbindgen_exn_store(addHeapObject(e));
   }
 };
-var __wbg_adapter_428 = function(arg0, arg1, arg2, arg3) {
-  wasm.wasm_bindgen__convert__closures__invoke2_mut__h58ce3c334379354d(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+var __wbg_adapter_430 = function(arg0, arg1, arg2, arg3) {
+  wasm.wasm_bindgen__convert__closures__invoke2_mut__h2bb6cfd8579029da(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 };
 async function __wbg_load(module, imports) {
   if (typeof Response === "function" && module instanceof Response) {
@@ -265,10 +265,6 @@ async function __wbg_load(module, imports) {
 var __wbg_get_imports = function() {
   const imports = {};
   imports.wbg = {};
-  imports.wbg.__wbg_newacmeorder_new = function(arg0) {
-    const ret = NewAcmeOrder.__wrap(arg0);
-    return addHeapObject(ret);
-  };
   imports.wbg.__wbindgen_number_new = function(arg0) {
     const ret = arg0;
     return addHeapObject(ret);
@@ -277,6 +273,18 @@ var __wbg_get_imports = function() {
     const ret = ProposalBundle.__wrap(arg0);
     return addHeapObject(ret);
   };
+  imports.wbg.__wbg_newacmeauthz_new = function(arg0) {
+    const ret = NewAcmeAuthz.__wrap(arg0);
+    return addHeapObject(ret);
+  };
+  imports.wbg.__wbg_buffereddecryptedmessage_new = function(arg0) {
+    const ret = BufferedDecryptedMessage.__wrap(arg0);
+    return addHeapObject(ret);
+  };
+  imports.wbg.__wbg_newacmeorder_new = function(arg0) {
+    const ret = NewAcmeOrder.__wrap(arg0);
+    return addHeapObject(ret);
+  };
   imports.wbg.__wbg_commitbundle_new = function(arg0) {
     const ret = CommitBundle.__wrap(arg0);
     return addHeapObject(ret);
@@ -288,38 +296,30 @@ var __wbg_get_imports = function() {
   imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
     takeObject(arg0);
   };
-  imports.wbg.__wbg_proteusautoprekeybundle_new = function(arg0) {
-    const ret = ProteusAutoPrekeyBundle.__wrap(arg0);
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_buffereddecryptedmessage_new = function(arg0) {
-    const ret = BufferedDecryptedMessage.__wrap(arg0);
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_newacmeauthz_new = function(arg0) {
-    const ret = NewAcmeAuthz.__wrap(arg0);
+  imports.wbg.__wbg_corecrypto_new = function(arg0) {
+    const ret = CoreCrypto.__wrap(arg0);
     return addHeapObject(ret);
   };
   imports.wbg.__wbg_ffiwiree2eidentity_new = function(arg0) {
     const ret = FfiWireE2EIdentity.__wrap(arg0);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbg_corecrypto_new = function(arg0) {
-    const ret = CoreCrypto.__wrap(arg0);
+  imports.wbg.__wbg_proteusautoprekeybundle_new = function(arg0) {
+    const ret = ProteusAutoPrekeyBundle.__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);
   };
+  imports.wbg.__wbindgen_bigint_from_u64 = function(arg0) {
+    const ret = BigInt.asUintN(64, arg0);
+    return addHeapObject(ret);
+  };
   imports.wbg.__wbindgen_is_undefined = function(arg0) {
     const ret = getObject(arg0) === undefined;
     return ret;
@@ -659,19 +659,19 @@ var __wbg_get_imports = function() {
   imports.wbg.__wbg_warn_63bbae1730aead09 = function(arg0) {
     console.warn(getObject(arg0));
   };
-  imports.wbg.__wbg_crypto_d05b68a3572bb8ca = function(arg0) {
+  imports.wbg.__wbg_crypto_566d7465cdbb6b7a = function(arg0) {
     const ret = getObject(arg0).crypto;
     return addHeapObject(ret);
   };
-  imports.wbg.__wbg_process_b02b3570280d0366 = function(arg0) {
+  imports.wbg.__wbg_process_dc09a8c7d59982f6 = function(arg0) {
     const ret = getObject(arg0).process;
     return addHeapObject(ret);
   };
-  imports.wbg.__wbg_versions_c1cb42213cedf0f5 = function(arg0) {
+  imports.wbg.__wbg_versions_d98c6400c6ca2bd8 = function(arg0) {
     const ret = getObject(arg0).versions;
     return addHeapObject(ret);
   };
-  imports.wbg.__wbg_node_43b1089f407e4ec2 = function(arg0) {
+  imports.wbg.__wbg_node_caaf83d002149bd5 = function(arg0) {
     const ret = getObject(arg0).node;
     return addHeapObject(ret);
   };
@@ -679,22 +679,22 @@ var __wbg_get_imports = function() {
     const ret = typeof getObject(arg0) === "string";
     return ret;
   };
-  imports.wbg.__wbg_require_9a7e0f667ead4995 = function() {
+  imports.wbg.__wbg_require_94a9da52636aacbf = function() {
     return handleError(function() {
       const ret = module_core_crypto_ffi.require;
       return addHeapObject(ret);
     }, arguments);
   };
-  imports.wbg.__wbg_msCrypto_10fc94afee92bd76 = function(arg0) {
+  imports.wbg.__wbg_msCrypto_0b84745e9245cdf6 = function(arg0) {
     const ret = getObject(arg0).msCrypto;
     return addHeapObject(ret);
   };
-  imports.wbg.__wbg_randomFillSync_b70ccbdf4926a99d = function() {
+  imports.wbg.__wbg_randomFillSync_290977693942bf03 = function() {
     return handleError(function(arg0, arg1) {
       getObject(arg0).randomFillSync(takeObject(arg1));
     }, arguments);
   };
-  imports.wbg.__wbg_getRandomValues_7e42b4fb8779dc6d = function() {
+  imports.wbg.__wbg_getRandomValues_260cc23a41afad9a = function() {
     return handleError(function(arg0, arg1) {
       getObject(arg0).getRandomValues(getObject(arg1));
     }, arguments);
@@ -899,7 +899,7 @@ var __wbg_get_imports = function() {
         const a = state0.a;
         state0.a = 0;
         try {
-          return __wbg_adapter_428(a, state0.b, arg02, arg12);
+          return __wbg_adapter_430(a, state0.b, arg02, arg12);
         } finally {
           state0.a = a;
         }
@@ -979,12 +979,12 @@ var __wbg_get_imports = function() {
     const ret = wasm.memory;
     return addHeapObject(ret);
   };
-  imports.wbg.__wbindgen_closure_wrapper2667 = function(arg0, arg1, arg2) {
+  imports.wbg.__wbindgen_closure_wrapper2676 = function(arg0, arg1, arg2) {
     const ret = makeMutClosure(arg0, arg1, 667, __wbg_adapter_54);
     return addHeapObject(ret);
   };
-  imports.wbg.__wbindgen_closure_wrapper13314 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 2205, __wbg_adapter_57);
+  imports.wbg.__wbindgen_closure_wrapper13244 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 2142, __wbg_adapter_57);
     return addHeapObject(ret);
   };
   return imports;
@@ -1051,18 +1051,6 @@ var CLOSURE_DTORS = typeof FinalizationRegistry === "undefined" ? { register: ()
 });
 var cachedUint32Memory0 = null;
 var cachedUint16Memory0 = null;
-var WirePolicy = Object.freeze({
-  Plaintext: 1,
-  "1": "Plaintext",
-  Ciphertext: 2,
-  "2": "Ciphertext"
-});
-var CredentialType = Object.freeze({
-  Basic: 1,
-  "1": "Basic",
-  X509: 2,
-  "2": "X509"
-});
 var DeviceStatus = Object.freeze({
   Valid: 1,
   "1": "Valid",
@@ -1089,6 +1077,18 @@ var Ciphersuite = Object.freeze({
   MLS_128_X25519KYBER768DRAFT00_AES128GCM_SHA256_Ed25519: 61489,
   "61489": "MLS_128_X25519KYBER768DRAFT00_AES128GCM_SHA256_Ed25519"
 });
+var WirePolicy = Object.freeze({
+  Plaintext: 1,
+  "1": "Plaintext",
+  Ciphertext: 2,
+  "2": "Ciphertext"
+});
+var CredentialType = Object.freeze({
+  Basic: 1,
+  "1": "Basic",
+  X509: 2,
+  "2": "X509"
+});
 var AcmeChallengeFinalization = typeof FinalizationRegistry === "undefined" ? { register: () => {
 }, unregister: () => {
 } } : new FinalizationRegistry((ptr) => wasm.__wbg_acmechallenge_free(ptr >>> 0));
@@ -1299,7 +1299,7 @@ class BufferedDecryptedMessage {
   }
   get identity() {
     const ret = wasm.buffereddecryptedmessage_identity(this.__wbg_ptr);
-    return ret === 0 ? undefined : WireIdentity.__wrap(ret);
+    return WireIdentity.__wrap(ret);
   }
   get crl_new_distribution_points() {
     const ret = wasm.buffereddecryptedmessage_crl_new_distribution_points(this.__wbg_ptr);
@@ -2447,12 +2447,16 @@ class WireIdentity {
       wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
     }
   }
-  get handle() {
+  get status() {
+    const ret = wasm.wireidentity_status(this.__wbg_ptr);
+    return ret;
+  }
+  get thumbprint() {
     let deferred1_0;
     let deferred1_1;
     try {
       const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-      wasm.wireidentity_handle(retptr, this.__wbg_ptr);
+      wasm.wireidentity_thumbprint(retptr, this.__wbg_ptr);
       var r0 = getInt32Memory0()[retptr / 4 + 0];
       var r1 = getInt32Memory0()[retptr / 4 + 1];
       deferred1_0 = r0;
@@ -2463,12 +2467,43 @@ class WireIdentity {
       wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
     }
   }
-  get display_name() {
+  get credential_type() {
+    const ret = wasm.wireidentity_credential_type(this.__wbg_ptr);
+    return ret;
+  }
+  get x509_identity() {
+    const ret = wasm.wireidentity_x509_identity(this.__wbg_ptr);
+    return ret === 0 ? undefined : X509Identity.__wrap(ret);
+  }
+}
+var X509IdentityFinalization = typeof FinalizationRegistry === "undefined" ? { register: () => {
+}, unregister: () => {
+} } : new FinalizationRegistry((ptr) => wasm.__wbg_x509identity_free(ptr >>> 0));
+
+class X509Identity {
+  static __wrap(ptr) {
+    ptr = ptr >>> 0;
+    const obj = Object.create(X509Identity.prototype);
+    obj.__wbg_ptr = ptr;
+    X509IdentityFinalization.register(obj, obj.__wbg_ptr, obj);
+    return obj;
+  }
+  __destroy_into_raw() {
+    const ptr = this.__wbg_ptr;
+    this.__wbg_ptr = 0;
+    X509IdentityFinalization.unregister(this);
+    return ptr;
+  }
+  free() {
+    const ptr = this.__destroy_into_raw();
+    wasm.__wbg_x509identity_free(ptr);
+  }
+  get handle() {
     let deferred1_0;
     let deferred1_1;
     try {
       const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-      wasm.wireidentity_display_name(retptr, this.__wbg_ptr);
+      wasm.x509identity_handle(retptr, this.__wbg_ptr);
       var r0 = getInt32Memory0()[retptr / 4 + 0];
       var r1 = getInt32Memory0()[retptr / 4 + 1];
       deferred1_0 = r0;
@@ -2479,12 +2514,12 @@ class WireIdentity {
       wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
     }
   }
-  get domain() {
+  get display_name() {
     let deferred1_0;
     let deferred1_1;
     try {
       const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-      wasm.wireidentity_domain(retptr, this.__wbg_ptr);
+      wasm.x509identity_display_name(retptr, this.__wbg_ptr);
       var r0 = getInt32Memory0()[retptr / 4 + 0];
       var r1 = getInt32Memory0()[retptr / 4 + 1];
       deferred1_0 = r0;
@@ -2495,12 +2530,12 @@ class WireIdentity {
       wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
     }
   }
-  get certificate() {
+  get domain() {
     let deferred1_0;
     let deferred1_1;
     try {
       const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-      wasm.wireidentity_certificate(retptr, this.__wbg_ptr);
+      wasm.x509identity_domain(retptr, this.__wbg_ptr);
       var r0 = getInt32Memory0()[retptr / 4 + 0];
       var r1 = getInt32Memory0()[retptr / 4 + 1];
       deferred1_0 = r0;
@@ -2511,16 +2546,12 @@ class WireIdentity {
       wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
     }
   }
-  get status() {
-    const ret = wasm.wireidentity_status(this.__wbg_ptr);
-    return ret;
-  }
-  get thumbprint() {
+  get certificate() {
     let deferred1_0;
     let deferred1_1;
     try {
       const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-      wasm.wireidentity_thumbprint(retptr, this.__wbg_ptr);
+      wasm.x509identity_certificate(retptr, this.__wbg_ptr);
       var r0 = getInt32Memory0()[retptr / 4 + 0];
       var r1 = getInt32Memory0()[retptr / 4 + 1];
       deferred1_0 = r0;
@@ -2536,7 +2567,7 @@ class WireIdentity {
     let deferred1_1;
     try {
       const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-      wasm.wireidentity_serial_number(retptr, this.__wbg_ptr);
+      wasm.x509identity_serial_number(retptr, this.__wbg_ptr);
       var r0 = getInt32Memory0()[retptr / 4 + 0];
       var r1 = getInt32Memory0()[retptr / 4 + 1];
       deferred1_0 = r0;
@@ -2548,11 +2579,11 @@ class WireIdentity {
     }
   }
   get not_before() {
-    const ret = wasm.wireidentity_not_before(this.__wbg_ptr);
+    const ret = wasm.x509identity_not_before(this.__wbg_ptr);
     return BigInt.asUintN(64, ret);
   }
   get not_after() {
-    const ret = wasm.wireidentity_not_after(this.__wbg_ptr);
+    const ret = wasm.x509identity_not_after(this.__wbg_ptr);
     return BigInt.asUintN(64, ret);
   }
 }
@@ -2643,12 +2674,21 @@ var mapWireIdentity = (ffiIdentity) => {
   }
   return {
     clientId: ffiIdentity.client_id,
+    status: DeviceStatus2[ffiIdentity.status],
+    thumbprint: ffiIdentity.thumbprint,
+    credentialType: CredentialType2[ffiIdentity.credential_type],
+    x509Identity: mapX509Identity(ffiIdentity.x509_identity)
+  };
+};
+var mapX509Identity = (ffiIdentity) => {
+  if (!ffiIdentity) {
+    return;
+  }
+  return {
     handle: ffiIdentity.handle,
     displayName: ffiIdentity.display_name,
     domain: ffiIdentity.domain,
     certificate: ffiIdentity.certificate,
-    status: DeviceStatus2[ffiIdentity.status],
-    thumbprint: ffiIdentity.thumbprint,
     serialNumber: ffiIdentity.serial_number,
     notBefore: ffiIdentity.not_before,
     notAfter: ffiIdentity.not_after