add Finished

Author: Srabutdotcom

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@tls/enum",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "exports": "./src/mod.ts",
   "publish": {
     "exclude": ["dist/"]
@@ -17,6 +17,7 @@
     "@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.1"
   }
 }

src/dep.ts

@@ -8,4 +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/handshaketype.js

@@ -127,6 +127,7 @@ export class Handshake extends Uint8Array {
       this.message = message
       this.items = struct.items
    }
+   get byte(){ return Uint8Array.from(this)}
 }
 
 // npx -p typescript tsc ./src/handshaketype.js --declaration --allowJs --emitDeclarationOnly --lib ESNext --outDir ./dist

src/signaturescheme.js

@@ -4,6 +4,8 @@
 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";
 
 /**
  * Enumeration of signature schemes as defined in RFC 8446.
@@ -79,6 +81,10 @@ export class SignatureScheme extends Enum {
       const signature = await signatureFrom(clientHelloMsg, serverHelloMsg, certificateMsg, RSAprivateKey)
       return new CertificateVerify(this, signature)
    }
+   async certificateVerifyMsg(clientHelloMsg, serverHelloMsg, certificateMsg, RSAprivateKey){
+      const certificateVerify = await this.certificateVerify(clientHelloMsg, serverHelloMsg, certificateMsg, RSAprivateKey);
+      return HandshakeType.CERTIFICATE_VERIFY.handshake(certificateVerify);
+   }
 }
 
 export class CertificateVerify extends Uint8Array {
@@ -101,44 +107,44 @@ export class CertificateVerify extends Uint8Array {
 }
 
 export class Signature extends Constrained {
-   static from(array){
+   static from(array) {
       const copy = Uint8Array.from(array);
       const lengthOf = Uint16.from(copy).value;
       return new Signature(copy.subarray(2, 2 + lengthOf))
    }
-   constructor(opaque){
-      super(0,2**16-1, opaque)
+   constructor(opaque) {
+      super(0, 2 ** 16 - 1, opaque)
       this.opaque = opaque
    }
 }
 
 async function signatureFrom(clientHelloMsg, serverHelloMsg, certificateMsg, RSAprivateKey) {
    const leading = Uint8Array.of(
-         //NOTE 64 space characters 
-         32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-         //NOTE 'TLS 1.3, server CertificateVerify'
-         84, 76, 83, 32, 49, 46, 51, 44, 32, 115, 101, 114, 118, 101, 114, 32, 67, 101, 114, 116, 105, 102, 105, 99, 97, 116, 101, 86, 101, 114, 105, 102, 121,
-         //NOTE single null char
-         0
+      //NOTE 64 space characters 
+      32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+      //NOTE 'TLS 1.3, server CertificateVerify'
+      84, 76, 83, 32, 49, 46, 51, 44, 32, 115, 101, 114, 118, 101, 114, 32, 67, 101, 114, 116, 105, 102, 105, 99, 97, 116, 101, 86, 101, 114, 105, 102, 121,
+      //NOTE single null char
+      0
    )
    const transcriptHash = sha256.create()
-         .update(clientHelloMsg)
-         .update(serverHelloMsg)
-         .update(certificateMsg)
-         .digest();
+      .update(clientHelloMsg)
+      .update(serverHelloMsg)
+      .update(certificateMsg)
+      .digest();
 
    const data = Struct.createFrom(
-         leading,
-         transcriptHash
+      leading,
+      transcriptHash
    )
 
    const signBuffer = await crypto.subtle.sign(
-         {
-               name: "RSA-PSS",// RSAprivateKey.algorithm.name,
-               saltLength: 256 / 8
-         },
-         RSAprivateKey,
-         data
+      {
+         name: "RSA-PSS",// RSAprivateKey.algorithm.name,
+         saltLength: 256 / 8
+      },
+      RSAprivateKey,
+      data
    )
 
    /* const verify = await crypto.subtle.verify(
@@ -150,8 +156,49 @@ async function signatureFrom(clientHelloMsg, serverHelloMsg, certificateMsg, RSA
          sign,
          data
    ) */
