@vex-chat/libvex 9.1.1 → 10.0.0

package/src/utils/verifyKeyBundle.ts

@@ -4,11 +4,9 @@
  * Commercial licenses available at vex.wtf
  */
 
-import type { CryptoProfile } from "@vex-chat/crypto";
 import type { Device, KeyBundle, KeyBundleEntry } from "@vex-chat/types";
 
 import {
-    fipsEcdhRawPublicKeyFromEcdsaSpkiAsync,
     xPreKeySignaturePayload,
     xSignOpenAsync,
     XUtils,
@@ -17,15 +15,10 @@ import {
 export async function verifyKeyBundleSignatures(
     keyBundle: KeyBundle,
     device: Device,
-    cryptoProfile: CryptoProfile,
 ): Promise<void> {
     const deviceSignKey = XUtils.decodeHex(device.signKey);
-    const expectedIdentity =
-        cryptoProfile === "fips"
-            ? await fipsEcdhRawPublicKeyFromEcdsaSpkiAsync(deviceSignKey)
-            : deviceSignKey;
 
-    if (!XUtils.bytesEqual(expectedIdentity, keyBundle.signKey)) {
+    if (!XUtils.bytesEqual(deviceSignKey, keyBundle.signKey)) {
         throw new Error("Key bundle identity key does not match device.");
     }
 
@@ -33,7 +26,6 @@ export async function verifyKeyBundleSignatures(
         keyBundle.preKey,
         device,
         deviceSignKey,
-        cryptoProfile,
         "signed",
     );
 
@@ -42,7 +34,6 @@ export async function verifyKeyBundleSignatures(
             keyBundle.otk,
             device,
             deviceSignKey,
-            cryptoProfile,
             "one-time",
         );
     }
@@ -52,7 +43,6 @@ async function verifyKeyBundleEntrySignature(
     entry: KeyBundleEntry,
     device: Device,
     deviceSignKey: Uint8Array,
-    cryptoProfile: CryptoProfile,
     kind: "one-time" | "signed",
 ): Promise<void> {
     if (entry.deviceID !== device.deviceID) {
@@ -61,11 +51,7 @@ async function verifyKeyBundleEntrySignature(
         );
     }
 
-    const payload = xPreKeySignaturePayload(
-        entry.publicKey,
-        kind,
-        cryptoProfile,
-    );
+    const payload = xPreKeySignaturePayload(entry.publicKey, kind);
     const opened = await xSignOpenAsync(entry.signature, deviceSignKey);
 
     if (!opened || !XUtils.bytesEqual(opened, payload)) {

package/dist/utils/fipsMailExtra.d.ts

@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2020-2026 Vex Heavy Industries LLC
- * Licensed under AGPL-3.0. See LICENSE for details.
- * Commercial licenses available at vex.wtf
- */
-export declare const FIPS_INITIAL_EXTRA_V1: readonly [number, number, number];
-/**
- * @returns [signKey, ephKey, ad, index6] (Uint8Array slices, index is always length 6)
- */
-export declare function decodeFipsInitialExtraV1(extra: Uint8Array): [Uint8Array, Uint8Array, Uint8Array, Uint8Array];
-export declare function decodeFipsSubsequentExtraV1(extra: Uint8Array): Uint8Array;
-/**
- * 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 declare function encodeFipsInitialExtraV1(signPub: Uint8Array, ephPub: Uint8Array, pk: Uint8Array, ad: Uint8Array, index6: Uint8Array): Uint8Array;
-/**
- * P-256 fips subsequent mail: session lookup key (variable, typically 65B uncompressed ECDH public).
- */
-export declare function encodeFipsSubsequentExtraV1(sessionPub: Uint8Array): Uint8Array;
-/**
- * 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.
- */
-export declare function fipsP256AdFromIdentityPubs(ourIdentityRaw: Uint8Array, theirIdentityFromBundle: Uint8Array): Uint8Array;
-/** P-256: message bytes signed to bind a prekey (FIPS) — 1-byte tag + uncompressed public. */
-export declare function fipsP256PreKeySignPayload(preKeyRawPublic: Uint8Array): Uint8Array;
-export declare function isFipsInitialExtraV1(buf: Uint8Array): boolean;
-export declare function isFipsSubsequentExtraV1(buf: Uint8Array): boolean;
-//# sourceMappingURL=fipsMailExtra.d.ts.map

package/dist/utils/fipsMailExtra.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fipsMailExtra.d.ts","sourceRoot":"","sources":["../../src/utils/fipsMailExtra.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,eAAO,MAAM,qBAAqB,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAE1D,CAAC;AAMX;;GAEG;AACH,wBAAgB,wBAAwB,CACpC,KAAK,EAAE,UAAU,GAClB,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAgClD;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAazE;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACpC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,UAAU,EAClB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,UAAU,GACnB,UAAU,CAiBZ;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACvC,UAAU,EAAE,UAAU,GACvB,UAAU,CASZ;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACtC,cAAc,EAAE,UAAU,EAC1B,uBAAuB,EAAE,UAAU,GACpC,UAAU,CAEZ;AAED,8FAA8F;AAC9F,wBAAgB,yBAAyB,CACrC,eAAe,EAAE,UAAU,GAC5B,UAAU,CAEZ;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAO7D;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAOhE"}

package/dist/utils/fipsMailExtra.js

@@ -1,114 +0,0 @@
-/**
- * Copyright (c) 2020-2026 Vex Heavy Industries LLC
- * Licensed under AGPL-3.0. See LICENSE for details.
- * Commercial licenses available at vex.wtf
- */
-import { xConcat } from "@vex-chat/crypto";
-export const FIPS_INITIAL_EXTRA_V1 = [
-    0xf1, 0x02, 0x01,
-];
-const FIPS_SUBSEQUENT_V1 = [
-    0xf1, 0x03, 0x01,
-];
-/**
- * @returns [signKey, ephKey, ad, index6] (Uint8Array slices, index is always length 6)
- */
-export function decodeFipsInitialExtraV1(extra) {
-    if (!isFipsInitialExtraV1(extra)) {
-        throw new Error("FIPS: not a v1 initial extra payload.");
-    }
-    let p = 3;
-    const readSeg = (label) => {
-        const len = u16read(extra, p);
-        if (len < 0) {
-            throw new Error(`FIPS: extra too short (need len for ${label} at ${String(p)}).`);
-        }
-        p += 2;
-        if (p + len > extra.length) {
-            throw new Error(`FIPS: truncated ${label} segment (need ${String(len + p)} but got ${String(extra.length)}).`);
-        }
-        const seg = extra.subarray(p, p + len);
-        p += len;
-        return seg;
-    };
-    const signKey = readSeg("sign");
-    const ephKey = readSeg("eph");
-    const _pk = readSeg("PK");
-    const ad = readSeg("ad");
-    void _pk; // not required for DH / open (matches tweetnacl extra layout)
-    if (p + 6 > extra.length) {
-        throw new Error("FIPS: missing 6-byte OTK index at end of extra.");
-    }
-    const index6 = extra.subarray(p, p + 6);
-    return [signKey, ephKey, ad, index6];
-}
-export function decodeFipsSubsequentExtraV1(extra) {
-    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, ephPub, pk, ad, index6) {
-    if (index6.length !== 6) {
-        throw new Error("FIPS: OTK index must be 6 bytes.");
-    }
-    const a = (len) => 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);
-}
-/**
- * P-256 fips subsequent mail: session lookup key (variable, typically 65B uncompressed ECDH public).
- */
-export function encodeFipsSubsequentExtraV1(sessionPub) {
-    if (sessionPub.length > 65535) {
-        throw new Error("FIPS: session public key is too long.");
-    }
-    return xConcat(Uint8Array.from([...FIPS_SUBSEQUENT_V1]), new Uint8Array([...u16be(sessionPub.length)]), sessionPub);
-}
-/**
- * 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.
- */
-export function fipsP256AdFromIdentityPubs(ourIdentityRaw, theirIdentityFromBundle) {
-    return xConcat(ourIdentityRaw, theirIdentityFromBundle);
-}
-/** P-256: message bytes signed to bind a prekey (FIPS) — 1-byte tag + uncompressed public. */
-export function fipsP256PreKeySignPayload(preKeyRawPublic) {
-    return xConcat(new Uint8Array([0xa1]), preKeyRawPublic);
-}
-export function isFipsInitialExtraV1(buf) {
-    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) {
-    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) {
-    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, offset) {
-    if (offset + 2 > buf.length) {
-        return -1;
-    }
-    return ((buf[offset] ?? 0) * 256 + (buf[offset + 1] ?? 0)) >>> 0;
-}
-//# sourceMappingURL=fipsMailExtra.js.map

package/dist/utils/fipsMailExtra.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fipsMailExtra.js","sourceRoot":"","sources":["../../src/utils/fipsMailExtra.ts"],"names":[],"mappings":"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"}

package/src/utils/fipsMailExtra.ts

@@ -1,164 +0,0 @@
-/**
- * Copyright (c) 2020-2026 Vex Heavy Industries LLC
- * Licensed under AGPL-3.0. See LICENSE for details.
- * Commercial licenses available at vex.wtf
- */
-
-import { xConcat } from "@vex-chat/crypto";
-
-export const FIPS_INITIAL_EXTRA_V1: readonly [number, number, number] = [
-    0xf1, 0x02, 0x01,
-] as const;
-
-const FIPS_SUBSEQUENT_V1: readonly [number, number, number] = [
-    0xf1, 0x03, 0x01,
-] as const;
-
-/**
- * @returns [signKey, ephKey, ad, index6] (Uint8Array slices, index is always length 6)
- */
-export function decodeFipsInitialExtraV1(
-    extra: Uint8Array,
-): [Uint8Array, Uint8Array, Uint8Array, Uint8Array] {
-    if (!isFipsInitialExtraV1(extra)) {
-        throw new Error("FIPS: not a v1 initial extra payload.");
-    }
-    let p = 3;
-    const readSeg = (label: string) => {
-        const len = u16read(extra, p);
-        if (len < 0) {
-            throw new Error(
-                `FIPS: extra too short (need len for ${label} at ${String(p)}).`,
-            );
-        }
-        p += 2;
-        if (p + len > extra.length) {
-            throw new Error(
-                `FIPS: truncated ${label} segment (need ${String(len + p)} but got ${String(extra.length)}).`,
-            );
-        }
-        const seg = extra.subarray(p, p + len);
-        p += len;
-        return seg;
-    };
-    const signKey = readSeg("sign");
-    const ephKey = readSeg("eph");
-    const _pk = readSeg("PK");
-    const ad = readSeg("ad");
-    void _pk; // not required for DH / open (matches tweetnacl extra layout)
-    if (p + 6 > extra.length) {
-        throw new Error("FIPS: missing 6-byte OTK index at end of extra.");
-    }
-    const index6 = extra.subarray(p, p + 6);
-    return [signKey, ephKey, ad, index6];
-}
-
-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,
-    );
-}
-
-/**
- * P-256 fips subsequent mail: session lookup key (variable, typically 65B uncompressed ECDH public).
- */
-export function encodeFipsSubsequentExtraV1(
-    sessionPub: Uint8Array,
-): Uint8Array {
-    if (sessionPub.length > 65535) {
-        throw new Error("FIPS: session public key is too long.");
-    }
-    return xConcat(
-        Uint8Array.from([...FIPS_SUBSEQUENT_V1]),
-        new Uint8Array([...u16be(sessionPub.length)]),
-        sessionPub,
-    );
-}
-
-/**
- * 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.
- */
-export function fipsP256AdFromIdentityPubs(
-    ourIdentityRaw: Uint8Array,
-    theirIdentityFromBundle: Uint8Array,
-): 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;
-}