Merge pull request #194 from dajiaji/change-dirname-for-aead

Expose AEAD Classes for CipherSuiteParams.
dajiaji · Jul 24, 2023 · c36c0ec · c36c0ec
2 parents b4df9ed + d3e7a0a
commit c36c0ec
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git 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/src/aeadKeys/aesGcmKey.ts → src/aeads/aesGcm.ts b/src/aeadKeys/aesGcmKey.ts → src/aeads/aesGcm.ts
diff --git a/src/aeadKeys/chacha20Poly1305Key.ts → src/aeads/chacha20Poly1305.ts b/src/aeadKeys/chacha20Poly1305Key.ts → src/aeads/chacha20Poly1305.ts
diff --git a/src/aeadKeys/exportOnly.ts → src/aeads/exportOnly.ts b/src/aeadKeys/exportOnly.ts → src/aeads/exportOnly.ts
diff --git 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/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();

diff --git 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";