Merge pull request #322 from zk-passport/main

refactor circuits repository
zk-passport · Jan 21, 2025 · 71f0849 · 71f0849
2 parents 7929837 + af0367f
commit 71f0849
Show file tree

Hide file tree

Showing 87 changed files with 891 additions and 978 deletions.
diff --git a/...uits/circuits/dsc/openpassport_dsc.circom → circuits/circuits/dsc/dsc.circom b/...uits/circuits/dsc/openpassport_dsc.circom → circuits/circuits/dsc/dsc.circom
@@ -9,10 +9,11 @@ include "@zk-kit/binary-merkle-root.circom/src/binary-merkle-root.circom";
 include "../utils/passport/customHashers.circom";
 include "../utils/passport/signatureAlgorithm.circom";
 include "../utils/passport/signatureVerifier.circom";
-include "@zk-email/circuits/utils/bytes.circom";
+include "@openpassport/zk-email-circuits/utils/bytes.circom";
+include "../utils/crypto/bitify/bytes.circom";
 
 
-template OPENPASSPORT_DSC(signatureAlgorithm, n_dsc, k_dsc, n_csca, k_csca, max_cert_bytes, dscPubkeyBytesLength, nLevels) {
+template DSC(signatureAlgorithm, n_dsc, k_dsc, n_csca, k_csca, max_cert_bytes, dscPubkeyBytesLength, nLevels) {
 
     // variables verification
     assert(max_cert_bytes % 64 == 0);

diff --git a/circuits/circuits/dsc/instances/dsc_rsa_sha1_65537_4096.circom b/circuits/circuits/dsc/instances/dsc_rsa_sha1_65537_4096.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
 
-include "../openpassport_dsc.circom";
+include "../dsc.circom";
 
-component main { public [ merkle_root ] } = OPENPASSPORT_DSC(11, 120, 35, 120, 35, 1664, 256, 12);
+component main { public [ merkle_root ] } = DSC(11, 120, 35, 120, 35, 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
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
 
-include "../openpassport_dsc.circom";
+include "../dsc.circom";
 
-component main { public [ merkle_root ] } = OPENPASSPORT_DSC(10, 120, 35, 120, 35, 1664, 256, 12);
+component main { public [ merkle_root ] } = DSC(10, 120, 35, 120, 35, 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
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
 
-include "../openpassport_dsc.circom";
+include "../dsc.circom";
 
-component main { public [ merkle_root ] } = OPENPASSPORT_DSC(12, 120, 35, 120, 35, 1664, 256, 12);
+component main { public [ merkle_root ] } = DSC(12, 120, 35, 120, 35, 1664, 256, 12);
diff --git a/circuits/circuits/prove/instances/prove_sha1_sha1_sha1_ecdsa_brainpoolP224r1.circom b/circuits/circuits/prove/instances/prove_sha1_sha1_sha1_ecdsa_brainpoolP224r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha1_sha1_sha1_ecdsa_secp256r1.circom b/circuits/circuits/prove/instances/prove_sha1_sha1_sha1_ecdsa_secp256r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha1_sha1_sha1_rsa_65537_2048.circom b/circuits/circuits/prove/instances/prove_sha1_sha1_sha1_rsa_65537_2048.circom
diff --git a/circuits/circuits/prove/instances/prove_sha1_sha1_sha1_rsa_65537_4096.circom b/circuits/circuits/prove/instances/prove_sha1_sha1_sha1_rsa_65537_4096.circom
diff --git a/circuits/circuits/prove/instances/prove_sha1_sha256_sha256_rsa_65537_4096.circom b/circuits/circuits/prove/instances/prove_sha1_sha256_sha256_rsa_65537_4096.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha224_sha224_ecdsa_brainpoolP224r1.circom b/circuits/circuits/prove/instances/prove_sha256_sha224_sha224_ecdsa_brainpoolP224r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_ecdsa_brainpoolP224r1.circom b/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_ecdsa_brainpoolP224r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_ecdsa_brainpoolP256r1.circom b/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_ecdsa_brainpoolP256r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_ecdsa_secp256r1.circom b/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_ecdsa_secp256r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_ecdsa_secp384r1.circom b/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_ecdsa_secp384r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsa_3_2048.circom b/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsa_3_2048.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsa_3_4096.circom b/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsa_3_4096.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsa_65537_2048.circom b/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsa_65537_2048.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsa_65537_3072.circom b/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsa_65537_3072.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsa_65537_4096.circom b/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsa_65537_4096.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsapss_3_4096.circom b/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsapss_3_4096.circom
diff --git a/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsapss_65537_4096.circom b/circuits/circuits/prove/instances/prove_sha256_sha256_sha256_rsapss_65537_4096.circom
diff --git a/circuits/circuits/prove/instances/prove_sha384_sha384_sha384_ecdsa_brainpoolP256r1.circom b/circuits/circuits/prove/instances/prove_sha384_sha384_sha384_ecdsa_brainpoolP256r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha384_sha384_sha384_ecdsa_brainpoolP384r1.circom b/circuits/circuits/prove/instances/prove_sha384_sha384_sha384_ecdsa_brainpoolP384r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha384_sha384_sha384_ecdsa_secp384r1.circom b/circuits/circuits/prove/instances/prove_sha384_sha384_sha384_ecdsa_secp384r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha512_sha512_sha512_ecdsa_brainpoolP256r1.circom b/circuits/circuits/prove/instances/prove_sha512_sha512_sha512_ecdsa_brainpoolP256r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha512_sha512_sha512_ecdsa_brainpoolP384r1.circom b/circuits/circuits/prove/instances/prove_sha512_sha512_sha512_ecdsa_brainpoolP384r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha512_sha512_sha512_ecdsa_brainpoolP512r1.circom b/circuits/circuits/prove/instances/prove_sha512_sha512_sha512_ecdsa_brainpoolP512r1.circom
diff --git a/circuits/circuits/prove/instances/prove_sha512_sha512_sha512_rsa_65537_2048.circom b/circuits/circuits/prove/instances/prove_sha512_sha512_sha512_rsa_65537_2048.circom
diff --git a/circuits/circuits/prove/instances/prove_sha512_sha512_sha512_rsa_65537_4096.circom b/circuits/circuits/prove/instances/prove_sha512_sha512_sha512_rsa_65537_4096.circom
diff --git a/circuits/circuits/prove/openpassport_prove.circom b/circuits/circuits/prove/openpassport_prove.circom
diff --git a/circuits/circuits/register/instances/register_sha1_sha1_sha1_ecdsa_brainpoolP224r1.circom b/circuits/circuits/register/instances/register_sha1_sha1_sha1_ecdsa_brainpoolP224r1.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.9;
+
+include "../register.circom";
+
+component main = REGISTER(160, 160, 27, 32, 7, 320, 128);
diff --git a/circuits/circuits/register/instances/register_sha1_sha1_sha1_ecdsa_secp256r1.circom b/circuits/circuits/register/instances/register_sha1_sha1_sha1_ecdsa_secp256r1.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.9;
+
+include "../register.circom";
+
+component main = REGISTER(160, 160, 7, 64, 4, 320, 128);
diff --git a/circuits/circuits/register/instances/register_sha1_sha1_sha1_rsa_65537_2048.circom b/circuits/circuits/register/instances/register_sha1_sha1_sha1_rsa_65537_2048.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.9;
+
+include "../register.circom";
+
+component main = REGISTER(160, 160 , 3, 64, 32, 320, 128);