Rename KemPrimitives to DhkemPrimitives.

src/interfaces/kemPrimitives.ts → src/interfaces/dhkemPrimitives.ts

@@ -7,7 +7,7 @@ export const LABEL_DKP_PRK = new Uint8Array([100, 107, 112, 95, 112, 114, 107]);
 // b"sk"
 export const LABEL_SK = new Uint8Array([115, 107]);
 
-export interface KemPrimitives {
+export interface DhkemPrimitives {
   serializePublicKey(key: CryptoKey): Promise<ArrayBuffer>;
 
   deserializePublicKey(key: ArrayBuffer): Promise<CryptoKey>;
@@ -22,11 +22,13 @@ export interface KemPrimitives {
     isPublic: boolean,
   ): Promise<CryptoKey>;
 
-  derivePublicKey(key: CryptoKey): Promise<CryptoKey>;
-
   generateKeyPair(): Promise<CryptoKeyPair>;
 
   deriveKeyPair(ikm: ArrayBuffer): Promise<CryptoKeyPair>;
 
+  // DHKEM-specific function.
+  derivePublicKey(key: CryptoKey): Promise<CryptoKey>;
+
+  // DHKEM-specific function.
   dh(sk: CryptoKey, pk: CryptoKey): Promise<ArrayBuffer>;
 }

src/kems/dhkem.ts

@@ -1,6 +1,6 @@
 import type { KdfInterface } from "../interfaces/kdfInterface.ts";
 import type { KemInterface } from "../interfaces/kemInterface.ts";
-import type { KemPrimitives } from "../interfaces/kemPrimitives.ts";
+import type { DhkemPrimitives } from "../interfaces/dhkemPrimitives.ts";
 import type { SenderContextParams } from "../interfaces/senderContextParams.ts";
 import type { RecipientContextParams } from "../interfaces/recipientContextParams.ts";
 
@@ -27,10 +27,10 @@ export class Dhkem implements KemInterface {
   public readonly encSize: number = 0;
   public readonly publicKeySize: number = 0;
   public readonly privateKeySize: number = 0;
-  protected _prim: KemPrimitives;
+  protected _prim: DhkemPrimitives;
   protected _kdf: KdfInterface;
 
-  constructor(id: KemId, prim: KemPrimitives, kdf: KdfInterface) {
+  constructor(id: KemId, prim: DhkemPrimitives, kdf: KdfInterface) {
     this.id = id;
     this._prim = prim;
     this._kdf = kdf;

src/kems/dhkemPrimitives/ec.ts

@@ -1,11 +1,11 @@
-import type { KemPrimitives } from "../../interfaces/kemPrimitives.ts";
+import type { DhkemPrimitives } from "../../interfaces/dhkemPrimitives.ts";
 import type { KdfInterface } from "../../interfaces/kdfInterface.ts";
 
 import { NativeAlgorithm } from "../../algorithm.ts";
 import { EMPTY } from "../../consts.ts";
 import * as errors from "../../errors.ts";
 import { KemId } from "../../identifiers.ts";
-import { KEM_USAGES, LABEL_DKP_PRK } from "../../interfaces/kemPrimitives.ts";
+import { KEM_USAGES, LABEL_DKP_PRK } from "../../interfaces/dhkemPrimitives.ts";
 import { Bignum } from "../../utils/bignum.ts";
 import { base64UrlToBytes, i2Osp } from "../../utils/misc.ts";
 
@@ -71,7 +71,7 @@ const PKCS8_ALG_ID_P_521 = new Uint8Array([
   4, 66,
 ]);
 
-export class Ec extends NativeAlgorithm implements KemPrimitives {
+export class Ec extends NativeAlgorithm implements DhkemPrimitives {
   private _hkdf: KdfInterface;
   private _alg: EcKeyGenParams;
   private _nPk: number;

src/kems/dhkemPrimitives/secp256k1.ts

@@ -1,7 +1,7 @@
 // @ts-ignore: for "npm:"
 import { secp256k1 } from "npm:@noble/[email protected]/secp256k1";
 
-import type { KemPrimitives } from "../../interfaces/kemPrimitives.ts";
+import type { DhkemPrimitives } from "../../interfaces/dhkemPrimitives.ts";
 import type { KdfInterface } from "../../interfaces/kdfInterface.ts";
 
 import { EMPTY } from "../../consts.ts";
@@ -10,12 +10,12 @@ import {
   KEM_USAGES,
   LABEL_DKP_PRK,
   LABEL_SK,
-} from "../../interfaces/kemPrimitives.ts";
+} from "../../interfaces/dhkemPrimitives.ts";
 import { XCryptoKey } from "../../xCryptoKey.ts";
 
 const ALG_NAME = "ECDH";
 
-export class Secp256k1 implements KemPrimitives {
+export class Secp256k1 implements DhkemPrimitives {
   private _hkdf: KdfInterface;
   private _nPk: number;
   private _nSk: number;

src/kems/dhkemPrimitives/x25519.ts

@@ -1,7 +1,7 @@
 // @ts-ignore: for "npm:"
 import { ed25519, x25519 } from "npm:@noble/[email protected]/ed25519";
 
-import type { KemPrimitives } from "../../interfaces/kemPrimitives.ts";
+import type { DhkemPrimitives } from "../../interfaces/dhkemPrimitives.ts";
 import type { KdfInterface } from "../../interfaces/kdfInterface.ts";
 
 import * as consts from "../../consts.ts";
@@ -10,13 +10,13 @@ import {
   KEM_USAGES,
   LABEL_DKP_PRK,
   LABEL_SK,
-} from "../../interfaces/kemPrimitives.ts";
+} from "../../interfaces/dhkemPrimitives.ts";
 import { base64UrlToBytes } from "../../utils/misc.ts";
 import { XCryptoKey } from "../../xCryptoKey.ts";
 
 const ALG_NAME = "X25519";
 
-export class X25519 implements KemPrimitives {
+export class X25519 implements DhkemPrimitives {
   private _hkdf: KdfInterface;
   private _nPk: number;
   private _nSk: number;

src/kems/dhkemPrimitives/x448.ts

@@ -1,7 +1,7 @@
 // @ts-ignore: for "npm:"
 import { ed448, x448 } from "npm:@noble/[email protected]/ed448";
 
-import type { KemPrimitives } from "../../interfaces/kemPrimitives.ts";
+import type { DhkemPrimitives } from "../../interfaces/dhkemPrimitives.ts";
 import type { KdfInterface } from "../../interfaces/kdfInterface.ts";
 
 import * as consts from "../../consts.ts";
@@ -10,13 +10,13 @@ import {
   KEM_USAGES,
   LABEL_DKP_PRK,
   LABEL_SK,
-} from "../../interfaces/kemPrimitives.ts";
+} from "../../interfaces/dhkemPrimitives.ts";
 import { base64UrlToBytes } from "../../utils/misc.ts";
 import { XCryptoKey } from "../../xCryptoKey.ts";
 
 const ALG_NAME = "X448";
 
-export class X448 implements KemPrimitives {
+export class X448 implements DhkemPrimitives {
   private _hkdf: KdfInterface;
   private _nPk: number;
   private _nSk: number;