simple-hpke 0.0.11 → 0.1.0

package/dist/index.d.ts

@@ -1,57 +1,38 @@
 import { type RecipientKey, encryptToString, encryptBytes } from './util';
 /**
- * Wrap an AES key to a recipient's public key.
+ * Create a new AES key for the given public key.
  *
- * @param recipient The recipient's X25519 public key, as a `CryptoKey`,
- *   `CryptoKeyPair` (its `.publicKey` is used), 32 raw bytes (`Uint8Array`),
- *   or `{ publicKey:string, encoding? }` (encoding defaults to `base64url`).
- * @param aesKey Optional key to seal, as either an AES-GCM `CryptoKey` or its
- *   raw bytes (`Uint8Array`, 16 or 32 bytes). Omit to generate a fresh
- *   extractable key of `opts.keysize` bits. A supplied `CryptoKey` MUST be
- *   extractable (its raw bytes are sealed).
- * @param opts `keysize` (128/256, default 256; ignored when `aesKey` is
- *   supplied) and `info` (bound into the HPKE key schedule; default empty).
- * @returns { wrapped:Uint8Array, key:CryptoKey } The envelope bytes and a
- *   usable AES-GCM `CryptoKey`.
+ * @param recipient Public key for decryptor
+ * @param opts `size` and `info`
+ * @returns {{ enc, key }} The wrapped envelope bytes and the generated
+ *   AES-GCM key.
  */
