From 144fc879688d2afc52100b0f835993f5e781c568 Mon Sep 17 00:00:00 2001
From: 0xturboblitz <florent.tavernier@gmail.com>
Date: Sat, 8 Jun 2024 18:21:57 +0200
Subject: [PATCH] SHA384withECDSA mock passport data

---
 circuits/package.json                         |   3 +-
 .../genMockPassportData/SHA384withECDSA.ts    | 106 ++++++++++++++++++
 circuits/yarn.lock                            |  13 +++
 common/package.json                           |   1 +
 common/src/utils/mockPassportData.ts          |  48 ++++++++
 common/src/utils/utils.ts                     |   5 +-
 common/yarn.lock                              |   5 +
 7 files changed, 179 insertions(+), 2 deletions(-)
 create mode 100644 circuits/scripts/genMockPassportData/SHA384withECDSA.ts

diff --git a/circuits/package.json b/circuits/package.json
index 876c60c48..0cda3ec9e 100644
--- a/circuits/package.json
+++ b/circuits/package.json
@@ -22,6 +22,7 @@
     "circom_tester": "github:Atomic-Buy/circom_tester#main",
     "circomlib": "^2.0.5",
     "circomlibjs": "^0.1.7",
+    "elliptic": "^6.5.5",
     "js-sha256": "^0.10.1",
     "node-forge": "^1.3.1",
     "poseidon-lite": "^0.2.0",
@@ -37,4 +38,4 @@
     "ts-mocha": "^10.0.0",
     "ts-node": "^10.9.2"
   }
