ver 0.2.8

Author: Srabutdotcom

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@tls/enum",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "exports": "./src/mod.ts",
   "publish": {
     "exclude": ["dist/"]
@@ -13,9 +13,10 @@
     }
   },
   "imports": {
-    "@noble/curves": "npm:@noble/curves@^1.6.0",
+    "@noble/curves": "npm:@noble/curves@^1.7.0",
     "@std/assert": "jsr:@std/assert@^1.0.2",
     "@tls/extension": "jsr:@tls/extension@^0.2.0",
+    "@tls/record": "jsr:@tls/record@^0.0.6",
     "@tls/struct": "jsr:@tls/struct@^0.2.6"
   }
 }

src/contentype.js

@@ -1,9 +1,9 @@
 // deno-lint-ignore-file no-slow-types
 // @ts-self-types="../type/contentype.d.ts"
 
-import { Uint8 } from "./dep.ts";
+import { Uint8, TLSPlaintext } from "./dep.ts";
 import { Enum } from "./enum.js";
-
+import { Version } from "./version.js";
 
 /**
  * The higher-level protocol used to process the enclosed
@@ -35,6 +35,14 @@ export class ContentType extends Enum {
 
    /**return 8 */
    get bit() { return 8 }
+
+   tlsPlainText(fragment){
+      return TLSPlaintext.createFrom(
+         this,
+         Version.TLS13,
+         fragment
+      )
+   }
 }
 
 //npx -p typescript tsc ./src/contentype.js --declaration --allowJs --emitDeclarationOnly --lib ESNext --outDir ./dist

src/dep.ts

@@ -1,8 +1,11 @@
 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 { 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 { p256 } from '@noble/curves/p256'
+export { p384 } from '@noble/curves/p384'
+export { p521 } from '@noble/curves/p521'
+export { x25519 } from '@noble/curves/ed25519'
+export { x448 } from '@noble/curves/ed448'
+export * as utils from "@noble/curves/abstract/utils"
+export { TLSPlaintext } from "@tls/record"
+

src/handshaketype.js

@@ -103,13 +103,15 @@ export class HandshakeType extends Enum {
    handshake(message){
       return Handshake.fromMessage(this, message)
    }
+
+   get Uint8(){ return Uint8.fromValue(+this)}
 }
 
-export class Handshake extends Struct {
+export class Handshake extends Uint8Array {
    msg_type
    message
    static fromMessage(msg_type, message){
-      return new Handshake(msg_type, Uint24.fromValue(message.length), message)
+      return new Handshake(msg_type, message)
    }
    static from(array){
       const copy = Uint8Array.from(array)
@@ -118,10 +120,12 @@ export class Handshake extends Struct {
       const message = copy.subarray(4, 4 + lengthOf)
       return new Handshake(msg_type, lengthOf, message)
    }
-   constructor(msg_type, length, message){
-      super(+msg_type, length, message)
+   constructor(msg_type, message){
+      const struct = new Struct(msg_type.Uint8,  Uint24.fromValue(message.length), message)
+      super(struct)
       this.msg_type = msg_type;
       this.message = message
+      this.items = struct.items
    }
 }
 

test/enum_test.js

@@ -1,5 +1,6 @@
 import { Enum } from "../src/enum.js";
 import { assertEquals } from "jsr:@std/assert";
+
 /**
 * @class Color
 * @extends Enum
@@ -65,3 +66,4 @@ Deno.test(
         assertEquals(Color.GREEN.name, "GREEN")
     }
 )
+

test/namedgroup_test.js

@@ -19,4 +19,15 @@ Deno.test(
    }
 )
 
-const x25519 = NamedGroup.X25519.keyShareEntry(); debugger;
+//const x25519 = NamedGroup.X25519.keyShareEntry(); 
+
+const x25519 = NamedGroup.X25519;
+      assertEquals(x25519.name, 'X25519')
+      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)
+
+debugger;

type/contentype.d.ts

@@ -1,29 +1,57 @@
+import { Uint8, TLSPlaintext } from "../src/dep.ts";
+import { Enum } from "../src/enum.js";
+import { Version } from "../src/version.js";
+
 /**
- * The higher-level protocol used to process the enclosed
-      fragment
+ * Represents the higher-level protocol used to process the enclosed fragment.
+ * Defined in RFC 8446 Section 5.1.
  * @see https://datatracker.ietf.org/doc/html/rfc8446#section-5.1
- * @export
- * @extends {Enum}
  */
 export class ContentType extends Enum {
-    static INVALID: ContentType;
-    static CHANGE_CIPHER_SPEC: ContentType;
-    static ALERT: ContentType;
-    static HANDSHAKE: ContentType;
-    static APPLICATION_DATA: ContentType;
-    /**
-     * check octet and return valid ContentType
-     *
-     * @static
-     * @param {Uint8Array} octet
-     * @returns {ContentType }
-     */
-    static from(octet: Uint8Array): ContentType;
-    /**return 8 */
-    get bit(): number;
-
-    /**return Uint8  */
-    get Uint8(): Uint8
+  /** Represents an invalid ContentType (value 0). */
+  static INVALID: ContentType;
+
+  /** Represents the ChangeCipherSpec ContentType (value 20). */
+  static CHANGE_CIPHER_SPEC: ContentType;
+
+  /** Represents the Alert ContentType (value 21). */
+  static ALERT: ContentType;
+
+  /** Represents the Handshake ContentType (value 22). */
+  static HANDSHAKE: ContentType;
+
+  /** Represents the ApplicationData ContentType (value 23). */
+  static APPLICATION_DATA: ContentType;
+
+  /**
+   * Checks the given octet and returns a valid ContentType instance.
+   * 
+   * @param {Uint8Array} octet - A single-octet Uint8Array to evaluate.
+   * @returns {ContentType} The corresponding ContentType or throws an error if invalid.
+   */
+  static from(octet: Uint8Array): ContentType;
+
+  /**
+   * Returns the Uint8 representation of the ContentType.
+   * 
+   * @readonly
+   * @type {Uint8}
+   */
+  get Uint8(): Uint8;
+
+  /**
+   * Returns the bit size of the ContentType.
+   * 
+   * @readonly
+   * @type {8}
+   */
+  get bit(): 8;
+
+  /**
+   * Creates a `TLSPlaintext` instance using the ContentType, TLS version, and fragment.
+   * 
+   * @param {Uint8Array} fragment - The plaintext fragment to include.
+   * @returns {TLSPlaintext} A TLSPlaintext object created with the specified parameters.
+   */
+  tlsPlainText(fragment: Uint8Array): TLSPlaintext;
 }
-import { Uint8 } from "../src/dep.ts";
-import { Enum } from "../src/enum.js";