revise finished

Author: Srabutdotcom

deno.json

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

src/signaturescheme.js

@@ -3,7 +3,7 @@
 
 import { Constrained, Struct, Uint16 } from "./dep.ts";
 import { Enum } from "./enum.js";
-import { sha256 } from "@noble/hashes/sha256"
+import { sha256, sha384, sha512 } from "@noble/hashes/sha2"
 import { HandshakeType } from "./handshaketype.js";
 
 /**
@@ -117,7 +117,7 @@ export class Signature extends Constrained {
    }
 }
 
-async function signatureFrom(clientHelloMsg, serverHelloMsg, encryptedExtensionsMsg, certificateMsg, RSAprivateKey) {
+async function signatureFrom(clientHelloMsg, serverHelloMsg, encryptedExtensionsMsg, certificateMsg, RSAprivateKey, sha = 256) {
    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,
@@ -126,7 +126,12 @@ async function signatureFrom(clientHelloMsg, serverHelloMsg, encryptedExtensions
       //NOTE single null char
       0
    )
-   const transcriptHash = sha256.create()
+
+   const hash = sha == 256 ? sha256.create() : 
+   sha == 384 ? sha384.create() :
+   sha == 512 ? sha512.create() : sha256.create();
+   
+   const transcriptHash = hash
       .update(clientHelloMsg)
       .update(serverHelloMsg)
       .update(encryptedExtensionsMsg)
@@ -141,7 +146,7 @@ async function signatureFrom(clientHelloMsg, serverHelloMsg, encryptedExtensions
    const signBuffer = await crypto.subtle.sign(
       {
          name: "RSA-PSS",// RSAprivateKey.algorithm.name,
-         saltLength: 256 / 8
+         saltLength: sha / 8
       },
       RSAprivateKey,
       data
@@ -157,25 +162,29 @@ async function signatureFrom(clientHelloMsg, serverHelloMsg, encryptedExtensions
          data
    ) */
    const signature = new Uint8Array(signBuffer)
-   signature.transcriptHash = transcriptHash;
    return signature
 }
 
-export async function finished(finishedKey, certificateVerifyMsg) {
+export async function finished(finishedKey, sha = 256, ...messages) {
    //const finishedKey = hkdfExpandLabel(serverHS_secret, 'finished', new Uint8Array, 32);
    const finishedKeyCrypto = await crypto.subtle.importKey(
       "raw",
       finishedKey,
       {
          name: "HMAC",
-         hash: { name: "SHA-256" },
+         hash: { name: `SHA-${sha}` },
       },
       true,
       ["sign", "verify"]
    );
-   const transcriptHash = sha256.create()
-      .update(certificateVerifyMsg.message.signature.transcriptHash)
-      .update(certificateVerifyMsg.byte)
+
+   const hash = sha == 256 ? sha256.create() : 
+   sha == 384 ? sha384.create() : sha256.create();
+
+   const messagesStruct = Struct.createFrom(...messages);
+
+   const transcriptHash = hash
+      .update(Uint8Array.from(messagesStruct))
       .digest();
 
    const verify_data = await crypto.subtle.sign(

test/signaturescheme_test.js

@@ -88,7 +88,7 @@ Deno.test("Finished", async ()=>{
    const test = await SignatureScheme.RSA_PSS_PSS_SHA256.certificateVerifyMsg(clientHelloMsg, serverHelloMsg, encryptedExtensionsMsg, 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 _finished = await finished(serverHS_secret_fake, 256, test);
    const finishedBack = Finished.from(_finished);
    assertEquals(_finished.toString(), finishedBack.toString())
 })

type/signaturescheme.d.ts

@@ -143,37 +143,39 @@ export class Signature extends Constrained {
 }
 
 /**
- * Generates a signature from input data and a private RSA key.
- * @param {Uint8Array} clientHelloMsg - Client Hello message.
- * @param {Uint8Array} serverHelloMsg - Server Hello message.
- * @param {Uint8Array} certificateMsg - Certificate message.
- * @param {CryptoKey} RSAprivateKey - RSA private key.
- * @returns {Promise<Uint8Array>} The generated signature.
+ * Generates a signature from the provided handshake messages and an RSA private key.
+ *
+ * @param clientHelloMsg - The ClientHello message as a Uint8Array.
+ * @param serverHelloMsg - The ServerHello message as a Uint8Array.
+ * @param encryptedExtensionsMsg - The EncryptedExtensions message as a Uint8Array.
+ * @param certificateMsg - The Certificate message as a Uint8Array.
+ * @param RSAprivateKey - The RSA private key used for signing.
+ * @param sha - The hash algorithm to use (256, 384, or 512). Defaults to 256.
+ * @returns A promise that resolves to a Uint8Array containing the signature. The resulting object also includes the `transcriptHash` property.
  */
-export function signatureFrom(
+export declare function signatureFrom(
   clientHelloMsg: Uint8Array,
   serverHelloMsg: Uint8Array,
   encryptedExtensionsMsg: Uint8Array,
   certificateMsg: Uint8Array,
-  RSAprivateKey: CryptoKey
+  RSAprivateKey: CryptoKey,
+  sha?: 256 | 384 | 512
 ): Promise<Uint8Array>;
 
 /**
- * Verifies and generates the HMAC for the given data.
+ * Computes the Finished message verify_data using the provided finished key and handshake messages.
  *
- * @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.
+ * @param finishedKey - The finished key as a Uint8Array.
+ * @param sha - The hash algorithm to use (256 or 384). Defaults to 256.
+ * @param messages - A variable number of handshake messages to include in the transcript hash.
+ * @returns A promise that resolves to a Finished instance containing the verify_data. The resulting object also includes the `transcriptHash` property.
  */
 export declare function finished(
   finishedKey: Uint8Array,
-  certificateVerifyMsg: {
-    message: {
-      transcriptHash: Uint8Array;
-    };
-  }
-): Promise<Uint8Array>;
+  sha?: 256 | 384,
+  ...messages: Uint8Array[]
+): Promise<Finished>;
+
 
 /**
  * Represents the output of the `finished` function.