remove @tls/crypto

Author: Srabutdotcom

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@tls/enum",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "exports": "./src/mod.ts",
   "publish": {
     "exclude": ["dist/"]
@@ -17,7 +17,6 @@
     "@noble/hashes": "npm:@noble/hashes@^1.6.1",
     "@peculiar/x509": "npm:@peculiar/x509@^1.12.3",
     "@std/assert": "jsr:@std/assert@^1.0.2",
-    "@tls/crypto": "jsr:@tls/crypto@^0.0.9",
     "@tls/struct": "jsr:@tls/struct@^0.3.2"
   }
 }

src/contentype.js

@@ -115,6 +115,8 @@ export class TLSCiphertext extends Uint8Array {
       struct.set(lengthOf,3);
       struct.set(encrypted_record, 5);
       super(struct)    
+      this.header = struct.subarray(0,5);
+      this.encrypted_record = encrypted_record
    }
 }
 

src/dep.ts

@@ -8,5 +8,5 @@ export * as utils from "@noble/curves/abstract/utils"
 export { HexaDecimal } from "@tls/struct"
 export * as x509 from "@peculiar/x509"
 export * from "@noble/hashes/sha2"
-export * from "@tls/crypto"
+
 

src/signaturescheme.js

@@ -4,7 +4,6 @@
 import { Constrained, Struct, Uint16 } from "./dep.ts";
 import { Enum } from "./enum.js";
 import { sha256 } from "@noble/hashes/sha256"
-import { hkdfExpandLabel } from "./dep.ts"
 import { HandshakeType } from "./handshaketype.js";
 
 /**
@@ -162,8 +161,8 @@ async function signatureFrom(clientHelloMsg, serverHelloMsg, encryptedExtensions
    return signature
 }
 
-export async function finished(serverHS_secret, certificateVerifyMsg) {
-   const finishedKey = hkdfExpandLabel(serverHS_secret, 'finished', new Uint8Array, 32);
+export async function finished(finishedKey, certificateVerifyMsg) {
+   //const finishedKey = hkdfExpandLabel(serverHS_secret, 'finished', new Uint8Array, 32);
    const finishedKeyCrypto = await crypto.subtle.importKey(
       "raw",
       finishedKey,

type/contentype.d.ts

@@ -157,22 +157,32 @@ export class TLSInnerPlaintext extends Uint8Array {
 }
 
 /**
- * Represents a TLSCiphertext structure in the TLS 1.3 protocol.
- * This class extends `Uint8Array` to encapsulate TLSCiphertext data.
+ * Represents a TLSCiphertext structure in a TLS handshake.
+ * Extends `Uint8Array` to include additional TLS-specific data and methods.
  */
-export class TLSCiphertext extends Uint8Array {
+export declare class TLSCiphertext extends Uint8Array {
   /**
-   * Creates a TLSCiphertext instance from a given array.
-   *
-   * @param {Uint8Array } array - The input array to parse.
-   * @returns {TLSCiphertext} A new instance of TLSCiphertext.
+   * Constructs a new `TLSCiphertext` instance from an existing array.
+   * 
+   * @param array - The array containing the ciphertext data.
+   * @returns A new instance of `TLSCiphertext`.
    */
-  static from(array: Uint8Array): TLSCiphertext;
+  static from(array: Uint8Array | number[]): TLSCiphertext;
 
   /**
-   * Constructs a TLSCiphertext structure.
-   *
-   * @param {Uint8Array} encrypted_record - The encrypted record bytes.
+   * Constructs a `TLSCiphertext` instance.
+   * 
+   * @param encrypted_record - The encrypted record data.
    */
   constructor(encrypted_record: Uint8Array);
+
+  /**
+   * The header portion of the TLSCiphertext.
+   */
+  header: Uint8Array;
+
+  /**
+   * The encrypted record data within the TLSCiphertext.
+   */
+  encrypted_record: Uint8Array;
 }

type/signaturescheme.d.ts

@@ -161,13 +161,13 @@ export function signatureFrom(
 /**
  * Verifies and generates the HMAC for the given data.
  *
- * @param {Uint8Array} serverHS_secret - The server handshake secret used for key derivation.
+ * @param {Uint8Array} finishedKey - The key used to compute the finished message..
  * @param {object} certificateVerifyMsg - The certificate verify message object.
  * @param {Uint8Array} certificateVerifyMsg.message.transcriptHash - The transcript hash from the message.
  * @returns {Promise<Uint8Array>} A promise that resolves to the verify_data HMAC value as a Uint8Array.
  */
 export declare function finished(
-  serverHS_secret: Uint8Array,
+  finishedKey: Uint8Array,
   certificateVerifyMsg: {
     message: {
       transcriptHash: Uint8Array;
@@ -176,13 +176,22 @@ export declare function finished(
 ): Promise<Uint8Array>;
 
 /**
- * Represents the Finished message as a Uint8Array.
+ * Represents the output of the `finished` function.
  */
-export declare class Finished extends Uint8Array {
+export declare class Finished {
   /**
-   * Creates a Finished message instance.
-   *
-   * @param {Uint8Array} verify_data - The verify_data HMAC value.
+   * Constructs a Finished instance.
+   * @param verifyData - The computed verify data.
    */
-  constructor(verify_data: Uint8Array);
+  constructor(verifyData: ArrayBuffer);
+
+  /**
+   * The computed verify data.
+   */
+  verifyData: ArrayBuffer;
+
+  /**
+   * The hash of the handshake transcript.
+   */
+  transcriptHash: ArrayBuffer;
 }