simple-hpke 0.0.11 → 0.1.0

package/dist/util.js

@@ -1308,51 +1308,19 @@ var HPKE_SUITE_ID = concat2(
 
 // src/index.ts
 var subtle = 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
 });
@@ -1491,6 +1459,48 @@ 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");
 
 // src/util.ts
 var subtle2 = globalThis.crypto.subtle;
@@ -1528,14 +1538,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 subtle2.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) {