raz-encrypt 1.1.0 → 2.1.0

package/dist/store.js

@@ -1,14 +1,92 @@
+import { gcm } from "@noble/ciphers/aes.js";
+import { equalBytes } from "@noble/ciphers/utils.js";
+import { hkdf } from "@noble/hashes/hkdf.js";
+import { hmac } from "@noble/hashes/hmac.js";
 import { sha384 } from "@noble/hashes/sha2.js";
-import { bytesToHex, utf8ToBytes } from "@noble/hashes/utils.js";
+import { bytesToHex, concatBytes, hexToBytes, randomBytes, utf8ToBytes } from "@noble/hashes/utils.js";
 import { appendFile, mkdir, readFile } from "node:fs/promises";
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 import { canonicalize } from "./canonicalJson.js";
+import { writeFileAtomic } from "./fileCrypto.js";
+function isV2Entry(entry) {
+    return entry.version === 2;
+}
+function stripChainFields(entry) {
+    const { prevMac: _prevMac, mac: _mac, ...rest } = entry;
+    return rest;
+}
 const GENESIS_HASH = "GENESIS";
+const AUDIT_LOG_HMAC_INFO = utf8ToBytes("raz-encrypt-audit-log-v1|hmac-key");
+// A separate key for the head record, so a head MAC can never be mistaken for an entry MAC (ADR 0019).
+const AUDIT_LOG_HEAD_INFO = utf8ToBytes("raz-encrypt-audit-log-v1|head-hmac-key");
+// A separate key from both MAC keys above, same reasoning (ADR 0027) — never derived from a passphrase, since appendLogEntry/readLog only ever receive an Identity.
+const AUDIT_LOG_ENC_INFO = utf8ToBytes("raz-encrypt-audit-log-v1|enc-key");
 function logFilePath(storageDir) {
     return join(storageDir, "log.jsonl");
 }