-}
\ No newline at end of file
+}
diff --git a/circuits/scripts/genMockPassportData/SHA384withECDSA.ts b/circuits/scripts/genMockPassportData/SHA384withECDSA.ts
new file mode 100644
index 000000000..6a69b25e7
--- /dev/null
+++ b/circuits/scripts/genMockPassportData/SHA384withECDSA.ts
@@ -0,0 +1,106 @@
+import assert from "assert";
+import { PassportData } from "../../../common/src/utils/types";
+import { hash, assembleEContent, formatAndConcatenateDataHashes, formatMrz, arraysAreEqual } from "../../../common/src/utils/utils";
+import * as forge from 'node-forge';
+import { writeFileSync } from "fs";
+import elliptic from 'elliptic';
+import * as crypto from 'crypto';
+
+const sampleMRZ = "P<FRADUPONT<<ALPHONSE<HUGUES<ALBERT<<<<<<<<<24HB818324FRA0402111M3111115<<<<<<<<<<<<<<02"
+const sampleDataHashes = [
+  [
+    2,
+    [-66, 82, -76, -21, -34, 33, 79, 50, -104, -120, -114, 35, 116, -32, 6, -14, -100, -115, -128, -8, 10, 61, 98, 86, -8, 45, -49, -46, 90, -24, -81, 38]
+  ],
+  [
+    3,
+    [0, -62, 104, 108, -19, -10, 97, -26, 116, -58, 69, 110, 26, 87, 17, 89, 110, -57, 108, -6, 36, 21, 39, 87, 110, 102, -6, -43, -82, -125, -85, -82]
+  ],
+  [
+    11,
+    [-120, -101, 87, -112, 111, 15, -104, 127, 85, 25, -102, 81, 20, 58, 51, 75, -63, 116, -22, 0, 60, 30, 29, 30, -73, -115, 72, -9, -1, -53, 100, 124]
+  ],
+  [
+    12,
+    [41, -22, 106, 78, 31, 11, 114, -119, -19, 17, 92, 71, -122, 47, 62, 78, -67, -23, -55, -42, 53, 4, 47, -67, -55, -123, 6, 121, 34, -125, 64, -114]
+  ],
+  [
+    13,
+    [91, -34, -46, -63, 62, -34, 104, 82, 36, 41, -118, -3, 70, 15, -108, -48, -100, 45, 105, -85, -15, -61, -71, 43, -39, -94, -110, -55, -34, 89, -18, 38]
+  ],
+  [
+    14,
+    [76, 123, -40, 13, 51, -29, 72, -11, 59, -63, -18, -90, 103, 49, 23, -92, -85, -68, -62, -59, -100, -69, -7, 28, -58, 95, 69, 15, -74, 56, 54, 38]
+  ]
+]
+
+const signatureAlgorithm = 'SHA384withECDSA'
+
+export function genMockPassportData_SHA384withECDSA(): PassportData {
+  const mrzHash = hash(signatureAlgorithm, formatMrz(sampleMRZ));
+  sampleDataHashes.unshift([1, mrzHash]);
+  const concatenatedDataHashes = formatAndConcatenateDataHashes(
+    mrzHash,
+    sampleDataHashes as [number, number[]][],
+  );
+  const eContent = assembleEContent(hash(signatureAlgorithm, concatenatedDataHashes));
+  
+  const ec = new elliptic.ec('p384');
+  const keyPair = ec.genKeyPair();
+  const pubKey = keyPair.getPublic();
+  
+  const md = forge.md.sha384.create();
+  md.update(forge.util.binary.raw.encode(new Uint8Array(eContent)));
+  const signature = keyPair.sign(md.digest().toHex(), 'hex');
+  const signatureBytes = Array.from(Buffer.from(signature.toDER(), 'hex'));
+  
+  const Qx = pubKey.getX().toString(16);
+  const Qy = pubKey.getY().toString(16);
+  
+  return {
+    mrz: sampleMRZ,
+    signatureAlgorithm: signatureAlgorithm,
+    pubKey: {
+      publicKeyQ: `(${Qx},${Qy},1,fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff0000000000000000fffffffc)`
+    },
+    dataGroupHashes: concatenatedDataHashes,
+    eContent: eContent,
+    encryptedDigest: signatureBytes,
+    photoBase64: "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABjElEQVR42mL8//8/AyUYiBQYmIw3..."
+  }
+}
+
+function verify(passportData: PassportData): boolean {
+  const { mrz, signatureAlgorithm, pubKey, dataGroupHashes, eContent, encryptedDigest } = passportData;
+  const formattedMrz = formatMrz(mrz);
+  const mrzHash = hash(signatureAlgorithm, formattedMrz);
+
+  console.log("mrzHash:", mrzHash);
+  assert(
+    arraysAreEqual(mrzHash, dataGroupHashes.slice(31, 31 + mrzHash.length)),
+    'mrzHash is at the right place in dataGroupHashes'
+  );
+
+  const cleanPublicKeyQ = pubKey.publicKeyQ.replace(/[()]/g, '').split(',');
+  const Qx = cleanPublicKeyQ[0];
+  const Qy = cleanPublicKeyQ[1];
+
+  const ec = new elliptic.ec('p384');
+  const key = ec.keyFromPublic({ x: Qx, y: Qy }, 'hex');
+
+  const messageBuffer = Buffer.from(eContent);
+  const msgHash = crypto.createHash('sha384').update(messageBuffer).digest();
+
+  const signature = Buffer.from(encryptedDigest).toString('hex');
+
+  const isValid = key.verify(msgHash, signature);
+
+  return isValid;
+}
+
+
+const mockPassportData = genMockPassportData_SHA384withECDSA();
+console.log("Passport Data:", JSON.stringify(mockPassportData, null, 2));
+console.log("Signature valid:", verify(mockPassportData));
+
+writeFileSync(__dirname + '/passportData.json', JSON.stringify(mockPassportData, null, 2));
\ No newline at end of file
diff --git a/circuits/yarn.lock b/circuits/yarn.lock
index fb5b0a627..115b19930 100644
--- a/circuits/yarn.lock
+++ b/circuits/yarn.lock
@@ -990,6 +990,19 @@ elliptic@6.5.4:
     minimalistic-assert "^1.0.1"
     minimalistic-crypto-utils "^1.0.1"
 
+elliptic@^6.5.5:
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.5.tgz#c715e09f78b6923977610d4c2346d6ce22e6dded"
+  integrity sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==
+  dependencies:
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
diff --git a/common/package.json b/common/package.json
index 288177ba7..3a8e38f3f 100644
--- a/common/package.json
+++ b/common/package.json
@@ -5,6 +5,7 @@
     "@zk-kit/lean-imt": "^2.0.1",
     "js-sha1": "^0.7.0",
     "js-sha256": "^0.10.1",
