@vex-chat/libvex 5.4.0 → 5.5.1

package/src/utils/fipsMailExtra.ts

@@ -14,58 +14,6 @@ const FIPS_SUBSEQUENT_V1: readonly [number, number, number] = [
     0xf1, 0x03, 0x01,
 ] as const;
 
-function u16be(n: number): [number, number] {
-    if (!Number.isInteger(n) || n < 0 || n > 65535) {
-        throw new Error(`FIPS: invalid u16 length: ${String(n)}`);
-    }
-    return [n >> 8, n & 0xff];
-}
-
-function u16read(buf: Uint8Array, offset: number): number {
-    if (offset + 2 > buf.length) {
-        return -1;
-    }
-    return ((buf[offset] ?? 0) * 256 + (buf[offset + 1] ?? 0)) >>> 0;
-}
-
-export function isFipsInitialExtraV1(buf: Uint8Array): boolean {
-    return (
-        buf.length >= 3 &&
-        buf[0] === FIPS_INITIAL_EXTRA_V1[0] &&
-        buf[1] === FIPS_INITIAL_EXTRA_V1[1] &&
-        buf[2] === FIPS_INITIAL_EXTRA_V1[2]
-    );
-}
-
-/**
- * P-256 fips (Web Crypto) initial mail `extra` bytes (version 1). Length-prefixed segments
- * (variable lengths) plus a 6-byte OTK index, AD length includes both identity raw publics.
- */
-export function encodeFipsInitialExtraV1(
-    signPub: Uint8Array,
-    ephPub: Uint8Array,
-    pk: Uint8Array,
-    ad: Uint8Array,
-    index6: Uint8Array,
-): Uint8Array {
-    if (index6.length !== 6) {
-        throw new Error("FIPS: OTK index must be 6 bytes.");
-    }
-    const a = (len: number) => new Uint8Array([...u16be(len)]);
-    return xConcat(
-        Uint8Array.from([...FIPS_INITIAL_EXTRA_V1]),
-        a(signPub.length),
-        signPub,
-        a(ephPub.length),
-        ephPub,
-        a(pk.length),
-        pk,
-        a(ad.length),
-        ad,
-        index6,
-    );
-}
-
 /**
  * @returns [signKey, ephKey, ad, index6] (Uint8Array slices, index is always length 6)
  */
@@ -105,12 +53,47 @@ export function decodeFipsInitialExtraV1(
     return [signKey, ephKey, ad, index6];
 }
 
