From 004f74220b71c27b571461e62e6322c54f42076b Mon Sep 17 00:00:00 2001
From: Ajitomi Daisuke <dajiaji@gmail.com>
Date: Sat, 22 Jul 2023 04:45:41 +0900
Subject: [PATCH 1/2] Change dirname from aeadKeys to aeads.

---
 src/{aeadKeys/aesGcmKey.ts => aeads/aesGcm.ts}              | 0
 .../chacha20Poly1305Key.ts => aeads/chacha20Poly1305.ts}    | 0
 src/{aeadKeys => aeads}/exportOnly.ts                       | 0
 src/cipherSuite.ts                                          | 6 +++---
 test/encryptionContext.test.ts                              | 4 ++--
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{aeadKeys/aesGcmKey.ts => aeads/aesGcm.ts} (100%)
 rename src/{aeadKeys/chacha20Poly1305Key.ts => aeads/chacha20Poly1305.ts} (100%)
 rename src/{aeadKeys => aeads}/exportOnly.ts (100%)

diff --git a/src/aeadKeys/aesGcmKey.ts b/src/aeads/aesGcm.ts
similarity index 100%
rename from src/aeadKeys/aesGcmKey.ts
rename to src/aeads/aesGcm.ts
diff --git a/src/aeadKeys/chacha20Poly1305Key.ts b/src/aeads/chacha20Poly1305.ts
similarity index 100%
rename from src/aeadKeys/chacha20Poly1305Key.ts
rename to src/aeads/chacha20Poly1305.ts
diff --git a/src/aeadKeys/exportOnly.ts b/src/aeads/exportOnly.ts
similarity index 100%
rename from src/aeadKeys/exportOnly.ts
rename to src/aeads/exportOnly.ts
diff --git a/src/cipherSuite.ts b/src/cipherSuite.ts
index 7657d33d1..efb7bb555 100644
--- a/src/cipherSuite.ts
+++ b/src/cipherSuite.ts
@@ -18,9 +18,9 @@ import {
   SenderExporterContext,
 } from "./exporterContext.ts";
 import { AeadId, KdfId, KemId, Mode } from "./identifiers.ts";
-import { Aes128Gcm, Aes256Gcm } from "./aeadKeys/aesGcmKey.ts";
-import { ExportOnly } from "./aeadKeys/exportOnly.ts";
-import { Chacha20Poly1305 } from "./aeadKeys/chacha20Poly1305Key.ts";
+import { Aes128Gcm, Aes256Gcm } from "./aeads/aesGcm.ts";
+import { ExportOnly } from "./aeads/exportOnly.ts";
+import { Chacha20Poly1305 } from "./aeads/chacha20Poly1305.ts";
 import { HkdfSha256, HkdfSha384, HkdfSha512 } from "./kdfs/hkdf.ts";
 import { RecipientContext } from "./recipientContext.ts";
 import { SenderContext } from "./senderContext.ts";
diff --git a/test/encryptionContext.test.ts b/test/encryptionContext.test.ts
index e285c7693..fb0f08e4c 100644
--- a/test/encryptionContext.test.ts
+++ b/test/encryptionContext.test.ts
@@ -8,8 +8,8 @@ import { AeadId, KdfId, KemId } from "../src/identifiers.ts";
 import { HkdfSha256 } from "../src/kdfs/hkdf.ts";
 import { loadSubtleCrypto } from "../src/webCrypto.ts";
 import { i2Osp } from "../src/utils/misc.ts";
-import { ExportOnly } from "../src/aeadKeys/exportOnly.ts";
-import { Aes128Gcm } from "../src/aeadKeys/aesGcmKey.ts";
+import { ExportOnly } from "../src/aeads/exportOnly.ts";
+import { Aes128Gcm } from "../src/aeads/aesGcm.ts";
 
 import * as consts from "../src/consts.ts";
 import * as errors from "../src/errors.ts";

From d3e7a0a65e7220700b9c28bccdb6863e1b96a11c Mon Sep 17 00:00:00 2001
From: Ajitomi Daisuke <dajiaji@gmail.com>
Date: Mon, 24 Jul 2023 21:14:40 +0900
Subject: [PATCH 2/2] Expose AEAD classes for CipherSuiteParams.

---
 mod.ts                   | 2 ++
 test/cipherSuite.test.ts | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mod.ts b/mod.ts
index 9623f2337..a09ecd4b9 100644
--- a/mod.ts
+++ b/mod.ts
@@ -25,3 +25,5 @@ export {
   DhkemX448HkdfSha512,
 } from "./src/kems/dhkem.ts";
 export { HkdfSha256, HkdfSha384, HkdfSha512 } from "./src/kdfs/hkdf.ts";
+export { Aes128Gcm, Aes256Gcm } from "./src/aeads/aesGcm.ts";
+export { Chacha20Poly1305 } from "./src/aeads/chacha20Poly1305.ts";
diff --git a/test/cipherSuite.test.ts b/test/cipherSuite.test.ts
index 969b233ae..25e579bd2 100644
--- a/test/cipherSuite.test.ts
+++ b/test/cipherSuite.test.ts
@@ -15,6 +15,7 @@ import {
   DhkemX448HkdfSha512,
 } from "../src/kems/dhkem.ts";
 import { HkdfSha256, HkdfSha384, HkdfSha512 } from "../src/kdfs/hkdf.ts";
+import { Aes128Gcm } from "../src/aeads/aesGcm.ts";
 
 import * as errors from "../src/errors.ts";
 
@@ -231,7 +232,7 @@ describe("CipherSuite", () => {
       const suite = new CipherSuite({
         kem: new DhkemP256HkdfSha256(),
         kdf: new HkdfSha256(),
-        aead: AeadId.Aes128Gcm,
+        aead: new Aes128Gcm(),
       });
 
       const rkp = await suite.generateKeyPair();