+   const signature = new Uint8Array(signBuffer)
+   signature.transcriptHash = transcriptHash;
+   return signature
+}
 
-   return new Uint8Array(signBuffer) 
+export async function finished(serverHS_secret, certificateVerifyMsg) {
+   const finishedKey = hkdfExpandLabel(serverHS_secret, 'finished', new Uint8Array, 32);
+   const finishedKeyCrypto = await crypto.subtle.importKey(
+      "raw",
+      finishedKey,
+      {
+         name: "HMAC",
+         hash: { name: "SHA-256" },
+      },
+      true,
+      ["sign", "verify"]
+   );
+   const transcriptHash = sha256.create()
+      .update(certificateVerifyMsg.message.signature.transcriptHash)
+      .update(certificateVerifyMsg.byte)
+      .digest();
+
+   const verify_data = await crypto.subtle.sign(
+      { name: "HMAC" },
+      finishedKeyCrypto,
+      transcriptHash
+   )
+
+   /* const _test_verify_data = await crypto.subtle.verify(
+      { name: "HMAC" },
+      finishedKeyCrypto,
+      verify_data,
+      transcriptHash
+   ) */
+   verify_data.transcriptHash = transcriptHash;
+   return new Finished(verify_data);
+}
+
+export class Finished extends Uint8Array {
+   constructor(verify_data){
+      super(verify_data);
+      this.verify_data = verify_data 
+   }
 }
 
 // npx -p typescript tsc ./src/signaturescheme.js --declaration --allowJs --emitDeclarationOnly --lib ESNext --outDir ./dist

test/signaturescheme_test.js

@@ -1,4 +1,4 @@
-import { SignatureScheme, CertificateVerify } from "../src/signaturescheme.js";
+import { SignatureScheme, CertificateVerify, finished, Finished } from "../src/signaturescheme.js";
 import { assertEquals } from "jsr:@std/assert";
 import { HexaDecimal, sha256 } from "../src/dep.ts";
 
@@ -76,3 +76,14 @@ Deno.test("CertificateVerify", async () => {
    const back = CertificateVerify.from(test)
    assertEquals(test.toString(), back.toString())
 })
+
+
+Deno.test("Finished", async ()=>{
+   const test = await SignatureScheme.RSA_PSS_PSS_SHA256.certificateVerifyMsg(clientHelloMsg, serverHelloMsg, certificateMsg, rsaKey.privateKey)
+   //const back = CertificateVerify.from(test)
+   const serverHS_secret_fake = crypto.getRandomValues(new Uint8Array(32));
+   const _finished = await finished(serverHS_secret_fake, test);
+   const finishedBack = Finished.from(_finished);
+   assertEquals(_finished.toString(), finishedBack.toString())
+})
+

type/handshaketype.d.ts

@@ -126,4 +126,6 @@ export declare class Handshake extends Uint8Array {
    * @param message - The handshake message payload.
    */
   constructor(msg_type: HandshakeType, message: Uint8Array);
+  /** return Uint8Array */
+  get byte(): Uint8Array
 }

type/signaturescheme.d.ts

@@ -136,3 +136,32 @@ export function signatureFrom(
   certificateMsg: Uint8Array,
   RSAprivateKey: CryptoKey
 ): Promise<Uint8Array>;
+
+/**
+ * Verifies and generates the HMAC for the given data.
+ *
+ * @param {Uint8Array} serverHS_secret - The server handshake secret used for key derivation.
+ * @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,
+  certificateVerifyMsg: {
+    message: {
+      transcriptHash: Uint8Array;
+    };
+  }
+): Promise<Uint8Array>;
+
+/**
+ * Represents the Finished message as a Uint8Array.
+ */
+export declare class Finished extends Uint8Array {
+  /**
+   * Creates a Finished message instance.
+   *
+   * @param {Uint8Array} verify_data - The verify_data HMAC value.
+   */
+  constructor(verify_data: Uint8Array);
+}