Merge pull request #335 from dajiaji/move-hybridkem-x25519-kyber768-to-x

Move hybridkem-x25519-kyber768 impl to x/hybridkem-x25519-kyber768.

Author: dajiaji

core/mod.ts

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

src/kems/hybridkem.ts renamed to core/src/kems/hybridkem.ts

@@ -1,27 +1,21 @@
-import type {
-  DhkemInterface,
-  KdfInterface,
-  KemInterface,
-  RecipientContextParams,
-  SenderContextParams,
-} from "../../mod_core.ts";
+import type { DhkemInterface } from "../interfaces/dhkemInterface.ts";
+import type { KdfInterface } from "../interfaces/kdfInterface.ts";
+import type { KemInterface } from "../interfaces/kemInterface.ts";
+import type { SenderContextParams } from "../interfaces/senderContextParams.ts";
+import type { RecipientContextParams } from "../interfaces/recipientContextParams.ts";
 
+import { EMPTY } from "../consts.ts";
 import {
-  concat,
   DeserializeError,
-  i2Osp,
   InvalidParamError,
-  isCryptoKeyPair,
-  KemId,
-  LABEL_DKP_PRK,
-  LABEL_SK,
   NotSupportedError,
   SerializeError,
-  SUITE_ID_HEADER_KEM,
-  XCryptoKey,
-} from "../../mod_core.ts";
-
-const EMPTY = new Uint8Array();
+} from "../errors.ts";
+import { KemId } from "../identifiers.ts";
+import { LABEL_DKP_PRK, LABEL_SK } from "../interfaces/dhkemPrimitives.ts";
+import { SUITE_ID_HEADER_KEM } from "../interfaces/kemInterface.ts";
+import { concat, i2Osp, isCryptoKeyPair } from "../utils/misc.ts";
+import { XCryptoKey } from "../xCryptoKey.ts";
 
 export class Hybridkem implements KemInterface {
   public readonly id: KemId = KemId.NotAssigned;

mod_core.ts

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

x/hybridkem-x25519-kyber768/mod.ts

@@ -1 +1 @@
-export { HybridkemX25519Kyber768 } from "../../src/kems/hybridkemX25519Kyber768.ts";
+export { HybridkemX25519Kyber768 } from "./src/hybridkemX25519Kyber768.ts";

src/kems/hybridkemX25519Kyber768.ts renamed to x/hybridkem-x25519-kyber768/src/hybridkemX25519Kyber768.ts

@@ -1,10 +1,10 @@
-import type { DhkemInterface } from "../../mod_core.ts";
+import type { DhkemInterface } from "../../../mod_core.ts";
 
-import { Dhkem, KemId } from "../../mod_core.ts";
-import { HkdfSha256 } from "../../x/dhkem-x25519/src/hkdfSha256.ts";
-import { X25519 } from "../../x/dhkem-x25519/src/x25519.ts";
+import { Dhkem, Hybridkem, KemId } from "../../../mod_core.ts";
+
+import { HkdfSha256 } from "../../../x/dhkem-x25519/src/hkdfSha256.ts";
+import { X25519 } from "../../../x/dhkem-x25519/src/x25519.ts";
 
-import { Hybridkem } from "./hybridkem.ts";
 import { KemKyber768 } from "./kemKyber768.ts";
 
 class DhkemX25519HkdfSha256 extends Dhkem implements DhkemInterface {

src/kems/kemKyber768.ts renamed to x/hybridkem-x25519-kyber768/src/kemKyber768.ts

@@ -5,7 +5,7 @@ import type {
   KemInterface,
   RecipientContextParams,
   SenderContextParams,
-} from "../../mod_core.ts";
+} from "../../../mod_core.ts";
 
 import {
   DecapError,
@@ -19,9 +19,9 @@ import {
   NotSupportedError,
   SerializeError,
   XCryptoKey,
-} from "../../mod_core.ts";
+} from "../../../mod_core.ts";
 
-import { Kyber768 } from "./primitives/kyber/kyber768.ts";
+import { Kyber768 } from "./kyber/kyber768.ts";
 
 const ALG_NAME = "Keyber768";