zk-passport · remicolin · Oct 28, 2024 · Oct 31, 2024 · Nov 2, 2024 · Nov 6, 2024
diff --git a/circuits/.gitignore b/circuits/.gitignore
@@ -1,3 +1,4 @@
 inputs
 build
-node_modules/
+node_modules/
+err.log
diff --git a/circuits/.yarn/install-state.gz b/circuits/.yarn/install-state.gz
diff --git a/circuits/.yarnrc.yml b/circuits/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/circuits/circuits/disclose/vc_and_disclose.circom b/circuits/circuits/disclose/vc_and_disclose.circom
@@ -1,9 +1,9 @@
 pragma circom 2.1.9;
 
-include "./verify_commitment.circom";
-include "./disclose.circom";
-include "./proveCountryIsNotInList.circom";
-include "../ofac/ofac_name.circom";
+include "../utils/passport/disclose/verify_commitment.circom";
+include "../utils/passport/disclose/disclose.circom";
+include "../utils/passport/disclose/proveCountryIsNotInList.circom";
+include "../utils/passport/ofac/ofac_name.circom";
 
 template VC_AND_DISCLOSE( nLevels,FORBIDDEN_COUNTRIES_LIST_LENGTH) {
 
@@ -45,9 +45,10 @@ template VC_AND_DISCLOSE( nLevels,FORBIDDEN_COUNTRIES_LIST_LENGTH) {
     disclose.majority <== majority;
 
     // generate scope nullifier
-    component poseidon_nullifier = Poseidon(2);
-    poseidon_nullifier.inputs[0] <== secret;
-    poseidon_nullifier.inputs[1] <== scope;
+    component poseidon_nullifier = PoseidonHash(2);
+    poseidon_nullifier.in[0] <== secret;
+    poseidon_nullifier.in[1] <== scope;
+    poseidon_nullifier.dummy <== 0;
     signal output nullifier <== poseidon_nullifier.out;
     signal output revealedData_packed[3] <== disclose.revealedData_packed;
     signal output older_than[2] <== disclose.older_than;

diff --git a/circuits/circuits/dsc/instances/dsc_rsa_sha1_65537_4096.circom b/circuits/circuits/dsc/instances/dsc_rsa_sha1_65537_4096.circom
@@ -2,4 +2,4 @@ pragma circom 2.1.9;
 
 include "../openpassport_dsc.circom";
 
-component main { public [ merkle_root ] } = OPENPASSPORT_DSC(11, 64, 32, 120, 35, 1664, 256, 12);
+component main { public [ merkle_root ] } = OPENPASSPORT_DSC(11, 64, 32, 64, 64, 1664, 256, 12);
diff --git a/circuits/circuits/dsc/instances/dsc_rsa_sha256_65537_4096.circom b/circuits/circuits/dsc/instances/dsc_rsa_sha256_65537_4096.circom
@@ -2,4 +2,4 @@ pragma circom 2.1.9;
 
 include "../openpassport_dsc.circom";
 
-component main { public [ merkle_root ] } = OPENPASSPORT_DSC(10, 64, 32, 120, 35, 1664, 256, 12);
+component main { public [ merkle_root ] } = OPENPASSPORT_DSC(10, 64, 32, 64, 64, 1664, 256, 12);
diff --git a/circuits/circuits/dsc/instances/dsc_rsapss_sha256_65537_4096.circom b/circuits/circuits/dsc/instances/dsc_rsapss_sha256_65537_4096.circom
@@ -2,4 +2,4 @@ pragma circom 2.1.9;
 
 include "../openpassport_dsc.circom";
 
-component main { public [ merkle_root ] } = OPENPASSPORT_DSC(12, 64, 32, 120, 35, 1664, 256, 12);
+component main { public [ merkle_root ] } = OPENPASSPORT_DSC(12, 64, 32, 64, 64, 1664, 256, 12);
diff --git a/circuits/circuits/dsc/openpassport_dsc.circom b/circuits/circuits/dsc/openpassport_dsc.circom
@@ -1,15 +1,14 @@
 pragma circom 2.1.9;
 
-include "circomlib/circuits/bitify.circom";
-include "circomlib/circuits/poseidon.circom";
-include "circomlib/circuits/comparators.circom";
-include "binary-merkle-root.circom";
+include "../utils/circomlib/bitify/bitify.circom";
+include "../utils/circomlib/hasher/shaBytes/shaBytesDynamic.circom";
+include "../utils/circomlib/bitify/comparators.circom";
+include "../utils/circomlib/hasher/hash.circom";
+include "../utils/circomlib/merkle-trees/binary-merkle-root.circom";
 include "../utils/passport/customHashers.circom";
-include "../utils/other/bytes.circom";
 include "../utils/passport/signatureAlgorithm.circom";
 include "../utils/passport/signatureVerifier.circom";
-include "../utils/shaBytes/shaBytesDynamic.circom";
-include "../utils/other/bytes.circom";
+include "../utils/circomlib/utils/bytes.circom";
 
 
 template OPENPASSPORT_DSC(signatureAlgorithm, n_dsc, k_dsc, n_csca, k_csca, max_cert_bytes, dscPubkeyBytesLength, nLevels) {
@@ -35,15 +34,30 @@ template OPENPASSPORT_DSC(signatureAlgorithm, n_dsc, k_dsc, n_csca, k_csca, max_
     signal input path[nLevels];
     signal input siblings[nLevels];
 
+    signal dummy <== 0;
+
     // leaf
     signal leaf  <== LeafHasher(kScaled)(csca_pubKey, signatureAlgorithm);
 
     signal computed_merkle_root <== BinaryMerkleRoot(nLevels)(leaf, nLevels, path, siblings);
     merkle_root === computed_merkle_root;
 
+    // signal raw_dsc_cert_bits[max_cert_bytes * 8];
+
+    // component n2b[max_cert_bytes];
+    // for (var i = 0; i < max_cert_bytes; i++) {
+    //     n2b[i] = Num2Bits(8);
+    //     n2b[i].in <== raw_dsc_cert[i];
+    //     for (var j = 0; j < 8; j++) {
+    //         raw_dsc_cert_bits[i * 8 + j] <== n2b[i].out[j];
+    //     }
+    // }
+
     // verify certificate signature
     signal hashedCertificate[hashLength] <== ShaBytesDynamic(hashLength, max_cert_bytes)(raw_dsc_cert, raw_dsc_cert_padded_bytes);
-    SignatureVerifier(signatureAlgorithm, n_csca, k_csca)(hashedCertificate, csca_pubKey, signature);
+    // for now 512 but it can be 1024 as well
+    // signal hashedCertificate[hashLength] <== ShaHashChunks((max_cert_bytes * 8) \ 512, hashLength)(raw_dsc_cert_bits, 0);
+    SignatureVerifier(signatureAlgorithm, n_csca, k_csca)(hashedCertificate, csca_pubKey, signature, dummy);
 
     // verify DSC csca_pubKey
     component shiftLeft = VarShiftLeft(max_cert_bytes, dscPubkeyBytesLength); // use select subarray for dscPubKey variable length 
@@ -57,6 +71,6 @@ template OPENPASSPORT_DSC(signatureAlgorithm, n_dsc, k_dsc, n_csca, k_csca, max_
 
     // blinded dsc commitment
     signal pubkeyHash <== CustomHasher(k_dsc)(dsc_pubKey);
-    signal output blinded_dsc_commitment <== Poseidon(2)([secret, pubkeyHash]);
+    signal output blinded_dsc_commitment <== PoseidonHash(2)([secret, pubkeyHash], 0);
 }
 
diff --git a/circuits/circuits/ofac/ofac_name.circom b/circuits/circuits/ofac/ofac_name.circom
diff --git a/circuits/circuits/ofac/ofac_name_dob.circom b/circuits/circuits/ofac/ofac_name_dob.circom
diff --git a/circuits/circuits/ofac/ofac_passport_number.circom b/circuits/circuits/ofac/ofac_passport_number.circom
diff --git a/circuits/circuits/prove/instances/prove_ecdsa_sha1_secp256r1_256.circom b/circuits/circuits/prove/instances/prove_ecdsa_sha1_secp256r1_256.circom
@@ -2,4 +2,4 @@ pragma circom 2.1.9;
 
 include "../openpassport_prove.circom";
 
-component main { public [  scope, user_identifier, current_date] } = OPENPASSPORT_PROVE(7, 43, 6, 320, 192, 20);
+component main { public [  scope, user_identifier, current_date] } = OPENPASSPORT_PROVE(7, 64, 4, 320, 192, 20);
diff --git a/circuits/circuits/prove/instances/prove_ecdsa_sha256_secp256r1_256.circom b/circuits/circuits/prove/instances/prove_ecdsa_sha256_secp256r1_256.circom
@@ -2,4 +2,4 @@ pragma circom 2.1.9;
 
 include "../openpassport_prove.circom";
 
-component main { public [  scope, user_identifier, current_date] } = OPENPASSPORT_PROVE(8, 43, 6, 384, 192, 20);
+component main { public [  scope, user_identifier, current_date] } = OPENPASSPORT_PROVE(8, 64, 4, 384, 192, 20);
diff --git a/circuits/circuits/prove/instances/prove_rsapss_sha256_3_3072.circom b/circuits/circuits/prove/instances/prove_rsapss_sha256_3_3072.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.9;
+
+include "../openpassport_prove.circom";
+
+component main { public [  scope, user_identifier, current_date] }  = OPENPASSPORT_PROVE(16, 96, 32, 384, 192, 20);
diff --git a/circuits/circuits/prove/instances/prove_rsapss_sha256_3_4096.circom b/circuits/circuits/prove/instances/prove_rsapss_sha256_3_4096.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.9;
+
+include "../openpassport_prove.circom";
+
+component main { public [  scope, user_identifier, current_date] }  = OPENPASSPORT_PROVE(17, 64, 64, 384, 192, 20);
diff --git a/circuits/circuits/prove/instances/prove_rsapss_sha256_65537_3072.circom b/circuits/circuits/prove/instances/prove_rsapss_sha256_65537_3072.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.9;
+
+include "../openpassport_prove.circom";
+
+component main { public [ scope, user_identifier, current_date ] } = OPENPASSPORT_PROVE(19, 96, 32, 384, 192, 20);
diff --git a/circuits/circuits/prove/instances/prove_rsapss_sha256_65537_4096.circom b/circuits/circuits/prove/instances/prove_rsapss_sha256_65537_4096.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.9;
+
+include "../openpassport_prove.circom";
+
+component main { public [  scope, user_identifier, current_date] }  = OPENPASSPORT_PROVE(12, 64, 64, 384, 192, 20);
diff --git a/circuits/circuits/prove/openpassport_prove.circom b/circuits/circuits/prove/openpassport_prove.circom
@@ -3,10 +3,12 @@ pragma circom 2.1.9;
 include "../utils/passport/customHashers.circom";
 include "../utils/passport/computeCommitment.circom";
 include "../utils/passport/signatureAlgorithm.circom";
+include "../utils/passport/date/isValid.circom";
+include "../utils/circomlib/hasher/poseidon/poseidon.circom";
 include "../utils/passport/passportVerifier.circom";
-include "../disclose/disclose.circom";
-include "../disclose/proveCountryIsNotInList.circom";
-include "../ofac/ofac_name.circom";
+include "../utils/passport/disclose/disclose.circom";
+include "../utils/passport/disclose/proveCountryIsNotInList.circom";
+include "../utils/passport/ofac/ofac_name.circom";
 
 template OPENPASSPORT_PROVE(signatureAlgorithm, n, k, MAX_ECONTENT_PADDED_LEN, MAX_SIGNED_ATTR_PADDED_LEN, FORBIDDEN_COUNTRIES_LIST_LENGTH) {
     var kLengthFactor = getKLengthFactor(signatureAlgorithm);
@@ -45,6 +47,8 @@ template OPENPASSPORT_PROVE(signatureAlgorithm, n, k, MAX_ECONTENT_PADDED_LEN, M
     signal input secret;
     signal input dsc_secret;
 
+    signal dummy <== 0;
+
     signal attestation_id <== 1;
 
     signal selectorModeDisclosure <== selector_mode[0];
@@ -54,9 +58,8 @@ template OPENPASSPORT_PROVE(signatureAlgorithm, n, k, MAX_ECONTENT_PADDED_LEN, M
     signal isWrongSelectorMode <== IsEqual()([2*selector_mode[0] + selector_mode[1], 1]);
     isWrongSelectorMode === 0;
 
-
     // verify passport signature
-    PassportVerifier(signatureAlgorithm, n, k, MAX_ECONTENT_PADDED_LEN, MAX_SIGNED_ATTR_PADDED_LEN)(dg1,dg1_hash_offset, dg2_hash, eContent,eContent_padded_length, signed_attr, signed_attr_padded_length, signed_attr_econtent_hash_offset, pubKey, signature);
+    PassportVerifier(signatureAlgorithm, n, k, MAX_ECONTENT_PADDED_LEN, MAX_SIGNED_ATTR_PADDED_LEN)(dg1,dg1_hash_offset, dg2_hash, eContent,eContent_padded_length, signed_attr, signed_attr_padded_length, signed_attr_econtent_hash_offset, pubKey, signature, dummy);
     // verify passport is not expired
     component isValid = IsValid();
     isValid.currDate <== current_date;
@@ -65,8 +68,12 @@ template OPENPASSPORT_PROVE(signatureAlgorithm, n, k, MAX_ECONTENT_PADDED_LEN, M
     }
 
     // nulifier
-    signal signatureHashed <== CustomHasher(kScaled)(signature); // generate nullifier
-    signal output nullifier <== Poseidon(2)([signatureHashed, scope]);
+    signal signatureHashed <== CustomHasher(kScaled)(signature);
+    component poseidon_hasher = PoseidonHash(2);
+    poseidon_hasher.in[0] <== signatureHashed;
+    poseidon_hasher.in[1] <== scope;
+    poseidon_hasher.dummy <== 0;
+    signal output nullifier <== poseidon_hasher.out;
 
     // DISCLOSE (optional)
     // optionally disclose data
@@ -102,13 +109,13 @@ template OPENPASSPORT_PROVE(signatureAlgorithm, n, k, MAX_ECONTENT_PADDED_LEN, M
     signal ofacIntermediaryOutput <== ofacCheckResult * selector_ofac;
     signal output ofac_result <== ofacIntermediaryOutput;
 
-    // REGISTRATION (optional)
-    // generate the commitment
+    // // REGISTRATION (optional)
+    // // generate the commitment
     signal leaf <== LeafHasher(kScaled)(pubKey, signatureAlgorithm);
     signal commitmentPrivate <== ComputeCommitment()(secret, attestation_id, leaf, dg1, dg2_hash);
     signal output commitment <== commitmentPrivate * selectorModeCommitment;
-    // blinded dsc commitment
+    // // blinded dsc commitment
     signal pubkeyHash <== CustomHasher(kScaled)(pubKey);
-    signal blindedDscCommitmenPrivate <== Poseidon(2)([dsc_secret, pubkeyHash]);
+    signal blindedDscCommitmenPrivate <== PoseidonHash(2)([dsc_secret, pubkeyHash],0);
     signal output blinded_dsc_commitment <== blindedDscCommitmenPrivate * selectorModeBlindedDscCommitment;
-}
+}
diff --git a/circuits/circuits/tests/ofac/ofac_name_dob_tester.circom b/circuits/circuits/tests/ofac/ofac_name_dob_tester.circom
@@ -1,3 +1,3 @@
 pragma circom 2.1.9;
-include "../../ofac/ofac_name_dob.circom";
+include "../../utils/passport/ofac/ofac_name_dob.circom";
 component main { public [ smt_root ] } = OFAC_NAME_DOB();
diff --git a/circuits/circuits/tests/ofac/ofac_name_tester.circom b/circuits/circuits/tests/ofac/ofac_name_tester.circom
@@ -1,3 +1,3 @@
 pragma circom 2.1.9;
-include "../../ofac/ofac_name.circom";
+include "../../utils/passport/ofac/ofac_name.circom";
 component main { public [ smt_root ] } = OFAC_NAME();
diff --git a/circuits/circuits/tests/ofac/ofac_passport_number_tester.circom b/circuits/circuits/tests/ofac/ofac_passport_number_tester.circom
@@ -1,3 +1,3 @@
 pragma circom 2.1.9;
-include "../../ofac/ofac_passport_number.circom";
+include "../../utils/passport/ofac/ofac_passport_number.circom";
 component main { public [ smt_root ] } = OFAC_PASSPORT_NUMBER();
diff --git a/circuits/circuits/tests/utils/rsa/test_rsa_sha1_65537_2048.circom b/circuits/circuits/tests/utils/rsa/test_rsa_sha1_65537_2048.circom
@@ -1,13 +1,15 @@
 pragma circom 2.1.9;
 
-include "../../../utils/rsa/verifyRsaPkcs1v1_5.circom";
+include "../../../utils/circomlib/signature/rsa/verifyRsaPkcs1v1_5.circom";
 
 template VerifyRsaPkcs1v1_5Tester() {
     signal input signature[32];
     signal input modulus[32];
     signal input message[32];
 
-    VerifyRsaPkcs1v1_5(3, 64, 32, 17, 160)(signature, modulus, message);
+    signal input dummy;
+
+    VerifyRsaPkcs1v1_5(3, 64, 32, 65537, 160)(signature, modulus, message, dummy);
 }
 
 component main = VerifyRsaPkcs1v1_5Tester();
diff --git a/circuits/circuits/tests/utils/rsa/test_rsa_sha256_3_2048.circom b/circuits/circuits/tests/utils/rsa/test_rsa_sha256_3_2048.circom
@@ -1,13 +1,15 @@
 pragma circom 2.1.9;
 
-include "../../../utils/rsa/verifyRsaPkcs1v1_5.circom";
+include "../../../utils/circomlib/signature/rsa/verifyRsaPkcs1v1_5.circom";
 
 template VerifyRsaPkcs1v1_5Tester() {
     signal input signature[32];
     signal input modulus[32];
     signal input message[32];
 
-    VerifyRsaPkcs1v1_5(13, 64, 32, 2, 256)(signature, modulus, message);
+    signal input dummy;
+
+    VerifyRsaPkcs1v1_5(13, 64, 32, 3, 256)(signature, modulus, message, dummy);
 }
 
 component main = VerifyRsaPkcs1v1_5Tester();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ pragma circom 2.1.9;

		include "../openpassport_dsc.circom";

		component main { public [ merkle_root ] } = OPENPASSPORT_DSC(11, 64, 32, 120, 35, 1664, 256, 12);
		component main { public [ merkle_root ] } = OPENPASSPORT_DSC(11, 64, 32, 64, 64, 1664, 256, 12);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ pragma circom 2.1.9;

		include "../openpassport_prove.circom";

		component main { public [ scope, user_identifier, current_date] } = OPENPASSPORT_PROVE(7, 43, 6, 320, 192, 20);
		component main { public [ scope, user_identifier, current_date] } = OPENPASSPORT_PROVE(7, 64, 4, 320, 192, 20);