-function computeHash(entry) {
-    return bytesToHex(sha384(utf8ToBytes(canonicalize(entry))));
+function headFilePath(storageDir) {
+    return join(storageDir, "log.head.json");
+}
+/**
+ * HKDF-derived from BOTH the classical and PQC signing secrets (concatenated,
+ * same composition pattern as hybrid.ts's deriveHybridKey) — matching this
+ * library's hybrid posture everywhere else: compromising either secret key
+ * alone must not be enough to forge the chain. Recomputed fresh on every
+ * call, never persisted (ADR 0009).
+ */
+function deriveAuditLogKey(identity) {
+    return hkdf(sha384, concatBytes(identity.classical.secretKey, identity.pqcSign.secretKey), undefined, AUDIT_LOG_HMAC_INFO, 32);
+}
+/**
+ * Keyed with deriveAuditLogKey — plain SHA-384 (ADR 0009's rejected
+ * approach) lets anyone with filesystem write access to log.jsonl forge the
+ * whole chain with no knowledge of the Identity's secret material at all.
+ * HMAC means forging it requires that secret. Generic over the entry's own
+ * shape (v1 plaintext fields, or v2's `{version,nonce,ciphertext}` — issue
+ * #43) since `canonicalize` doesn't care which fields are present; the chain
+ * mechanism itself never changes, only the bytes it authenticates.
+ */
+function computeMac(identity, entry) {
+    return bytesToHex(hmac(sha384, deriveAuditLogKey(identity), utf8ToBytes(canonicalize(entry))));
+}
+/** Same derivation shape as deriveAuditLogKey, under its own info label (ADR 0027). */
+function deriveAuditLogEncKey(identity) {
+    return hkdf(sha384, concatBytes(identity.classical.secretKey, identity.pqcSign.secretKey), undefined, AUDIT_LOG_ENC_INFO, 32);
+}
+/** Associated data for an entry's content AEAD: binds the ciphertext to its format version and its own nonce, same pattern as fileCrypto.ts's headerAad. */
+function entryAad(nonce) {
+    return utf8ToBytes(canonicalize({ version: 2, nonce }));
+}
+function encryptEntryContent(identity, content) {
+    const nonceBytes = randomBytes(12);
+    const nonce = bytesToHex(nonceBytes);
+    const ciphertext = gcm(deriveAuditLogEncKey(identity), nonceBytes, entryAad(nonce)).encrypt(utf8ToBytes(canonicalize(content)));
+    return { nonce, ciphertext: bytesToHex(ciphertext) };
+}
+/** Throws (never returns something un-decrypted) if the entry doesn't authenticate under this identity's key. */
+function decryptEntryContent(identity, entry) {
+    try {
+        const plaintext = gcm(deriveAuditLogEncKey(identity), hexToBytes(entry.nonce), entryAad(entry.nonce)).decrypt(hexToBytes(entry.ciphertext));
+        return JSON.parse(new TextDecoder().decode(plaintext));
+    }
+    catch (err) {
+        throw new Error(`Audit log entry failed to decrypt: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+/**
+ * Constant-time MAC comparison (ADR 0009/0019's chain and head MACs are both
+ * HMAC-SHA384, so 96 lowercase hex chars). `candidate` is untrusted on-disk
+ * data of unknown shape: a non-string, wrong-length, or non-hex value is
+ * reported as a mismatch, never thrown, matching verifyKeyConfirmation's
+ * contract in crypto/hybrid.ts.
+ *
+ * Exported (ADR 0026) so the timing-safety test can exercise this exact
+ * compare in isolation, without the file I/O its only internal callers do.
+ */
+export function macEquals(candidate, expected) {
+    if (typeof candidate !== "string" || !/^[0-9a-f]{96}$/.test(candidate))
+        return false;
+    return equalBytes(hexToBytes(candidate), hexToBytes(expected));
 }
 async function readStoredEntries(storageDir) {
     try {
@@ -16,7 +94,15 @@ async function readStoredEntries(storageDir) {
         return raw
             .split("\n")
             .filter((line) => line.trim().length > 0)
-            .map((line) => JSON.parse(line));
+            .map((line) => {
+            const parsed = JSON.parse(line);
+            // A corrupted line can be valid JSON that isn't an object (e.g.
+            // `null`) — destructuring that downstream throws TypeError instead
+            // of being reported as a broken chain link. Coerce to an empty
+            // object so it flows safely through as a non-matching entry (found
+            // by fuzzing, issue #42).
+            return (typeof parsed === "object" && parsed !== null ? parsed : {});
+        });
     }
     catch (err) {
         if (err.code === "ENOENT")
@@ -24,39 +110,185 @@ async function readStoredEntries(storageDir) {
         throw err;
     }
 }
+function computeHeadMac(identity, head) {
+    const key = hkdf(sha384, concatBytes(identity.classical.secretKey, identity.pqcSign.secretKey), undefined, AUDIT_LOG_HEAD_INFO, 32);
+    return bytesToHex(hmac(sha384, key, utf8ToBytes(canonicalize(head))));
+}
+async function readHead(identity) {
+    let raw;
+    try {
+        raw = await readFile(headFilePath(identity.storageDir), "utf8");
+    }
+    catch (err) {
+        if (err.code === "ENOENT")
+            return { state: "missing" };
+        throw err;
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        const { headMac, ...rest } = parsed;
+        if (rest.version !== 1 ||
+            typeof rest.count !== "number" ||
+            !Number.isSafeInteger(rest.count) ||
+            rest.count < 0 ||
+            typeof rest.mac !== "string" ||
+            typeof headMac !== "string" ||
+            (rest.encrypted !== undefined && rest.encrypted !== true)) {
+            return { state: "invalid" };
+        }
+        // Only ever include `encrypted` when true, exactly as writeHead does —
+        // otherwise a legacy head record's canonicalized bytes (and therefore
+        // its headMac) would silently change underneath it.
+        const head = rest.encrypted === true ? { version: 1, count: rest.count, mac: rest.mac, encrypted: true } : { version: 1, count: rest.count, mac: rest.mac };
+        return macEquals(headMac, computeHeadMac(identity, head)) ? { state: "ok", head } : { state: "invalid" };
+    }
+    catch {
+        return { state: "invalid" };
+    }
+}
+/** Compares an already-read head against the entries on disk. Returns undefined when they agree (a head up to a few entries behind is fine: that is a crash between append and head update). */
+function checkHeadAgainst(read, entries) {
+    if (read.state === "missing")
+        return entries.length === 0 ? undefined : { reason: "head-missing", brokenAtIndex: entries.length };
+    if (read.state === "invalid")
+        return { reason: "head-invalid", brokenAtIndex: entries.length };
+    const { count, mac } = read.head;
+    if (count > entries.length)
+        return { reason: "truncated", brokenAtIndex: entries.length };
+    const expected = count === 0 ? GENESIS_HASH : entries[count - 1].mac;
+    if (mac !== expected)
+        return { reason: "head-invalid", brokenAtIndex: entries.length };
+    return undefined;
+}
+async function checkHead(identity, entries) {
+    return checkHeadAgainst(await readHead(identity), entries);
+}
+async function writeHead(identity, count, mac, encrypted) {
+    const head = encrypted ? { version: 1, count, mac, encrypted: true } : { version: 1, count, mac };
+    await writeFileAtomic(headFilePath(identity.storageDir), JSON.stringify({ ...head, headMac: computeHeadMac(identity, head) }));
+}
+const appendState = new Map();
+function stateFor(storageDir) {
+    const key = resolve(storageDir);
+    let state = appendState.get(key);
+    if (!state) {
+        state = { queue: Promise.resolve(), tail: null, headTrusted: true, encrypted: false };
+        appendState.set(key, state);
+    }
+    return state;
+}
+async function doAppend(identity, entry, state) {
+    const full = { ...entry, at: new Date().toISOString() };
+    if (!state.tail) {
+        const existing = await readStoredEntries(identity.storageDir);
+        const head = await readHead(identity);
+        state.tail = { mac: existing.length > 0 ? existing[existing.length - 1].mac : GENESIS_HASH, entryCount: existing.length };
+        state.headTrusted = checkHeadAgainst(head, existing) === undefined;
+        state.encrypted = head.state === "ok" && head.head.encrypted === true;
+    }
+    const content = state.encrypted ? { version: 2, ...encryptEntryContent(identity, full) } : { ...full };
+    const withPrev = { ...content, prevMac: state.tail.mac };
+    const mac = computeMac(identity, withPrev);
+    const stored = { ...withPrev, mac };
+    await mkdir(identity.storageDir, { recursive: true, mode: 0o700 });
+    await appendFile(logFilePath(identity.storageDir), JSON.stringify(stored) + "\n", { mode: 0o600 });
+    state.tail = { mac, entryCount: state.tail.entryCount + 1 };
+    // Never overwrite a head that already disagreed with the log: that would
+    // launder a truncation into a "clean" state.
+    if (state.headTrusted)
+        await writeHead(identity, state.tail.entryCount, mac, state.encrypted);
+}
 /**
  * Appends one entry to the local, append-only audit log (public metadata
- * only — no secrets). Each entry is chained to the previous one's hash
- * (see verifyLogIntegrity) so tampering or deleting past entries is
- * detectable, not just theoretically append-only.
+ * only — no secrets). Each entry is chained to the previous one's MAC
+ * (see verifyLogIntegrity), keyed from identity's own secret material
+ * (ADR 0009) so tampering or deleting past entries is detectable by anyone
+ * EXCEPT someone who also holds that secret — not just theoretically
+ * append-only, and not forgeable by file-write access alone.
  */
 export async function appendLogEntry(identity, entry) {
-    const full = { ...entry, at: new Date().toISOString() };
-    const existing = await readStoredEntries(identity.storageDir);
-    const prevHash = existing.length > 0 ? existing[existing.length - 1].hash : GENESIS_HASH;
-    const withPrev = { ...full, prevHash };
-    const stored = { ...withPrev, hash: computeHash(withPrev) };
-    await mkdir(identity.storageDir, { recursive: true });
-    await appendFile(logFilePath(identity.storageDir), JSON.stringify(stored) + "\n", { mode: 0o600 });
+    const state = stateFor(identity.storageDir);
+    // Chain onto the previous operation regardless of how it settled (a past
+    // failure must not permanently block future appends to this storageDir),
+    // but this call's own outcome — via `task`, awaited below — propagates to
+    // ITS caller untouched.
+    const task = state.queue.catch(() => { }).then(() => doAppend(identity, entry, state));
+    state.queue = task.catch(() => { });
+    await task;
 }
+/** Transparently decrypts any v2 (encrypted, issue #43) entries alongside plaintext v1 ones. */
 export async function readLog(identity) {
-    return (await readStoredEntries(identity.storageDir)).map(({ prevHash: _prevHash, hash: _hash, ...entry }) => entry);
+    return (await readStoredEntries(identity.storageDir)).map((entry) => (isV2Entry(entry) ? decryptEntryContent(identity, entry) : stripChainFields(entry)));
 }
 /**
- * Walks the hash chain and reports whether it's intact. If an entry was
+ * Walks the MAC chain and reports whether it's intact. If an entry was
  * edited or deleted, `brokenAtIndex` is the (0-based) index of the first
- * entry whose chain link no longer matches.
+ * entry whose chain link no longer matches. Recomputing a matching MAC
+ * requires identity's own secret material (see computeMac/deriveAuditLogKey)
+ * — this is what makes forging the chain require more than filesystem
+ * write access (ADR 0009). It also checks the authenticated head record
+ * (ADR 0019), so deleting the most recent entries is reported too, with
+ * `reason: "truncated"`.
+ *
+ * Not detectable: replacing BOTH log.jsonl and log.head.json with an older,
+ * consistent pair, or deleting both files outright. Keep an off-box copy of
+ * the head if that matters to you.
  */
 export async function verifyLogIntegrity(identity) {
     const entries = await readStoredEntries(identity.storageDir);
-    let expectedPrevHash = GENESIS_HASH;
+    let expectedPrevMac = GENESIS_HASH;
     for (let i = 0; i < entries.length; i++) {
-        const { prevHash, hash, ...rest } = entries[i];
-        if (prevHash !== expectedPrevHash || hash !== computeHash({ ...rest, prevHash })) {
+        const { prevMac, mac, ...rest } = entries[i];
+        if (prevMac !== expectedPrevMac || !macEquals(mac, computeMac(identity, { ...rest, prevMac }))) {
             return { intact: false, brokenAtIndex: i };
         }
-        expectedPrevHash = hash;
+        expectedPrevMac = mac;
     }
+    const problem = await checkHead(identity, entries);
+    if (problem)
+        return { intact: false, ...problem };
     return { intact: true };
 }
+/**
+ * One-time, explicit opt-in (issue #43/ADR 0027) to encrypt the audit log's
+ * entry content, so filesystem access alone no longer reveals what actions
+ * this identity has performed. Re-encrypts every existing entry in one pass
+ * (there is no mixed-format file afterwards) and marks the head record so
+ * every later `appendLogEntry` call encrypts just the one entry it writes —
+ * never the whole log again. A no-op if the log is already encrypted.
+ * Throws if the log fails its integrity check first: there is nothing safe
+ * to migrate if the chain can't be trusted.
+ */
+export async function migrateAuditLogToEncrypted(identity) {
+    const state = stateFor(identity.storageDir);
+    const task = state.queue.catch(() => { }).then(() => doMigrateToEncrypted(identity, state));
+    state.queue = task.catch(() => { });
+    await task;
+}
+async function doMigrateToEncrypted(identity, state) {
+    const head = await readHead(identity);
+    if (head.state === "ok" && head.head.encrypted === true)
+        return; // already encrypted — true no-op
+    const integrity = await verifyLogIntegrity(identity);
+    if (!integrity.intact) {
+        throw new Error("Cannot migrate: the audit log failed its integrity check. Investigate before encrypting it.");
+    }
+    const entries = await readStoredEntries(identity.storageDir);
+    let prevMac = GENESIS_HASH;
+    const rewritten = [];
+    for (const entry of entries) {
+        const content = isV2Entry(entry) ? decryptEntryContent(identity, entry) : stripChainFields(entry);
+        const { nonce, ciphertext } = encryptEntryContent(identity, content);
+        const withPrev = { version: 2, nonce, ciphertext, prevMac };
+        const mac = computeMac(identity, withPrev);
+        rewritten.push({ ...withPrev, mac });
+        prevMac = mac;
+    }
+    await mkdir(identity.storageDir, { recursive: true, mode: 0o700 });
+    await writeFileAtomic(logFilePath(identity.storageDir), rewritten.map((entry) => JSON.stringify(entry)).join("\n") + (rewritten.length > 0 ? "\n" : ""));
+    await writeHead(identity, rewritten.length, prevMac, true);
+    state.tail = { mac: prevMac, entryCount: rewritten.length };
+    state.headTrusted = true;
+    state.encrypted = true;
+}
 //# sourceMappingURL=store.js.map

package/dist/store.js.map

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

package/dist/trust.d.ts

@@ -1,16 +1,62 @@
-import type { Identity, PublicCard } from "./identity.js";
+import { type Certificate, type VerifyResult } from "./crypto/hybrid.js";
+import { type Identity, type PublicCard } from "./identity.js";
 export interface TrustRecord {
     card: PublicCard;
     trustedAt: string;
     /** Set when this party was later revoked (see untrustParty). Absent = still trusted. */
     revokedAt?: string;
+    /**
+     * Set alongside revokedAt when this record was tombstoned by a verified
+     * rotation (applyRotation), not an ordinary revocation: the fingerprint of
+     * the card this party rotated TO. Informational only — verify() still
+     * reports "revoked-signer" for this record either way (ADR 0023/issue
+     * #37); nothing reads this field to change verification behavior.
+     */
+    rotatedTo?: string;
 }
+type Entries = Record<string, TrustRecord>;
+/**
+ * Thrown when trust.json cannot be trusted: its MAC does not verify (edited,
+ * truncated, copied from another identity), it is not valid JSON, or it is an
+ * unauthenticated legacy file that was never explicitly adopted with
+ * `migrateLegacyTrustStore`. Everything that consults the trust list fails
+ * closed on this rather than reading a file anyone with filesystem access
+ * could have written.
+ */
+export declare class TrustStoreIntegrityError extends Error {
+    constructor(message: string);
+}
+/**
+ * Exported (ADR 0026) so the timing-safety test can exercise this exact
+ * compare in isolation, without the file I/O its only internal callers do.
+ */
+export declare function macMatches(identity: Identity, entries: Entries, mac: unknown): boolean;
+/**
+ * One-time, explicit opt-in (issue #43/ADR 0027) to encrypt `trust.json`'s
+ * entries, so filesystem access alone no longer reveals who this identity
+ * trusts. A no-op if the store is already v4. A legacy (unauthenticated) file
+ * is not implicitly adopted here — call `migrateLegacyTrustStore` first, same
+ * as reading it would require.
+ */
+export declare function migrateTrustStoreToEncrypted(identity: Identity): Promise<void>;
+/**
+ * One-time, explicit adoption of a trust.json written before trust-store
+ * MACs existed (a v1 alias map or a v2 fingerprint-keyed file). Those files
+ * carry no proof of who wrote them, so they are never read implicitly (an
+ * attacker could otherwise plant one and bypass the MAC). Calling this says
+ * "I have reviewed the current file and it is mine": its records are kept
+ * and the file is rewritten authenticated. Returns the number of records
+ * adopted; returns 0 and changes nothing if the file is missing or already
+ * authenticated (a modified authenticated file still throws).
+ */
+export declare function migrateLegacyTrustStore(identity: Identity): Promise<number>;
 /**
  * Records another party's public card as trusted, keyed by the card's
  * fingerprint (not alias — two different real parties could otherwise pick
  * the same alias and silently overwrite each other). Public keys are not
  * secret, so this file is plain JSON (unlike identity.enc.json), though it's
- * still permission-restricted to the owning user.
+ * permission-restricted to the owning user and, since ADR 0015, carries an
+ * HMAC (keyed from the Identity's secret keys) so edits are detected.
  *
  * Trusting a card again after it was revoked reinstates it (clears revokedAt).
  */
@@ -23,6 +69,14 @@ export declare function trustParty(identity: Identity, card: PublicCard): Promis
  * "untrusted-signer" (never trusted at all).
  */
 export declare function untrustParty(identity: Identity, alias: string): Promise<void>;
+/**
+ * Revokes exactly one card, identified by its `fingerprint(card)` string
+ * (spaces and case are ignored). Unlike `untrustParty`, parties that merely
+ * share an alias are untouched — alias is a non-unique display label.
+ * Returns true if a currently-trusted record was revoked, false if no such
+ * trusted record exists (a typo'd fingerprint is reported, not ignored).
+ */
+export declare function untrustFingerprint(identity: Identity, fingerprintValue: string): Promise<boolean>;
 /** Every currently-trusted (non-revoked) card. */
 export declare function listTrustedParties(identity: Identity): Promise<PublicCard[]>;
 /** Every trust record ever made, revoked or not — for audit/history purposes. */
@@ -39,3 +93,90 @@ export declare function getTrustedParty(identity: Identity, alias: string): Prom
 export declare function getTrustedPartiesByAlias(identity: Identity, alias: string): Promise<PublicCard[]>;
 /** All trust records (revoked or not) recorded under this alias. */
 export declare function getTrustRecordsByAlias(identity: Identity, alias: string): Promise<TrustRecord[]>;
+/**
+ * Verifies a self-signed card (from `exportSignedCard`) — checks the
+ * signature is self-consistent (the certificate's signer IS the card it's
+ * attached to) and, if the card carries an `expiresAt`, that it hasn't
+ * passed. Only on success does this call the ordinary `trustParty` to
+ * actually record it — self-signing proves the card is authentic and
+ * current, not that you've decided to trust it (Fingerprint confirmation
+ * is still the human-level trust decision, same as a bare card).
+ */
+export declare function trustSignedCard(identity: Identity, card: PublicCard, certificate: Certificate): Promise<VerifyResult>;
+export interface RotationDocument {
+    oldCard: PublicCard;
+    newCard: PublicCard;
+    rotatedAt: string;
+}
+export interface RotationStatement {
+    document: RotationDocument;
+    oldCertificate: Certificate;
+    newCertificate: Certificate;
+}
+/**
+ * Starts a key rotation: the OLD identity signs a statement naming `newCard`
+ * as its successor. Hand the result to `completeRotation`, called with the
+ * NEW identity, to get a complete, dual-signed RotationStatement — a single
+ * signature from the old key alone is never enough to redirect a peer's
+ * trust (see `applyRotation`), so this function's output is not yet usable
+ * on its own.
+ */
+export declare function beginRotation(oldIdentity: Identity, newCard: PublicCard, options?: {
+    rotatedAt?: string;
+}): Promise<{
+    document: RotationDocument;
+    oldCertificate: Certificate;
+}>;
+/**
+ * Finishes a key rotation: the NEW identity signs the SAME document
+ * `beginRotation` produced, proving the new key exists and agrees to be
+ * named as successor — not just asserted unilaterally by whoever holds the
+ * old key (which could be an attacker who compromised it alone).
+ */
+export declare function completeRotation(newIdentity: Identity, draft: {
+    document: RotationDocument;
+    oldCertificate: Certificate;
+}): Promise<RotationStatement>;
+/**
+ * Verifies a RotationStatement (both signatures self-consistent, both
+ * certificates over the identical document) and, only if `oldCard` already
+ * has an existing Trust Record, moves trust to `newCard` and tombstones
+ * `oldCard`'s record (revokedAt set, plus rotatedTo pointing at newCard's
+ * fingerprint). A statement for a card you never trusted is a no-op — this
+ * is not a way to seed your trust store with a card you never decided to
+ * trust in the first place.
+ */
+export declare function applyRotation(identity: Identity, statement: RotationStatement): Promise<VerifyResult>;
+export interface RevocationDocument {
+    revokedCard: PublicCard;
+    revokedAt: string;
+    reason?: string;
+}
+/** A Certificate only stores its document's HASH, not the document itself (same as everywhere else in this codebase) — so a revocation notice bundles the document alongside its certificate, the same shape RotationStatement already uses for the same reason. */
+export interface RevocationNotice {
+    document: RevocationDocument;
+    certificate: Certificate;
+}
+/**
+ * Produces a self-signed, portable revocation notice for `identity`'s own
+ * card — verifiable by any peer independently of their (or your) local
+ * trust-store state. The same function works whether called reactively
+ * (retiring a key now) or right after createIdentity, to be stored
+ * separately and used later if this identity becomes inaccessible — that's
+ * what actually makes "recovery" possible for a lost passphrase or a lost
+ * identity file (ADR 0023): there is no special "pre-generated" mode, it's
+ * the same notice either way.
+ */
+export declare function createRevocationNotice(identity: Identity, options?: {
+    reason?: string;
+}): Promise<RevocationNotice>;
+/**
+ * Verifies a revocation notice (self-consistent, well-formed, `revokedAt`
+ * a valid ISO instant) and, only if the named card already has an existing
+ * Trust Record, tombstones it (revokedAt set) — exactly like
+ * `untrustFingerprint`. A notice for a card you never trusted is a no-op,
+ * for the same reason `applyRotation` is: this is not a pre-emptive
+ * denylist feature.
+ */
+export declare function applyRevocationNotice(identity: Identity, notice: RevocationNotice): Promise<VerifyResult>;
+export {};