ver 0.1.7

Author: Srabutdotcom

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@tls/enum",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "exports": "./src/mod.ts",
   "publish": {
     "exclude": ["dist/"]
@@ -14,8 +14,9 @@
   },
   "imports": {
     "@aicone/byte": "jsr:@aicone/byte@^0.5.0",
+    "@noble/curves": "npm:@noble/curves@^1.6.0",
     "@std/assert": "jsr:@std/assert@^1.0.2",
-    "@tls/extension": "jsr:@tls/extension@^0.0.6",
+    "@tls/extension": "jsr:@tls/extension@^0.1.0",
     "@tls/struct": "jsr:@tls/struct@^0.2.2"
   }
 }

src/dep.ts

@@ -1,8 +1,8 @@
 export { Struct, Constrained, Byte } from "@tls/struct"
 export { Uint8, Uint16, Uint24, Uint32 } from "@tls/struct"
-export { Extension } from "@tls/extension"
-export { p256 } from 'npm:@noble/[email protected]/p256'
+export { Extension, KeyExchange, KeyShareEntry } from "@tls/extension"
+/* 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/handshaketype.js

@@ -112,9 +112,10 @@ export class Handshake extends Struct {
       return new Handshake(msg_type, Uint24.fromValue(message.length), message)
    }
    static from(array){
-      const msg_type = HandshakeType.fromValue(array[0]);
-      const length = Uint24.from(array.subarray(1,3));
-      const message = array.subarray(3, 3 + length.value)
+      const copy = Uint8Array.from(array)
+      const msg_type = HandshakeType.fromValue(copy[0]);
+      const length = Uint24.from(copy.subarray(1,3));
+      const message = copy.subarray(3, 3 + length.value)
       return new Handshake(msg_type, length, message)
    }
    constructor(msg_type, length, message){
@@ -124,56 +125,4 @@ export class Handshake extends Struct {
    }
 }
 
-export class ClientHello extends Struct {
-   legacy_version;
-   random;
-   legacy_session;
-   cipher_suites;
-   legacy_compression_methods;
-   extensions;
-   constructor(
-      legacy_version, 
-      random, 
-      legacy_session,
-      cipher_suites, 
-      legacy_compression_methods, 
-      extensions
-   ){
-      super(
-         legacy_version, 
-         random, 
-         legacy_session,
-         cipher_suites, 
-         legacy_compression_methods, 
-         extensions
-      )
-   }
-}
-
-export class ServerHello extends Struct {
-   legacy_version;
-   random;
-   legacy_session_id_echo;
-   cipher_suite;
-   legacy_compression_method ; // Uint8 = 0
-   extensions;
-   constructor(
-      legacy_version, 
-      random, 
-      legacy_session_id_echo,
-      cipher_suite, 
-      legacy_compression_method, 
-      extensions
-   ){
-      super(
-         legacy_version, 
-         random, 
-         legacy_session_id_echo,
-         cipher_suite, 
-         legacy_compression_method, 
-         extensions
-      )
-   }
-}
-
 // npx -p typescript tsc ./src/handshaketype.js --declaration --allowJs --emitDeclarationOnly --lib ESNext --outDir ./dist

src/namedgroup.js

@@ -1,7 +1,7 @@
 // deno-lint-ignore-file no-slow-types
 // @ts-self-types="../type/namedgroup.d.ts"
 
-import { Constrained, p256, p384, p521, Struct, Uint16, Byte, x25519, x448 } from "./dep.ts";
+import { /* p256, p384, p521, x25519, x448,  */ Uint16, KeyExchange, KeyShareEntry } from "./dep.ts";
 import { Enum } from "./enum.js";
 
 /**
@@ -53,7 +53,7 @@ export class NamedGroup extends Enum {
     */
    constructor(name, value) {
       super(name, value);
-      switch (this.name) {
+      /* switch (this.name) {
          case "SECP256R1": {
             this.#keyGen = p256; break;
          }
@@ -69,7 +69,7 @@ export class NamedGroup extends Enum {
          case "X448": {
             this.#keyGen = x448; break;
          }
-      }
+      } */
       this.#privateKey = this.#keyGen?.utils.randomPrivateKey();
       this.#publicKey = this.#keyGen?.getPublicKey(this.#privateKey);
    }
@@ -123,228 +123,7 @@ export class NamedGroup extends Enum {
    }
 }
 
