add key generation functionality into namedgroup.js

Author: Srabutdotcom

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@tls/enum",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "exports": "./src/mod.ts",
   "publish": {
     "exclude": ["dist/"]

src/dep.ts

@@ -1,8 +1,8 @@
 export { Struct, Constrained, Byte } from "@tls/struct"
 export { Uint8, Uint16, Uint24, Uint32 } from "@tls/struct"
 export { Extension, KeyExchange, KeyShareEntry } from "@tls/extension"
-/* export { p256 } from 'npm:@noble/[email protected]/p256'
+export { p256 } from 'npm:@noble/[email protected]/p256'
 export { p384 } from 'npm:@noble/[email protected]/p384'
 export { p521 } from 'npm:@noble/[email protected]/p521'
 export { x25519 } from 'npm:@noble/[email protected]/ed25519'
-export { x448 } from 'npm:@noble/[email protected]/ed448' */
+export { x448 } from 'npm:@noble/[email protected]/ed448'

src/namedgroup.js

@@ -1,7 +1,7 @@
 // deno-lint-ignore-file no-slow-types
 // @ts-self-types="../type/namedgroup.d.ts"
 
-import { /* p256, p384, p521, x25519, x448,  */ Uint16, KeyExchange, KeyShareEntry } from "./dep.ts";
+import { p256, p384, p521, x25519, x448, Uint16, KeyExchange, KeyShareEntry } from "./dep.ts";
 import { Enum } from "./enum.js";
 
 /**
@@ -53,25 +53,7 @@ export class NamedGroup extends Enum {
     */
    constructor(name, value) {
       super(name, value);
-      /* switch (this.name) {
-         case "SECP256R1": {
-            this.#keyGen = p256; break;
-         }
-         case "SECP384R1": {
-            this.#keyGen = p384; break;
-         }
-         case "SECP521R1": {
-            this.#keyGen = p521; break;
-         }
-         case "X25519": {
-            this.#keyGen = x25519; break;
-         }
-         case "X448": {
-            this.#keyGen = x448; break;
-         }
-      } */
-      this.#privateKey = this.#keyGen?.utils.randomPrivateKey();
-      this.#publicKey = this.#keyGen?.getPublicKey(this.#privateKey);
+
    }
 
    /**
@@ -86,21 +68,38 @@ export class NamedGroup extends Enum {
     * 
     * @returns {Function} The key generation function.
     */
-   get keyGen() { return this.#keyGen; }
+   get keyGen() {
+      switch (this.name) {
+         case "SECP256R1": return p256;
+         case "SECP384R1": return p384;
+         case "SECP521R1": return p521;
+         case "X25519": return x25519;
+         case "X448": return x448;
+         default: return x25519;
+      }
+   }
 
    /**
     * Gets the private key associated with the NamedGroup.
     * 
     * @returns {Uint8Array} The private key.
     */
-   get privateKey() { return this.#privateKey; }
+   get privateKey() {
+      if (this.#privateKey) return this.#privateKey;
+      this.#privateKey = this.keyGen?.utils.randomPrivateKey();
+      return this.#privateKey
+   }
 
    /**
     * Gets the public key associated with the NamedGroup.
     * 
     * @returns {Uint8Array} The public key.
     */
-   get publicKey() { return this.#publicKey; }
+   get publicKey() { 
+      if(this.#publicKey)return this.#publicKey;
+      this.#publicKey = this.keyGen?.getPublicKey(this.privateKey);
+      return this.#publicKey;
+    }
 
    /**
     * Computes the shared key with a peer's public key.
@@ -109,7 +108,7 @@ export class NamedGroup extends Enum {
     * @returns {Uint8Array} The shared secret.
     */
    getSharedKey(peerPublicKey) {
-      return this.#keyGen?.getSharedSecret(this.#privateKey, peerPublicKey);
+      return this.keyGen?.getSharedSecret(this.#privateKey, peerPublicKey);
    }
 
    /**

test/namedgroup_test.js

@@ -9,16 +9,14 @@ Deno.test(
 
       const x25519 = NamedGroup.X25519;
       assertEquals(x25519.name, 'X25519')
-      /* const pub = x25519.keyGen.getPublicKey(x25519.privateKey);
+      const pub = x25519.keyGen.getPublicKey(x25519.privateKey);
       assertEquals(pub.length, 32)
       const peerPublicKey = crypto.getRandomValues(new Uint8Array(32));
       assertEquals(peerPublicKey.length, 32)
       const sharedKey = x25519.getSharedKey(peerPublicKey)
-      assertEquals(sharedKey.length, 32) */
+      assertEquals(sharedKey.length, 32)
 
    }
 )
 
 
-
-