-export function isFipsSubsequentExtraV1(buf: Uint8Array): boolean {
-    return (
-        buf.length >= 3 &&
-        buf[0] === FIPS_SUBSEQUENT_V1[0] &&
-        buf[1] === FIPS_SUBSEQUENT_V1[1] &&
-        buf[2] === FIPS_SUBSEQUENT_V1[2]
+export function decodeFipsSubsequentExtraV1(extra: Uint8Array): Uint8Array {
+    if (!isFipsSubsequentExtraV1(extra)) {
+        throw new Error("FIPS: not a v1 subsequent extra.");
+    }
+    const len = u16read(extra, 3);
+    if (len < 0) {
+        throw new Error("FIPS: bad subsequent extra length field.");
+    }
+    const p = 5;
+    if (p + len > extra.length) {
+        throw new Error("FIPS: subsequent extra truncated.");
+    }
+    return extra.subarray(p, p + len);
+}
+
+/**
+ * P-256 fips (Web Crypto) initial mail `extra` bytes (version 1). Length-prefixed segments
+ * (variable lengths) plus a 6-byte OTK index, AD length includes both identity raw publics.
+ */
+export function encodeFipsInitialExtraV1(
+    signPub: Uint8Array,
+    ephPub: Uint8Array,
+    pk: Uint8Array,
+    ad: Uint8Array,
+    index6: Uint8Array,
+): Uint8Array {
+    if (index6.length !== 6) {
+        throw new Error("FIPS: OTK index must be 6 bytes.");
+    }
+    const a = (len: number) => new Uint8Array([...u16be(len)]);
+    return xConcat(
+        Uint8Array.from([...FIPS_INITIAL_EXTRA_V1]),
+        a(signPub.length),
+        signPub,
+        a(ephPub.length),
+        ephPub,
+        a(pk.length),
+        pk,
+        a(ad.length),
+        ad,
+        index6,
     );
 }
 
@@ -130,28 +113,6 @@ export function encodeFipsSubsequentExtraV1(
     );
 }
 
-export function decodeFipsSubsequentExtraV1(extra: Uint8Array): Uint8Array {
-    if (!isFipsSubsequentExtraV1(extra)) {
-        throw new Error("FIPS: not a v1 subsequent extra.");
-    }
-    const len = u16read(extra, 3);
-    if (len < 0) {
-        throw new Error("FIPS: bad subsequent extra length field.");
-    }
-    const p = 5;
-    if (p + len > extra.length) {
-        throw new Error("FIPS: subsequent extra truncated.");
-    }
-    return extra.subarray(p, p + len);
-}
-
-/** P-256: message bytes signed to bind a prekey (FIPS) — 1-byte tag + uncompressed public. */
-export function fipsP256PreKeySignPayload(
-    preKeyRawPublic: Uint8Array,
-): Uint8Array {
-    return xConcat(new Uint8Array([0xa1]), preKeyRawPublic);
-}
-
 /**
  * P-256 identity AD: concatenation of our and their P-256 ECDH identity publics (uncompressed, 65B each if standard).
  * Used instead of `xEncode` + X25519 for FIPS.
@@ -162,3 +123,42 @@ export function fipsP256AdFromIdentityPubs(
 ): Uint8Array {
     return xConcat(ourIdentityRaw, theirIdentityFromBundle);
 }
+
+/** P-256: message bytes signed to bind a prekey (FIPS) — 1-byte tag + uncompressed public. */
+export function fipsP256PreKeySignPayload(
+    preKeyRawPublic: Uint8Array,
+): Uint8Array {
+    return xConcat(new Uint8Array([0xa1]), preKeyRawPublic);
+}
+
+export function isFipsInitialExtraV1(buf: Uint8Array): boolean {
+    return (
+        buf.length >= 3 &&
+        buf[0] === FIPS_INITIAL_EXTRA_V1[0] &&
+        buf[1] === FIPS_INITIAL_EXTRA_V1[1] &&
+        buf[2] === FIPS_INITIAL_EXTRA_V1[2]
+    );
+}
+
+export function isFipsSubsequentExtraV1(buf: Uint8Array): boolean {
+    return (
+        buf.length >= 3 &&
+        buf[0] === FIPS_SUBSEQUENT_V1[0] &&
+        buf[1] === FIPS_SUBSEQUENT_V1[1] &&
+        buf[2] === FIPS_SUBSEQUENT_V1[2]
+    );
+}
+
+function u16be(n: number): [number, number] {
+    if (!Number.isInteger(n) || n < 0 || n > 65535) {
+        throw new Error(`FIPS: invalid u16 length: ${String(n)}`);
+    }
+    return [n >> 8, n & 0xff];
+}
+
+function u16read(buf: Uint8Array, offset: number): number {
+    if (offset + 2 > buf.length) {
+        return -1;
+    }
+    return ((buf[offset] ?? 0) * 256 + (buf[offset + 1] ?? 0)) >>> 0;
+}

package/src/utils/resolveAtRestAesKey.ts

@@ -7,9 +7,9 @@
 import {
     type CryptoProfile,
     xEcdhKeyPairFromEcdsaKeyPairAsync,
+    XKeyConvert,
     xSignKeyPairFromSecret,
     xSignKeyPairFromSecretAsync,
-    XKeyConvert,
     XUtils,
 } from "@vex-chat/crypto";