Merge pull request #333 from dajiaji/move-dhkem-x448-impl

Move dhkem-x448 impl to x/dhkem-x448.

Author: dajiaji

core/mod.ts

@@ -30,6 +30,7 @@ export {
   HkdfSha512Native,
 } from "./src/kdfs/hkdf.ts";
 export { Dhkem } from "./src/kems/dhkem.ts";
+export { Ec } from "./src/kems/dhkemPrimitives/ec.ts";
 export {
   base64UrlToBytes,
   concat,

mod_core.ts

@@ -32,6 +32,7 @@ export {
   HkdfSha512Native,
 } from "./core/src/kdfs/hkdf.ts";
 export { Dhkem } from "./core/src/kems/dhkem.ts";
+export { Ec } from "./core/src/kems/dhkemPrimitives/ec.ts";
 export {
   base64UrlToBytes,
   concat,

src/cipherSuite.ts

@@ -5,17 +5,17 @@ import { Aes128Gcm, Aes256Gcm } from "../core/src/aeads/aesGcm.ts";
 import { ExportOnly } from "../core/src/aeads/exportOnly.ts";
 import { Chacha20Poly1305 } from "../x/chacha20poly1305/src/chacha20Poly1305.ts";
 import { InvalidParamError } from "../core/src/errors.ts";
-import { HkdfSha256 } from "../x/dhkem-x25519/src/hkdfSha256.ts";
 import { HkdfSha384 } from "./kdfs/hkdfSha384.ts";
-import { HkdfSha512 } from "./kdfs/hkdfSha512.ts";
 import { DhkemP256HkdfSha256 } from "./kems/dhkemP256.ts";
 import { DhkemP384HkdfSha384 } from "./kems/dhkemP384.ts";
 import { DhkemP521HkdfSha512 } from "./kems/dhkemP521.ts";
-import { DhkemX25519HkdfSha256 } from "../x/dhkem-x25519/src/dhkemX25519.ts";
-import { DhkemX448HkdfSha512 } from "./kems/dhkemX448.ts";
 import { AeadId, KdfId, KemId } from "../core/src/identifiers.ts";
 import { CipherSuiteNative } from "../core/src/cipherSuiteNative.ts";
 
+import { DhkemX25519HkdfSha256, HkdfSha256 } from "../x/dhkem-x25519/mod.ts";
+
+import { DhkemX448HkdfSha512, HkdfSha512 } from "../x/dhkem-x448/mod.ts";
+
 /**
  * The Hybrid Public Key Encryption (HPKE) ciphersuite,
  * which supports all of the ciphersuites defined in

src/kems/dhkemP521.ts

@@ -1,7 +1,6 @@
-import { KemId } from "../../core/src/identifiers.ts";
-import { HkdfSha512 } from "../kdfs/hkdfSha512.ts";
-import { Dhkem } from "../../core/src/kems/dhkem.ts";
-import { Ec } from "../../core/src/kems/dhkemPrimitives/ec.ts";
+import { Dhkem, Ec, KemId } from "../../mod_core.ts";
+
+import { HkdfSha512 } from "../../x/dhkem-x448/mod.ts";
 
 export class DhkemP521HkdfSha512 extends Dhkem {
   public readonly id: KemId = KemId.DhkemP521HkdfSha512;

test/cipherSuiteNative.test.ts

@@ -23,7 +23,7 @@ import {
   DhkemP521HkdfSha512Native,
 } from "../core/src/kems/dhkemNative.ts";
 import { DhkemX25519HkdfSha256 } from "../x/dhkem-x25519/src/dhkemX25519.ts";
-import { DhkemX448HkdfSha512 } from "../src/kems/dhkemX448.ts";
+import { DhkemX448HkdfSha512 } from "../x/dhkem-x448/src/dhkemX448.ts";
 import { isDeno } from "../core/src/utils/misc.ts";
 
 import { concat, hexToBytes, loadCrypto } from "../core/test/utils.ts";

test/dhkemPrimitives.test.ts

@@ -4,14 +4,15 @@ import { describe, it } from "@std/testing/bdd";
 import * as errors from "../core/src/errors.ts";
 import { KemId } from "../core/src/identifiers.ts";
 import { HkdfSha384 } from "../src/kdfs/hkdfSha384.ts";
-import { HkdfSha512 } from "../src/kdfs/hkdfSha512.ts";
 import { Ec } from "../core/src/kems/dhkemPrimitives/ec.ts";
-import { X448 } from "../src/kems/dhkemPrimitives/x448.ts";
 import { isDeno } from "../core/src/utils/misc.ts";
 
 import { HkdfSha256 } from "../x/dhkem-x25519/src/hkdfSha256.ts";
 import { X25519 } from "../x/dhkem-x25519/src/x25519.ts";
 
+import { HkdfSha512 } from "../x/dhkem-x448/src/hkdfSha512.ts";
+import { X448 } from "../x/dhkem-x448/src/x448.ts";
+
 describe("derivePublicKey", () => {
   describe("with valid parameters", () => {
     it("should return a proper public key with Ec(DhkemP256HkdfSha256)", async () => {

test/kdfContext.test.ts

@@ -3,12 +3,12 @@ import { assertEquals, assertRejects } from "@std/assert";
 import { describe, it } from "@std/testing/bdd";
 
 import { HkdfSha384 } from "../src/kdfs/hkdfSha384.ts";
-import { HkdfSha512 } from "../src/kdfs/hkdfSha512.ts";
 import { AeadId, KdfId, KemId } from "../core/src/identifiers.ts";
 import { i2Osp } from "../core/src/utils/misc.ts";
 import { loadCrypto } from "../core/test/utils.ts";
 
 import { HkdfSha256 } from "../x/dhkem-x25519/src/hkdfSha256.ts";
+import { HkdfSha512 } from "../x/dhkem-x448/src/hkdfSha512.ts";
 
 // deno-fmt-ignore
 const SUITE_ID_HEADER_HPKE = new Uint8Array([

test/kemContext.test.ts

@@ -6,11 +6,11 @@ import { KemId } from "../core/src/identifiers.ts";
 import { DhkemP256HkdfSha256 } from "../src/kems/dhkemP256.ts";
 import { DhkemP384HkdfSha384 } from "../src/kems/dhkemP384.ts";
 import { DhkemP521HkdfSha512 } from "../src/kems/dhkemP521.ts";
-import { DhkemX448HkdfSha512 } from "../src/kems/dhkemX448.ts";
 import { isDeno } from "../core/src/utils/misc.ts";
 import { loadCrypto } from "../core/test/utils.ts";
 
 import { DhkemX25519HkdfSha256 } from "../x/dhkem-x25519/src/dhkemX25519.ts";
+import { DhkemX448HkdfSha512 } from "../x/dhkem-x448/src/dhkemX448.ts";
 
 describe("constructor", () => {
   describe("with valid parameters", () => {

test/sample.test.ts

@@ -7,14 +7,15 @@ import * as errors from "../core/src/errors.ts";
 import { DhkemP256HkdfSha256 } from "../src/kems/dhkemP256.ts";
 import { DhkemP384HkdfSha384 } from "../src/kems/dhkemP384.ts";
 import { DhkemP521HkdfSha512 } from "../src/kems/dhkemP521.ts";
-import { DhkemX448HkdfSha512 } from "../src/kems/dhkemX448.ts";
 import { HkdfSha384 } from "../src/kdfs/hkdfSha384.ts";
-import { HkdfSha512 } from "../src/kdfs/hkdfSha512.ts";
 import { isDeno } from "../core/src/utils/misc.ts";
 
 import { DhkemX25519HkdfSha256 } from "../x/dhkem-x25519/src/dhkemX25519.ts";
 import { HkdfSha256 } from "../x/dhkem-x25519/src/hkdfSha256.ts";
 
+import { DhkemX448HkdfSha512 } from "../x/dhkem-x448/src/dhkemX448.ts";
+import { HkdfSha512 } from "../x/dhkem-x448/src/hkdfSha512.ts";
+
 import { concat, loadCrypto } from "../core/test/utils.ts";
 
 describe("README examples", () => {

x/dhkem-x448/deno.json

@@ -7,6 +7,14 @@
     "@std/assert": "jsr:@std/[email protected]",
     "@std/testing": "jsr:@std/testing@^1.0.0"
   },
+  "publish": {
+    "exclude": [
+      "dnt.ts",
+      "samples/",
+      "test/",
+      "tsconfig.json"
+    ]
+  },
   "fmt": {
     "include": [
       "**/*.md",