-/**
- * Represents a list of NamedGroup instances.
- */
-export class NamedGroupList extends Constrained {
-   /**
-    * Creates a NamedGroupList instance from the provided NamedGroup instances.
-    * 
-    * @param {...NamedGroup} namedgroup - The NamedGroup instances to include in the list.
-    * @returns {NamedGroupList} A new instance of NamedGroupList.
-    */
-   static fromNamedGroup(...namedgroup) {
-      return new NamedGroupList(...namedgroup);
-   }
-
-   /**
-    * Creates a NamedGroupList from a Uint8Array.
-    * 
-    * @static
-    * @param {Uint8Array} array - The array to parse into a NamedGroupList.
-    * @returns {NamedGroupList} A new instance of NamedGroupList.
-    * @throws {Error} If the length of the array is invalid.
-    */
-   static from(array) {
-      const copy = Uint8Array.from(array);
-      const lengthOf = Byte.from(copy.subarray(0, 2)).value;
-      const namedGroups = [];
-      let offset = 2;
-      while (true) {
-         const namedgroup = NamedGroup.from(copy.subarray(offset));
-         namedGroups.push(namedgroup);
-         offset += 2;
-         if (offset >= lengthOf + 2) break;
-      }
-      return NamedGroupList.fromNamedGroup(...namedGroups);
-   }
-
-   /**
-    * Creates an instance of NamedGroupList.
-    * 
-    * @param {...NamedGroup} namedgroup - The NamedGroup instances to include in the list.
-    */
-   constructor(...namedgroup) {
-      const namedgroupUint16 = namedgroup.map(e => e.Uint16);
-      super(2, 65535, ...namedgroupUint16);
-      this.namedGroups = namedgroup;
-   }
-}
-
-/**
- * Represents a key exchange mechanism.
- */
-export class KeyExchange extends Constrained {
-   /**
-    * Creates a KeyExchange instance from a given octet.
-    * 
-    * @static
-    * @param {Uint8Array} octet - The octet to create the KeyExchange from.
-    * @returns {KeyExchange} A new instance of KeyExchange.
-    */
-   static fromKey(octet) { return new KeyExchange(octet); }
-
-   /**
-    * Creates a KeyExchange from a Uint8Array.
-    * 
-    * @static
-    * @param {Uint8Array} array - The array to parse into a KeyExchange.
-    * @returns {KeyExchange} A new instance of KeyExchange.
-    * @throws {Error} If the length of the array is invalid.
-    */
-   static from(array) {
-      const copy = Uint8Array.from(array);
-      const lengthOf = Byte.from(copy.subarray(0, 2)).value;
-      const octet = copy.subarray(2, 2 + lengthOf);
-      return new KeyExchange(octet);
-   }
-
-   /**
-    * Creates an instance of KeyExchange.
-    * 
-    * @param {Uint8Array} octet - The octet representing the key exchange.
-    */
-   constructor(octet) {
-      super(1, 65535, octet);
-      this.key_exchange = octet;
-   }
-}
-
-/**
- * Represents a key share entry.
- */
-export class KeyShareEntry extends Struct {
-   /**
-    * Creates a KeyShareEntry from a Uint8Array.
-    * 
-    * @static
-    * @param {Uint8Array} array - The array to parse into a KeyShareEntry.
-    * @returns {KeyShareEntry} A new instance of KeyShareEntry.
-    */
-   static from(array) {
-      const copy = Uint8Array.from(array);
-      const group = NamedGroup.from(copy.subarray(0, 2));
-      const key_exchange = KeyExchange.from(copy.subarray(2));
-      return new KeyShareEntry(group, key_exchange);
-   }
 
-   /**
-    * Creates an instance of KeyShareEntry.
-    * 
-    * @param {NamedGroup} group - The NamedGroup associated with the key share.
-    * @param {KeyExchange} key_exchange - The KeyExchange associated with the key share.
-    */
-   constructor(group, key_exchange) {
-      super(group.Uint16, key_exchange);
-      this.group = group;
-      this.key_exchange = key_exchange.key_exchange;
-   }
-}
-
-/**
- * Represents a KeyShare extension in the ClientHello message in TLS handshake.
- * This class holds multiple KeyShareEntry instances and manages their constraints.
- */
-export class KeyShareClientHello extends Constrained {
-   /**
-    * Creates a new instance of KeyShareClientHello from multiple KeyShareEntry instances.
-    * @param {...KeyShareEntry} keyShareEntries - The key share entries to include.
-    * @returns {KeyShareClientHello} An instance of KeyShareClientHello.
-    */
-   static fromKeyShareEntries(...keyShareEntries){
-      return new KeyShareClientHello(...keyShareEntries)}
-   
-   /**
-    * Creates a new instance of KeyShareClientHello from a Uint8Array.
-    * Parses the array to extract KeyShareEntry instances.
-    * @param {Uint8Array} array - The byte array containing KeyShareEntry data.
-    * @returns {KeyShareClientHello} An instance of KeyShareClientHello.
-    */
-   static from(array){
-      const copy = Uint8Array.from(array);
-      const l = Byte.from(copy.subarray(0,2)).value;
-      const keyShareEntries = []
-      for(let offset=2;offset<l;){
-         const keyShareEntry = KeyShareEntry.from(copy.subarray(offset));
-         keyShareEntries.push(keyShareEntry);
-         offset+=keyShareEntry.length
-      }
-      return new KeyShareClientHello(...keyShareEntries);
-   }
-
-   /**
-    * Constructs a new KeyShareClientHello instance.
-    * @param {...KeyShareEntry} keyShareEntries - The key share entries to include in this message.
-    */
-   constructor(...keyShareEntries){
-      super(0, 65535, ...keyShareEntries)
-      this.keyShareEntries = keyShareEntries
-   }
-}
-
-/**
- * Represents a KeyShare extension in the HelloRetryRequest message.
- * This class manages the NamedGroup for key share negotiation.
- */
-export class KeyShareHelloRetryRequest extends Uint16 {
-   /**
-    * Creates a new KeyShareHelloRetryRequest instance from a NamedGroup.
-    * @param {NamedGroup} group - The named group to be included in the request.
-    * @returns {KeyShareHelloRetryRequest} An instance of KeyShareHelloRetryRequest.
-    */
-   static fromGroup(group){return new KeyShareHelloRetryRequest(group)}
-   
-   /**
-    * Creates a new KeyShareHelloRetryRequest instance from a byte array.
-    * Parses the array to extract the NamedGroup.
-    * @param {Uint8Array} array - The byte array containing NamedGroup data.
-    * @returns {KeyShareHelloRetryRequest} An instance of KeyShareHelloRetryRequest.
-    */
-   static from(array){
-      const group = NamedGroup.from(array)
-      return new KeyShareHelloRetryRequest(group)
-   }
-   /**
-    * Constructs a new KeyShareHelloRetryRequest instance.
-    * @param {NamedGroup} group - The named group to be used in this request.
-    */
-   constructor(group){
-      super(+group)
-   }
-}
-
-/**
- * Represents a KeyShare extension in the ServerHello message in TLS handshake.
- * This class holds a single KeyShareEntry and manages its constraints.
- */
-export class KeyShareServerHello extends Uint16 {
-   /**
-    * Creates a new KeyShareServerHello instance from a KeyShareEntry.
-    * @param {KeyShareEntry} keyShareEntry - The key share entry to be included in the message.
-    * @returns {KeyShareServerHello} An instance of KeyShareServerHello.
-    */
-   static fromKeyShareEntry(keyShareEntry){return new KeyShareServerHello(keyShareEntry)}
-
-   /**
-    * Creates a new KeyShareServerHello instance from a byte array.
-    * Parses the array to extract a KeyShareEntry.
-    * @param {Uint8Array} array - The byte array containing KeyShareEntry data.
-    * @returns {KeyShareServerHello} An instance of KeyShareServerHello.
-    */
-   static from(array){
-      const copy = Uint8Array.from(array)
-      const keyShareEntry = KeyShareEntry.from(copy.subarray(offset));
-      return new KeyShareServerHello(keyShareEntry)
-   }
-
-   /**
-    * Constructs a new KeyShareServerHello instance.
-    * @param {KeyShareEntry} keyShareEntry - The key share entry to be used in this message.
-    */
-   constructor(keyShareEntry){
-      super(keyShareEntry)
-   }
-}
 
 
 

test/extensiontype_test.js

@@ -1,8 +1,5 @@
 import { ExtensionType } from "../src/extensiontype.js";
 
-console.log(ExtensionType.KEY_SHARE);
-console.log(ExtensionType.KEY_SHARE)
-
 const codes = [1, 5, 10, 13, 14, 15, 16, 18, 19, 20, 21, 41, 42, 43, 44, 45, 47, 48, 49, 50, 51, 65281]
 for (const e of codes) {
    const parse = ExtensionType.from(new Uint8Array([Math.floor(e / 256), e % 256]))