+    "js-sha512": "^0.9.0",
     "node-forge": "^1.3.1",
     "poseidon-lite": "^0.2.0"
   },
diff --git a/common/src/utils/mockPassportData.ts b/common/src/utils/mockPassportData.ts
index d2d14d1b9..1f08c633e 100644
--- a/common/src/utils/mockPassportData.ts
+++ b/common/src/utils/mockPassportData.ts
@@ -157,3 +157,51 @@ export const mockPassportData_rsassaPss_65537 = {
   ],
   "photoBase64": "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABjElEQVR42mL8//8/AyUYiBQYmIw3..."
 }
+
+export const mockPassportData_SHA384withECDSA = {
+  "mrz": "P<FRADUPONT<<ALPHONSE<HUGUES<ALBERT<<<<<<<<<24HB818324FRA0402111M3111115<<<<<<<<<<<<<<02",
+  "signatureAlgorithm": "SHA384withECDSA",
+  "pubKey": {
+    "publicKeyQ": "(52aeee356ed1711cfc54e0c87ddb195fe62d8d87662097cc62f82eef72d82a8e9dbd6ac443b348de6762f8777ebb6aba,4fd7aa3bfedbae3f6436154f90a08e4f29eb6aa3f18e32b7871144ad307a7691ed28ff0f478f9e120e0b1e79e4a9278e,1,fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff0000000000000000fffffffc)"
+  },
+  "dataGroupHashes": [
+    48, -126, 1, 37, 2, 1, 0, 48, 11, 6, 9, 96, -122, 72, 1, 101, 3, 4, 2, 1,
+    48, -126, 1, 17, 48, 37, 2, 1, 1, 4, 32, -106, 120, -70, 115, 70, -106,
+    -117, -119, 124, 6, -12, -6, -19, -27, -124, 58, -35, 118, -20, 31, 14, -27,
+    22, -82, 41, 15, -81, -97, 10, 72, 77, -94, -40, -104, -104, 69, 90, -121,
+    96, -32, 110, 6, -107, -16, 108, 44, -99, 19, 48, 37, 2, 1, 2, 4, 32, -66,
+    82, -76, -21, -34, 33, 79, 50, -104, -120, -114, 35, 116, -32, 6, -14, -100,
+    -115, -128, -8, 10, 61, 98, 86, -8, 45, -49, -46, 90, -24, -81, 38, 48, 37,
+    2, 1, 3, 4, 32, 0, -62, 104, 108, -19, -10, 97, -26, 116, -58, 69, 110, 26,
+    87, 17, 89, 110, -57, 108, -6, 36, 21, 39, 87, 110, 102, -6, -43, -82, -125,
+    -85, -82, 48, 37, 2, 1, 11, 4, 32, -120, -101, 87, -112, 111, 15, -104, 127,
+    85, 25, -102, 81, 20, 58, 51, 75, -63, 116, -22, 0, 60, 30, 29, 30, -73,
+    -115, 72, -9, -1, -53, 100, 124, 48, 37, 2, 1, 12, 4, 32, 41, -22, 106, 78,
+    31, 11, 114, -119, -19, 17, 92, 71, -122, 47, 62, 78, -67, -23, -55, -42,
+    53, 4, 47, -67, -55, -123, 6, 121, 34, -125, 64, -114, 48, 37, 2, 1, 13, 4,
+    32, 91, -34, -46, -63, 62, -34, 104, 82, 36, 41, -118, -3, 70, 15, -108,
+    -48, -100, 45, 105, -85, -15, -61, -71, 43, -39, -94, -110, -55, -34, 89,
+    -18, 38, 48, 37, 2, 1, 14, 4, 32, 76, 123, -40, 13, 51, -29, 72, -11, 59,
+    -63, -18, -90, 103, 49, 23, -92, -85, -68, -62, -59, -100, -69, -7, 28, -58,
+    95, 69, 15, -74, 56, 54, 38
+  ],
+  "eContent": [
+    49, 102, 48, 21, 6, 9, 42, -122, 72, -122, -9, 13, 1, 9, 3, 49, 8, 6, 6,
+    103, -127, 8, 1, 1, 1, 48, 28, 6, 9, 42, -122, 72, -122, -9, 13, 1, 9, 5,
+    49, 15, 23, 13, 49, 57, 49, 50, 49, 54, 49, 55, 50, 50, 51, 56, 90, 48, 47,
+    6, 9, 42, -122, 72, -122, -9, 13, 1, 9, 4, 49, 34, 4, 32, 98, -120, 32, 21,
+    -101, -4, -63, -94, -111, -35, -120, 111, -117, 60, -4, 126, -21, 122, -22,
+    -109, 86, 93, 108, -22, 38, -102, -47, 101, 100, 11, -8, 37, -81, -117, -68,
+    29, 3, -25, -33, -37, 87, 14, -85, 5, 15, 109, -111, -2
+  ],
+  "encryptedDigest": [
+    48, 101, 2, 48, 29, 122, 44, 83, 169, 52, 194, 184, 171, 180, 160, 11, 223,
+    146, 143, 131, 49, 181, 225, 123, 172, 219, 250, 168, 34, 217, 213, 243, 83,
+    146, 82, 47, 235, 142, 188, 212, 139, 146, 215, 10, 91, 246, 128, 22, 177,
+    28, 25, 250, 2, 49, 0, 206, 65, 142, 140, 186, 110, 24, 101, 244, 127, 56,
+    207, 117, 180, 156, 45, 174, 250, 210, 233, 252, 254, 117, 82, 14, 121, 32,
+    155, 10, 192, 118, 252, 209, 198, 3, 29, 221, 74, 136, 144, 200, 229, 80,
+    14, 221, 91, 122, 89
+  ],
+  "photoBase64": "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABjElEQVR42mL8//8/AyUYiBQYmIw3..."
+}
diff --git a/common/src/utils/utils.ts b/common/src/utils/utils.ts
index 48fbf5e60..3d364914d 100644
--- a/common/src/utils/utils.ts
+++ b/common/src/utils/utils.ts
@@ -1,6 +1,7 @@
 import { LeanIMT } from '@zk-kit/lean-imt';
 import { sha256 } from 'js-sha256';
 import { sha1 } from 'js-sha1';