-export declare function seal(recipient: RecipientKey, aesKey?: CryptoKey | Uint8Array | null, opts?: {
-    keysize?: 128 | 256;
+export declare function create(recipient: RecipientKey, opts?: {
+    size?: 128 | 256;
     info?: Uint8Array | string;
 }): Promise<{
-    wrapped: Uint8Array;
+    enc: Uint8Array<ArrayBufferLike>;
     key: CryptoKey;
 }>;
 /**
- * Recover the AES key wrapped by `seal`. Call `open(...)` for a usable
- * AES-GCM `CryptoKey`, or `open.raw(...)` for the raw key bytes.
- */
-export declare const open: typeof openBytes & {
-    raw: typeof openRawBytes;
-};
-/**
- * Recover an AES key that was wrapped with `seal`, using your private key.
+ * Encrypt the given AES key to the given public key.
  *
- * @param keypair The same X25519 `CryptoKeyPair` used to seal.
- * @param wrapped The envelope returned by `seal` (`enc ‖ ciphertext`).
- * @param opts `info` — must match the value passed to `seal`.
- * @returns The recovered AES-GCM `CryptoKey` (extractable).
+ * @returns {{ enc, key }} The wrapped envelope bytes and a usable AES-GCM
+ *   key with the same raw bytes as `aesKey`.
  */
-declare function openBytes(keypair: CryptoKeyPair, wrapped: Uint8Array, opts?: {
-    info: Uint8Array | string;
-}): Promise<CryptoKey>;
+export declare function seal(recipient: RecipientKey, aesKey: CryptoKey | Uint8Array | null, opts?: {
+    info?: Uint8Array | string;
+}): Promise<{
+    enc: Uint8Array<ArrayBufferLike>;
+    key: CryptoKey;
+}>;
 /**
- * Like `open`, but returns the recovered key as raw bytes instead of
- * importing it as an AES-GCM `CryptoKey`. Exposed as `open.raw`.
- *
- * @param keypair The same X25519 `CryptoKeyPair` used to seal.
- * @param wrapped The envelope returned by `seal` (`enc ‖ ciphertext`).
- * @param opts `info` — must match the value passed to `seal`.
- * @returns The recovered key bytes (16 or 32 bytes, matching whatever
- *   was sealed).
+ * Recover the AES key wrapped by `create` or `seal`. Call `open(...)` for a
+ * usable AES-GCM `CryptoKey`, or `open.raw(...)` for the raw key bytes.
  */
-declare function openRawBytes(keypair: CryptoKeyPair, wrapped: Uint8Array, opts?: {
-    info: Uint8Array | string;
-}): Promise<Uint8Array>;
+export declare const open: typeof openBytes & {
+    raw: typeof openRawBytes;
+};
 /**
  * Seal an AES key to `recipient` and AES-GCM encrypt a message under it.
  * Call `encrypt(...)` for the raw envelope bytes, or `encrypt.asString(...)`
@@ -117,5 +98,29 @@ declare function decryptFromString(keypair: CryptoKeyPair, message: string, opts
     info?: Uint8Array | string;
     buffer: true;
 }): Promise<Uint8Array>;
+/**
+ * Like `open`, but returns the recovered key as raw bytes instead of
+ * importing it as an AES-GCM `CryptoKey`. Exposed as `open.raw`.
+ *
+ * @param keypair The same X25519 `CryptoKeyPair` used to create or seal.
+ * @param wrapped The `enc` bytes returned by `create` or `seal`.
+ * @param opts `info` — must match the value passed to `create` or `seal`.
+ * @returns The recovered key bytes (16 or 32 bytes, matching whatever
+ *   was wrapped).
+ */
+declare function openRawBytes(keypair: CryptoKeyPair, wrapped: Uint8Array, opts?: {
+    info: Uint8Array | string;
+}): Promise<Uint8Array>;
+/**
+ * Recover an AES key that was wrapped with `create` or `seal`.
+ *
+ * @param keypair The same X25519 `CryptoKeyPair` used to create or seal.
+ * @param wrapped The `enc` bytes returned by `create` or `seal`.
+ * @param opts `info` — must match the value passed to `create` or `seal`.
+ * @returns The recovered AES-GCM `CryptoKey` (extractable).
+ */
+declare function openBytes(keypair: CryptoKeyPair, wrapped: Uint8Array, opts?: {
+    info: Uint8Array | string;
+}): Promise<CryptoKey>;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACH,KAAK,YAAY,EAGjB,eAAe,EACf,YAAY,EAOf,MAAM,QAAQ,CAAA;AAmBf;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,IAAI,CACtB,SAAS,EAAC,YAAY,EACtB,MAAM,CAAC,EAAC,SAAS,GAAC,UAAU,GAAC,IAAI,EACjC,IAAI,CAAC,EAAC;IAEF,OAAO,CAAC,EAAC,GAAG,GAAC,GAAG,CAAA;IAEhB,IAAI,CAAC,EAAC,UAAU,GAAC,MAAM,CAAA;CAC1B,GACH,OAAO,CAAC;IAAE,OAAO,EAAC,UAAU,CAAC;IAAC,GAAG,EAAC,SAAS,CAAA;CAAE,CAAC,CA0B/C;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI;;CAEf,CAAA;AAEF;;;;;;;GAOG;AACH,iBAAe,SAAS,CACpB,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,UAAU,EAClB,IAAI,CAAC,EAAC;IAAE,IAAI,EAAC,UAAU,GAAC,MAAM,CAAA;CAAE,GAClC,OAAO,CAAC,SAAS,CAAC,CAGnB;AAED;;;;;;;;;GASG;AACH,iBAAe,YAAY,CACvB,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,UAAU,EAClB,IAAI,CAAC,EAAC;IAAE,IAAI,EAAC,UAAU,GAAC,MAAM,CAAA;CAAE,GAClC,OAAO,CAAC,UAAU,CAAC,CAYpB;AAED;;;;GAIG;AACH,eAAO,MAAM,OAAO;;CAElB,CAAA;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,OAAO;;;CAGlB,CAAA;AAEF;;;;;;;;GAQG;AACH,iBAAe,YAAY,CACvB,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,UAAU,EAClB,IAAI,CAAC,EAAC;IAAE,IAAI,CAAC,EAAC,UAAU,GAAC,MAAM,CAAA;CAAE,GACnC,OAAO,CAAC,UAAU,CAAC,CA6BpB;AAED;;;;;;;;GAQG;AACH,iBAAe,eAAe,CAC1B,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,UAAU,EAClB,IAAI,CAAC,EAAC;IAAE,IAAI,CAAC,EAAC,UAAU,GAAC,MAAM,CAAA;CAAE,GACnC,OAAO,CAAC,MAAM,CAAC,CAGhB;AAED;;;;;;;;;;;;;GAaG;AACH,iBAAe,iBAAiB,CAC5B,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,MAAM,EACd,IAAI,CAAC,EAAC;IAAE,IAAI,CAAC,EAAC,UAAU,GAAC,MAAM,CAAC;IAAC,MAAM,CAAC,EAAC,KAAK,CAAA;CAAE,GAClD,OAAO,CAAC,MAAM,CAAC,CAAA;AAEjB,iBAAe,iBAAiB,CAC5B,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,MAAM,EACd,IAAI,EAAC;IAAE,IAAI,CAAC,EAAC,UAAU,GAAC,MAAM,CAAC;IAAC,MAAM,EAAC,IAAI,CAAA;CAAE,GAC/C,OAAO,CAAC,UAAU,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACH,KAAK,YAAY,EAGjB,eAAe,EACf,YAAY,EAOf,MAAM,QAAQ,CAAA;AAoBf;;;;;;;GAOG;AACH,wBAAsB,MAAM,CACxB,SAAS,EAAC,YAAY,EACtB,IAAI,CAAC,EAAC;IAEF,IAAI,CAAC,EAAC,GAAG,GAAC,GAAG,CAAA;IAEb,IAAI,CAAC,EAAC,UAAU,GAAC,MAAM,CAAA;CAC1B,GACH,OAAO,CAAC;IAAE,GAAG,EAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAAC,GAAG,EAAC,SAAS,CAAA;CAAE,CAAC,CAG5D;AAED;;;;;GAKG;AACH,wBAAsB,IAAI,CACtB,SAAS,EAAC,YAAY,EACtB,MAAM,EAAC,SAAS,GAAC,UAAU,GAAC,IAAI,EAChC,IAAI,CAAC,EAAC;IAEF,IAAI,CAAC,EAAC,UAAU,GAAC,MAAM,CAAA;CAC1B,GACH,OAAO,CAAC;IAAE,GAAG,EAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAAC,GAAG,EAAC,SAAS,CAAA;CAAE,CAAC,CAG5D;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI;;CAEf,CAAA;AAEF;;;;GAIG;AACH,eAAO,MAAM,OAAO;;CAElB,CAAA;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,OAAO;;;CAGlB,CAAA;AAEF;;;;;;;;GAQG;AACH,iBAAe,YAAY,CACvB,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,UAAU,EAClB,IAAI,CAAC,EAAC;IAAE,IAAI,CAAC,EAAC,UAAU,GAAC,MAAM,CAAA;CAAE,GACnC,OAAO,CAAC,UAAU,CAAC,CA6BpB;AAED;;;;;;;;GAQG;AACH,iBAAe,eAAe,CAC1B,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,UAAU,EAClB,IAAI,CAAC,EAAC;IAAE,IAAI,CAAC,EAAC,UAAU,GAAC,MAAM,CAAA;CAAE,GACnC,OAAO,CAAC,MAAM,CAAC,CAGhB;AAED;;;;;;;;;;;;;GAaG;AACH,iBAAe,iBAAiB,CAC5B,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,MAAM,EACd,IAAI,CAAC,EAAC;IAAE,IAAI,CAAC,EAAC,UAAU,GAAC,MAAM,CAAC;IAAC,MAAM,CAAC,EAAC,KAAK,CAAA;CAAE,GAClD,OAAO,CAAC,MAAM,CAAC,CAAA;AAEjB,iBAAe,iBAAiB,CAC5B,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,MAAM,EACd,IAAI,EAAC;IAAE,IAAI,CAAC,EAAC,UAAU,GAAC,MAAM,CAAC;IAAC,MAAM,EAAC,IAAI,CAAA;CAAE,GAC/C,OAAO,CAAC,UAAU,CAAC,CAAA;AA0HrB;;;;;;;;;GASG;AACH,iBAAe,YAAY,CACvB,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,UAAU,EAClB,IAAI,CAAC,EAAC;IAAE,IAAI,EAAC,UAAU,GAAC,MAAM,CAAA;CAAE,GAClC,OAAO,CAAC,UAAU,CAAC,CAYpB;AAED;;;;;;;GAOG;AACH,iBAAe,SAAS,CACpB,OAAO,EAAC,aAAa,EACrB,OAAO,EAAC,UAAU,EAClB,IAAI,CAAC,EAAC;IAAE,IAAI,EAAC,UAAU,GAAC,MAAM,CAAA;CAAE,GAClC,OAAO,CAAC,SAAS,CAAC,CAGnB"}

package/dist/index.js

@@ -1342,14 +1342,24 @@ async function aeadOpen(key, nonce, ciphertext) {
 __name(aeadOpen, "aeadOpen");
 async function encryptBytes(recipient, message, aesKey, opts) {
   const plaintext = typeof message === "string" ? new TextEncoder().encode(message) : message;
-  const { wrapped, key } = await seal(recipient, aesKey, opts);
+  let enc;
+  let key;
+  if (!aesKey) {
+    const keys = await create2(recipient, opts);
+    enc = keys.enc;
+    key = keys.key;
+  } else {
+    const keys = await seal(recipient, aesKey, opts);
+    enc = keys.enc;
+    key = keys.key;
+  }
   const iv = globalThis.crypto.getRandomValues(new Uint8Array(NN));
   const ct = new Uint8Array(await subtle.encrypt(
     { name: "AES-GCM", iv },
     key,
     plaintext
   ));
-  return concat2(i2osp(wrapped.length, WRAPPED_LEN_PREFIX), wrapped, iv, ct);
+  return concat2(i2osp(enc.length, WRAPPED_LEN_PREFIX), enc, iv, ct);
 }
 __name(encryptBytes, "encryptBytes");
 async function encryptToString(recipient, message, aesKey, opts) {
@@ -1550,51 +1560,19 @@ __name(concat2, "concat");
 
 // src/index.ts
 var subtle2 = globalThis.crypto.subtle;
+async function create2(recipient, opts) {
+  const { wrapped, key } = await encryptKey(recipient, null, opts);
+  return { enc: wrapped, key };
+}
+__name(create2, "create");
 async function seal(recipient, aesKey, opts) {
-  const info = normalizeInfo(opts?.info);
-  let keyBytes;
-  if (aesKey instanceof Uint8Array) {
-    validateRawKeyBytes(aesKey);
-    keyBytes = aesKey;
-  } else if (aesKey) {
-    keyBytes = await exportAesKeyBytes(aesKey);
-    validateRawKeyBytes(keyBytes);
-  } else {
-    const keysize = opts?.keysize ?? 256;
-    validateKeysize(keysize);
-    keyBytes = globalThis.crypto.getRandomValues(
-      new Uint8Array(keysize / 8)
-    );
-  }
-  const publicKey = await resolveRecipientPublicKey(recipient);
-  const { sharedSecret, enc } = await encap(publicKey);
-  const { key, baseNonce } = await keySchedule(sharedSecret, info);
-  const ciphertext = await aeadSeal(key, baseNonce, keyBytes);
-  const wrapped = concat2(enc, ciphertext);
-  const aesGcmKey = await importAesKey(keyBytes);
-  return { wrapped, key: aesGcmKey };
+  const { wrapped, key } = await encryptKey(recipient, aesKey, opts);
+  return { enc: wrapped, key };
 }
 __name(seal, "seal");
 var open = Object.assign(openBytes, {
   raw: openRawBytes
 });
-async function openBytes(keypair, wrapped, opts) {
-  const keyBytes = await openRawBytes(keypair, wrapped, opts);
-  return importAesKey(keyBytes);
-}
-__name(openBytes, "openBytes");
-async function openRawBytes(keypair, wrapped, opts) {
-  if (wrapped.byteLength < ENC_LENGTH + AEAD_TAG_LENGTH) {
-    throw new Error("malformed envelope: too short");
-  }
-  const info = normalizeInfo(opts?.info);
-  const enc = wrapped.slice(0, ENC_LENGTH);
-  const ciphertext = wrapped.slice(ENC_LENGTH);
-  const sharedSecret = await decap(enc, keypair);
-  const { key, baseNonce } = await keySchedule(sharedSecret, info);
-  return aeadOpen(key, baseNonce, ciphertext);
-}
-__name(openRawBytes, "openRawBytes");
 var encrypt = Object.assign(encryptBytes, {
   asString: encryptToString
 });
@@ -1733,7 +1711,50 @@ async function keySchedule(sharedSecret, info) {
   return { key, baseNonce };
 }
 __name(keySchedule, "keySchedule");
+async function openRawBytes(keypair, wrapped, opts) {
+  if (wrapped.byteLength < ENC_LENGTH + AEAD_TAG_LENGTH) {
+    throw new Error("malformed envelope: too short");
+  }
+  const info = normalizeInfo(opts?.info);
+  const enc = wrapped.slice(0, ENC_LENGTH);
+  const ciphertext = wrapped.slice(ENC_LENGTH);
+  const sharedSecret = await decap(enc, keypair);
+  const { key, baseNonce } = await keySchedule(sharedSecret, info);
+  return aeadOpen(key, baseNonce, ciphertext);
+}
+__name(openRawBytes, "openRawBytes");
+async function openBytes(keypair, wrapped, opts) {
+  const keyBytes = await openRawBytes(keypair, wrapped, opts);
+  return importAesKey(keyBytes);
+}
+__name(openBytes, "openBytes");
+async function encryptKey(recipient, aesKey, opts) {
+  const info = normalizeInfo(opts?.info);
+  let keyBytes;
+  if (aesKey instanceof Uint8Array) {
+    validateRawKeyBytes(aesKey);
+    keyBytes = aesKey;
+  } else if (aesKey) {
+    keyBytes = await exportAesKeyBytes(aesKey);
+    validateRawKeyBytes(keyBytes);
+  } else {
+    const keysize = opts?.size ?? 256;
+    validateKeysize(keysize);
+    keyBytes = globalThis.crypto.getRandomValues(
+      new Uint8Array(keysize / 8)
+    );
+  }
+  const publicKey = await resolveRecipientPublicKey(recipient);
+  const { sharedSecret, enc } = await encap(publicKey);
+  const { key, baseNonce } = await keySchedule(sharedSecret, info);
+  const ciphertext = await aeadSeal(key, baseNonce, keyBytes);
+  const wrapped = concat2(enc, ciphertext);
+  const aesGcmKey = await importAesKey(keyBytes);
+  return { wrapped, key: aesGcmKey };
+}
+__name(encryptKey, "encryptKey");
 export {
+  create2 as create,
   decrypt,
   encrypt,
   open,