simple-hpke 0.1.5 → 0.2.0

package/dist/index.d.ts

@@ -15,26 +15,14 @@ export declare function create(recipient: RecipientKey, opts?: {
     key: CryptoKey;
 }>;
 /**
- * Encrypt the given AES key to the given public key.
- *
- * @returns {{ enc, key }} The wrapped envelope bytes and a usable AES-GCM
- *   key with the same raw bytes as `aesKey`.
- */
-export declare function seal(recipient: RecipientKey, aesKey: CryptoKey | Uint8Array | null, opts?: {
-    info?: Uint8Array | string;
-}): Promise<{
-    enc: Uint8Array<ArrayBufferLike>;
-    key: CryptoKey;
-}>;
-/**
- * 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.
+ * Recover the AES key wrapped by `create` or `encryptKey`. 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;
 };
 /**
- * Seal an AES key to `recipient` and AES-GCM encrypt a message under it.
+ * Wrap an AES key to `recipient` and AES-GCM encrypt a message under it.
  * Call `encrypt(...)` for the raw envelope bytes, or `encrypt.asString(...)`
  * for the same envelope as an encoded string.
  */
@@ -102,9 +90,9 @@ declare function decryptFromString(keypair: CryptoKeyPair, message: string, opts
  * 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`.
+ * @param keypair The same X25519 `CryptoKeyPair` used to create or encryptKey.
+ * @param wrapped The `enc` bytes returned by `create` or `encryptKey`.
+ * @param opts `info` — must match the value passed to `create` or `encryptKey`.
  * @returns The recovered key bytes (16 or 32 bytes, matching whatever
  *   was wrapped).
  */
@@ -112,15 +100,38 @@ declare function openRawBytes(keypair: CryptoKeyPair, wrapped: Uint8Array, opts?
     info: Uint8Array | string;
 }): Promise<Uint8Array>;
 /**
- * Recover an AES key that was wrapped with `create` or `seal`.
+ * Recover an AES key that was wrapped with `create` or `encryptKey`.
  *
- * @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`.
+ * @param keypair The same X25519 `CryptoKeyPair` used to create or encryptKey.
+ * @param wrapped The `enc` bytes returned by `create` or `encryptKey`.
+ * @param opts `info` — must match the value passed to `create` or `encryptKey`.
  * @returns The recovered AES-GCM `CryptoKey` (extractable).
  */
 declare function openBytes(keypair: CryptoKeyPair, wrapped: Uint8Array, opts?: {
     info: Uint8Array | string;
 }): Promise<CryptoKey>;
+/**
+ * Wrap an AES key to a recipient's public key. `create(...)` calls this
+ * helper with no `aesKey`, so it generates a fresh AES key first.
+ *
+ * @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 wrap, as either an AES-GCM `CryptoKey` or its
+ *   raw bytes (`Uint8Array`, 16 or 32 bytes). Omit to generate a fresh
+ *   extractable key of `opts.size` bits. A supplied `CryptoKey` MUST be
+ *   extractable (its raw bytes are wrapped).
+ * @param opts `size` (128/256, default 256; ignored when `aesKey` is
+ *   supplied) and `info` (bound into the HPKE key schedule; default empty).
+ * @returns { enc:Uint8Array, key:CryptoKey } The wrapped envelope bytes
+ *   and a usable AES-GCM `CryptoKey`.
+ */
+export declare function encryptKey(recipient: RecipientKey, aesKey?: CryptoKey | Uint8Array | null, opts?: {
+    size?: 128 | 256;
+    info?: Uint8Array | string;
+}): Promise<{
+    enc: Uint8Array;
+    key: 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;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"}
+{"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;;;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;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,UAAU,CAC5B,SAAS,EAAC,YAAY,EACtB,MAAM,CAAC,EAAC,SAAS,GAAC,UAAU,GAAC,IAAI,EACjC,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;IAAC,GAAG,EAAC,SAAS,CAAA;CAAE,CAAC,CA0B3C"}

package/dist/index.js

@@ -1342,17 +1342,7 @@ 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;
-  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 { enc, key } = await encryptKey(recipient, aesKey, opts);
   const iv = globalThis.crypto.getRandomValues(new Uint8Array(NN));
   const ct = new Uint8Array(await subtle.encrypt(
     { name: "AES-GCM", iv },
@@ -1561,15 +1551,10 @@ __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 };
+  const { enc, key } = await encryptKey(recipient, null, opts);
+  return { enc, key };
 }
 __name(create2, "create");
-async function seal(recipient, aesKey, opts) {
-  const { wrapped, key } = await encryptKey(recipient, aesKey, opts);
-  return { enc: wrapped, key };
-}
-__name(seal, "seal");
 var open = Object.assign(openBytes, {
   raw: openRawBytes
 });
@@ -1750,14 +1735,14 @@ async function encryptKey(recipient, aesKey, opts) {
   const ciphertext = await aeadSeal(key, baseNonce, keyBytes);
   const wrapped = concat2(enc, ciphertext);
   const aesGcmKey = await importAesKey(keyBytes);
-  return { wrapped, key: aesGcmKey };
+  return { enc: wrapped, key: aesGcmKey };
 }
 __name(encryptKey, "encryptKey");
 export {
   create2 as create,
   decrypt,
   encrypt,
-  open,
-  seal
+  encryptKey,
+  open
 };
 //# sourceMappingURL=index.js.map