Move chacha20poly1305 impl to x/chacha20poly1305.

dajiaji · dajiaji · commit b18a1c559470 · 2024-08-14T16:30:04.000+09:00
diff --git a/deno.json b/deno.json
@@ -4,23 +4,29 @@
   "exports": "./mod.ts",
   "imports": {
     "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
+    "@hpke/core": "jsr:@hpke/core@^1.2.9",
     "@std/assert": "jsr:@std/assert@1.0.0",
     "@std/testing": "jsr:@std/testing@^1.0.0"
   },
   "publish": {
+    "include": [
+      "README.md",
+      "core/",
+      "deno.json",
+      "deno.lock",
+      "mod.ts",
+      "src/",
+      "x/chacha20poly1305/src/"
+    ],
     "exclude": [
-      ".github/",
       "core/LICENSE",
       "core/README.md",
       "core/deno.json",
       "core/deno.lock",
       "core/dnt.ts",
+      "core/samples/",
       "core/test/",
-      "core/tsconfig.json",
-      "dnt.ts",
-      "samples/",
-      "test/",
-      "x/"
+      "core/tsconfig.json"
     ]
   },
   "fmt": {
diff --git a/deno.lock b/deno.lock
diff --git a/dnt.ts b/dnt.ts
@@ -22,7 +22,7 @@ await build({
   test: true,
   declaration: "inline",
   scriptModule: "umd",
-  importMap: "./deno.json",
+  importMap: "./import_map_for_dnt.json",
   compilerOptions: {
     lib: ["ES2022", "DOM"],
   },
diff --git a/import_map_for_dnt.json b/import_map_for_dnt.json
@@ -0,0 +1,8 @@
+{
+  "imports": {
+    "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
+    "@hpke/core": "npm:@hpke/core@^1.2.9",
+    "@std/assert": "jsr:@std/assert@1.0.0",
+    "@std/testing": "jsr:@std/testing@^1.0.0"
+  }
+}
diff --git a/src/cipherSuite.ts b/src/cipherSuite.ts
@@ -3,7 +3,7 @@ import type { KemInterface } from "../core/src/interfaces/kemInterface.ts";
 
 import { Aes128Gcm, Aes256Gcm } from "../core/src/aeads/aesGcm.ts";
 import { ExportOnly } from "../core/src/aeads/exportOnly.ts";
-import { Chacha20Poly1305 } from "./aeads/chacha20Poly1305.ts";
+import { Chacha20Poly1305 } from "../x/chacha20poly1305/src/chacha20Poly1305.ts";
 import { InvalidParamError } from "../core/src/errors.ts";
 import { HkdfSha256 } from "./kdfs/hkdfSha256.ts";
 import { HkdfSha384 } from "./kdfs/hkdfSha384.ts";
diff --git a/test/cipherSuiteNative.test.ts b/test/cipherSuiteNative.test.ts
@@ -9,7 +9,7 @@ import {
   KemId,
 } from "../mod.ts";
 import { Aes128Gcm, Aes256Gcm } from "../core/src/aeads/aesGcm.ts";
-import { Chacha20Poly1305 } from "../src/aeads/chacha20Poly1305.ts";
+import { Chacha20Poly1305 } from "../x/chacha20poly1305/mod.ts";
 import { ExportOnly } from "../core/src/aeads/exportOnly.ts";
 import { CipherSuiteNative } from "../core/src/cipherSuiteNative.ts";
 import {
diff --git a/x/chacha20poly1305/deno.json b/x/chacha20poly1305/deno.json
@@ -4,9 +4,17 @@
   "exports": "./mod.ts",
   "imports": {
     "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
+    "@hpke/core": "jsr:@hpke/core@^1.2.9",
     "@std/assert": "jsr:@std/assert@1.0.0",
     "@std/testing": "jsr:@std/testing@^1.0.0"
   },
+  "publish": {
+    "exclude": [
+      "dnt.ts",
+      "samples/",
+      "test/"
+    ]
+  },
   "fmt": {
     "include": [
       "README.md",
diff --git a/x/chacha20poly1305/deno.lock b/x/chacha20poly1305/deno.lock
diff --git a/x/chacha20poly1305/dnt.ts b/x/chacha20poly1305/dnt.ts
@@ -9,7 +9,7 @@ await build({
   test: true,
   declaration: true,
   scriptModule: "umd",
-  importMap: "./deno.json",
+  importMap: "../../import_map_for_dnt.json",
   compilerOptions: {
     lib: ["es2022", "dom"],
   },
diff --git a/x/chacha20poly1305/mod.ts b/x/chacha20poly1305/mod.ts
@@ -1 +1 @@
-export { Chacha20Poly1305 } from "../../src/aeads/chacha20Poly1305.ts";
+export { Chacha20Poly1305 } from "./src/chacha20Poly1305.ts";
diff --git a/x/chacha20poly1305/src/chacha20Poly1305.ts b/x/chacha20poly1305/src/chacha20Poly1305.ts
@@ -1,10 +1,8 @@
 // @ts-ignore: for "npm:"
 import { chacha20poly1305 } from "npm:@noble/ciphers@0.5.3/chacha";
 
-import type { AeadEncryptionContext } from "../../core/src/interfaces/aeadEncryptionContext.ts";
-import type { AeadInterface } from "../../core/src/interfaces/aeadInterface.ts";
-
-import { AeadId } from "../../core/src/identifiers.ts";
+import type { AeadEncryptionContext, AeadInterface } from "@hpke/core";
+import { AeadId } from "@hpke/core";
 
 export class Chacha20Poly1305Context implements AeadEncryptionContext {
   private _key: Uint8Array;
diff --git a/x/chacha20poly1305/tsconfig.json b/x/chacha20poly1305/tsconfig.json
@@ -6,6 +6,6 @@
   }, 
   "include": [
     "mod.ts",
-    "../../src/aeads/chacha20Poly1305.ts"
+    "./src/chacha20Poly1305.ts"
   ]
 }
diff --git a/x/dhkem-secp256k1/test/dhkemSecp256k1.test.ts b/x/dhkem-secp256k1/test/dhkemSecp256k1.test.ts
@@ -1,7 +1,15 @@
 import { assertEquals, assertRejects } from "@std/assert";
 import { describe, it } from "@std/testing/bdd";
 
-import { AeadId, CipherSuite, KdfId, KemId } from "../../../mod.ts";
+import {
+  AeadId,
+  Aes128Gcm,
+  CipherSuite,
+  ExportOnly,
+  HkdfSha256,
+  KdfId,
+  KemId,
+} from "../../../core/mod.ts";
 import { hexToBytes, loadCrypto } from "../../../core/test/utils.ts";
 import { DhkemSecp256k1HkdfSha256 } from "../mod.ts";
 
@@ -152,8 +160,8 @@ describe("CipherSuite", () => {
     it("should have a correct ciphersuite", () => {
       const suite: CipherSuite = new CipherSuite({
         kem: new DhkemSecp256k1HkdfSha256(),
-        kdf: KdfId.HkdfSha256,
-        aead: AeadId.ExportOnly,
+        kdf: new HkdfSha256(),
+        aead: new ExportOnly(),
       });
       assertEquals(suite.kem.secretSize, 32);
       assertEquals(suite.kem.encSize, 33);
@@ -176,8 +184,8 @@ describe("CipherSuite", () => {
       const kem = new DhkemSecp256k1HkdfSha256();
       const suite = new CipherSuite({
         kem: kem,
-        kdf: KdfId.HkdfSha256,
-        aead: AeadId.Aes128Gcm,
+        kdf: new HkdfSha256(),
+        aead: new Aes128Gcm(),
       });
 
       const rkp = await suite.kem.generateKeyPair();
diff --git a/x/dhkem-x25519/test/dhkem-x25519.test.ts b/x/dhkem-x25519/test/dhkem-x25519.test.ts
@@ -1,7 +1,15 @@
 import { assertEquals, assertRejects } from "@std/assert";
 import { describe, it } from "@std/testing/bdd";
 
-import { AeadId, CipherSuite, KdfId, KemId } from "../../../mod.ts";
+import {
+  AeadId,
+  Aes128Gcm,
+  CipherSuite,
+  ExportOnly,
+  HkdfSha256,
+  KdfId,
+  KemId,
+} from "../../../core/mod.ts";
 import { loadCrypto } from "../../../core/test/utils.ts";
 import { DhkemX25519HkdfSha256 } from "../mod.ts";
 
@@ -151,8 +159,8 @@ describe("CipherSuite", () => {
     it("should have a correct ciphersuite", () => {
       const suite: CipherSuite = new CipherSuite({
         kem: new DhkemX25519HkdfSha256(),
-        kdf: KdfId.HkdfSha256,
-        aead: AeadId.ExportOnly,
+        kdf: new HkdfSha256(),
+        aead: new ExportOnly(),
       });
       assertEquals(suite.kem.secretSize, 32);
       assertEquals(suite.kem.encSize, 32);
@@ -175,8 +183,8 @@ describe("CipherSuite", () => {
       const kem = new DhkemX25519HkdfSha256();
       const suite = new CipherSuite({
         kem: kem,
-        kdf: KdfId.HkdfSha256,
-        aead: AeadId.Aes128Gcm,
+        kdf: new HkdfSha256(),
+        aead: new Aes128Gcm(),
       });
 
       const rkp = await suite.kem.generateKeyPair();
diff --git a/x/dhkem-x448/test/dhkem-x448.test.ts b/x/dhkem-x448/test/dhkem-x448.test.ts
@@ -1,7 +1,15 @@
 import { assertEquals, assertRejects } from "@std/assert";
 import { describe, it } from "@std/testing/bdd";
 
-import { AeadId, CipherSuite, KdfId, KemId } from "../../../mod.ts";
+import {
+  AeadId,
+  Aes128Gcm,
+  CipherSuite,
+  ExportOnly,
+  HkdfSha512,
+  KdfId,
+  KemId,
+} from "../../../core/mod.ts";
 import { loadCrypto } from "../../../core/test/utils.ts";
 import { DhkemX448HkdfSha512 } from "../mod.ts";
 
@@ -151,8 +159,8 @@ describe("CipherSuite", () => {
     it("should have a correct ciphersuite", () => {
       const suite: CipherSuite = new CipherSuite({
         kem: new DhkemX448HkdfSha512(),
-        kdf: KdfId.HkdfSha512,
-        aead: AeadId.ExportOnly,
+        kdf: new HkdfSha512(),
+        aead: new ExportOnly(),
       });
       assertEquals(suite.kem.secretSize, 64);
       assertEquals(suite.kem.encSize, 56);
@@ -175,8 +183,8 @@ describe("CipherSuite", () => {
       const kem = new DhkemX448HkdfSha512();
       const suite = new CipherSuite({
         kem: kem,
-        kdf: KdfId.HkdfSha512,
-        aead: AeadId.Aes128Gcm,
+        kdf: new HkdfSha512(),
+        aead: new Aes128Gcm(),
       });
 
       const rkp = await suite.kem.generateKeyPair();

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export { Chacha20Poly1305 } from "../../src/aeads/chacha20Poly1305.ts";`
	`1`	`+export { Chacha20Poly1305 } from "./src/chacha20Poly1305.ts";`