+import { sha384 } from 'js-sha512';
 
 export function formatMrz(mrz: string) {
   const mrzCharcodes = [...mrz].map(char => char.charCodeAt(0));
@@ -151,9 +152,11 @@ export function hash(signatureAlgorithm: string, bytesArray: number[]) {
   const unsignedBytesArray = bytesArray.map(toUnsignedByte);
   const hash = (signatureAlgorithm == 'sha1WithRSAEncryption')
     ? sha1(unsignedBytesArray)
+    : (signatureAlgorithm == 'SHA384withECDSA')
+    ? sha384(unsignedBytesArray)
     : (signatureAlgorithm == 'sha256WithRSAEncryption' || signatureAlgorithm == 'rsassaPss')
     ? sha256(unsignedBytesArray)
-    : sha256(unsignedBytesArray); //defaults to sha256
+    : sha256(unsignedBytesArray); // defaults to sha256
   return hexToSignedBytes(hash);
 }
 
diff --git a/common/yarn.lock b/common/yarn.lock
index aa5da5526..4277edf4e 100644
--- a/common/yarn.lock
+++ b/common/yarn.lock
@@ -69,6 +69,11 @@ js-sha256@^0.10.1:
   resolved "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz"
   integrity sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw==
 
+js-sha512@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/js-sha512/-/js-sha512-0.9.0.tgz#ed569aa1e4bdaf0b83363c29db1ab87b1192d9ae"
+  integrity sha512-mirki9WS/SUahm+1TbAPkqvbCiCfOAAsyXeHxK1UkullnJVVqoJG2pL9ObvT05CN+tM7fxhfYm0NbXn+1hWoZg==
+
 node-forge@^1.3.1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"