Merge pull request #330 from dajiaji/refine-chacha20poly1305-test

Make chacha20poly1305 test use @hpke/core.

Author: dajiaji

deno.json

@@ -15,6 +15,7 @@
       "deno.json",
       "deno.lock",
       "mod.ts",
+      "mod_core.ts",
       "src/",
       "x/chacha20poly1305/src/"
     ],
@@ -36,6 +37,7 @@
       "core/",
       "dnt.ts",
       "mod.ts",
+      "mod_core.ts",
       "samples/",
       "src/",
       "x/",

mod_core.ts

@@ -0,0 +1,31 @@
+// workaround for dnt.
+// It's the samme as core/mod.ts and a temporary solution until dnt supports.
+export type { AeadEncryptionContext } from "./core/src/interfaces/aeadEncryptionContext.ts";
+export type { AeadInterface } from "./core/src/interfaces/aeadInterface.ts";
+export type { CipherSuiteParams } from "./core/src/interfaces/cipherSuiteParams.ts";
+export type {
+  EncryptionContext,
+  RecipientContext,
+  SenderContext,
+} from "./core/src/interfaces/encryptionContext.ts";
+export type { KdfInterface } from "./core/src/interfaces/kdfInterface.ts";
+export type { KemInterface } from "./core/src/interfaces/kemInterface.ts";
+export type { PreSharedKey } from "./core/src/interfaces/preSharedKey.ts";
+export type { RecipientContextParams } from "./core/src/interfaces/recipientContextParams.ts";
+export type { CipherSuiteSealResponse } from "./core/src/interfaces/responses.ts";
+export type { SenderContextParams } from "./core/src/interfaces/senderContextParams.ts";
+
+export { Aes128Gcm, Aes256Gcm } from "./core/src/aeads/aesGcm.ts";
+export { ExportOnly } from "./core/src/aeads/exportOnly.ts";
+export * from "./core/src/errors.ts";
+export { AeadId, KdfId, KemId } from "./core/src/identifiers.ts";
+
+export {
+  CipherSuite,
+  DhkemP256HkdfSha256,
+  DhkemP384HkdfSha384,
+  DhkemP521HkdfSha512,
+  HkdfSha256,
+  HkdfSha384,
+  HkdfSha512,
+} from "./core/src/native.ts";

x/chacha20poly1305/test/chacha20poly1305.test.ts

@@ -1,7 +1,13 @@
 import { assertEquals } from "@std/assert";
 import { describe, it } from "@std/testing/bdd";
 
-import { AeadId, CipherSuite, KdfId, KemId } from "../../../mod.ts";
+import { AeadId } from "../../../core/src/identifiers.ts";
+import {
+  CipherSuite,
+  DhkemP256HkdfSha256,
+  HkdfSha256,
+} from "../../../mod_core.ts";
+
 import { loadCrypto } from "../../../core/test/utils.ts";
 
 import { Chacha20Poly1305 } from "../mod.ts";
@@ -52,8 +58,8 @@ describe("CipherSuite", () => {
   describe("constructor with Chacha20Poly1305", () => {
     it("should have a correct ciphersuite", () => {
       const suite: CipherSuite = new CipherSuite({
-        kem: KemId.DhkemP256HkdfSha256,
-        kdf: KdfId.HkdfSha256,
+        kem: new DhkemP256HkdfSha256(),
+        kdf: new HkdfSha256(),
         aead: new Chacha20Poly1305(),
       });
 
@@ -69,8 +75,8 @@ describe("CipherSuite", () => {
     it("should work normally", async () => {
       // setup
       const suite = new CipherSuite({
-        kem: KemId.DhkemP256HkdfSha256,
-        kdf: KdfId.HkdfSha256,
+        kem: new DhkemP256HkdfSha256(),
+        kdf: new HkdfSha256(),
         aead: new Chacha20Poly1305(),
       });