Merge pull request #45 from rarimo/refactor/register-identity

Refactor/register identity
rarimo · Oct 9, 2024 · eddba80 · eddba80
2 parents 31b9da1 + f8abb70
commit eddba80
Show file tree

Hide file tree

Showing 117 changed files with 1,842,253 additions and 1,125 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,9 +28,11 @@ artifacts
 cache
 test/tests/inputs/*
 temp_asn1.der
-test/tests/__pycache__
-!test/tests/*.py
-!test/tests/inputs/credValidExceedsPassportInput.json
-!test/tests/inputs/passportExpiredInput.json
-!test/tests/inputs/isNotAdultInput.json
-!test/tests/inputs/validInput.json
+tests/tests/__pycache__
+circuits/ecdsa/tmp/*
+!tests/tests/*.py
+!tests/tests/inputs/credValidExceedsPassportInput.json
+!tests/tests/inputs/passportExpiredInput.json
+!tests/tests/inputs/isNotAdultInput.json
+!tests/tests/inputs/validInput.json
+helpers/blacklist_generation/__pycache__
diff --git a/circuits/bigInt/bigIntFunc.circom b/circuits/bigInt/bigIntFunc.circom
@@ -430,11 +430,11 @@ function prod_mod(CHUNK_SIZE, CHUNK_NUMBER, A, B, P) {
 // A has CHUNK_NUMBER registers
 // P has CHUNK_NUMBER registers
 // EXP has CHUNK_NUMBER registers
-// CHUNK_NUMBER * CHUNK_SIZE <= 500
+// CHUNK_NUMBER * CHUNK_SIZE <= 513
 // P is A prime
 // computes A^EXP mod P
 function mod_exp(CHUNK_SIZE, CHUNK_NUMBER, A, P, EXP) {
-    var eBits[500]; // length is CHUNK_NUMBER * CHUNK_SIZE
+    var eBits[513]; // length is CHUNK_NUMBER * CHUNK_SIZE
     var BIT_LENGTH; 
     for (var i = 0; i < CHUNK_NUMBER; i++) {
         for (var j = 0; j < CHUNK_SIZE; j++) {
@@ -477,7 +477,7 @@ function mod_exp(CHUNK_SIZE, CHUNK_NUMBER, A, P, EXP) {
 // CHUNK_SIZE bits per register
 // A has CHUNK_NUMBER registers
 // P has CHUNK_NUMBER registers
-// CHUNK_NUMBER * CHUNK_SIZE <= 500
+// CHUNK_NUMBER * CHUNK_SIZE <= 513
 // P is A prime
 // if A == 0 mod P, returns 0
 // else computes inv = A^(P-2) mod P

diff --git a/circuits/ecdsa/BrainpoolSigVerify.circom b/circuits/ecdsa/BrainpoolSigVerify.circom
diff --git a/circuits/ecdsa/P256SigVerify.circom b/circuits/ecdsa/P256SigVerify.circom
diff --git a/circuits/ecdsa/brainpoolP256r1/brainpool.circom b/circuits/ecdsa/brainpoolP256r1/brainpool.circom
@@ -1,11 +1,12 @@
-pragma circom 2.1.8;
+pragma circom 2.1.6;
 
 include "./circomPairing/curve.circom";
 include "./brainpoolFunc.circom";
 include "./brainpoolPows.circom";
 include "circomlib/circuits/multiplexer.circom";
 include "circomlib/circuits/bitify.circom";
 include "circomlib/circuits/comparators.circom";
+include "../utils/func.circom";
 
 template BrainpoolScalarMult(CHUNK_SIZE, CHUNK_NUMBER){
     signal input scalar[CHUNK_NUMBER];
@@ -435,13 +436,3 @@ template BrainpoolPipingerMult(CHUNK_SIZE, CHUNK_NUMBER, WINDOW_SIZE){
 
     out <== res[ADDERS_NUMBER];
 }
-
-function div_ceil(m, CHUNK_SIZE) {
-    var ret = 0;
-    if (m % CHUNK_SIZE == 0) {
-        ret = m \ CHUNK_SIZE;
-    } else {
-        ret = m \ CHUNK_SIZE + 1;
-    }
-    return ret;
-}
diff --git a/circuits/ecdsa/brainpoolP256r1/brainpoolFunc.circom b/circuits/ecdsa/brainpoolP256r1/brainpoolFunc.circom
@@ -1,4 +1,4 @@
-pragma circom 2.1.8;
+pragma circom 2.1.6;
 
 function get_order(CHUNK_SIZE,CHUNK_NUMBER){
 

diff --git a/circuits/ecdsa/brainpoolP256r1/circomPairing/extraCurve.circom b/circuits/ecdsa/brainpoolP256r1/circomPairing/extraCurve.circom
@@ -468,7 +468,7 @@ template MillerLoop1(CHUNK_SIZE, CHUNK_NUMBER, b, r, q){
     assert( 4*CHUNK_SIZE + LOGK3 < 251 );
 
 
-    var BITS[500]; // length is CHUNK_NUMBER * CHUNK_SIZE
+    var BITS[513]; // length is CHUNK_NUMBER * CHUNK_SIZE
     var BIT_LENGTH;
     var SIG_BITS=0;
     for (var i = 0; i < CHUNK_NUMBER; i++) {
@@ -639,7 +639,7 @@ template MillerLoop2(CHUNK_SIZE, CHUNK_NUMBER, b, r, Q){
     signal input Q[2][6][2][CHUNK_NUMBER];
     signal output out[6][2][CHUNK_NUMBER];
 
-    var rBits[500]; // length is CHUNK_NUMBER * CHUNK_SIZE
+    var rBits[513]; // length is CHUNK_NUMBER * CHUNK_SIZE
     var rBitLength;
     var rSigBits=0;
     for (var i = 0; i < CHUNK_NUMBER; i++) {

diff --git a/circuits/ecdsa/brainpoolP256r1/circomPairing/fieldElementsFunc.circom b/circuits/ecdsa/brainpoolP256r1/circomPairing/fieldElementsFunc.circom
@@ -7,7 +7,7 @@ function get_fp_sgn0(a){
 // CHUNK_SIZE bits per register
 // num has CHUNK_NMBER registers
 // p has CHUNK_NMBER registers
-// CHUNK_NMBER * CHUNK_SIZE <= 500
+// CHUNK_NMBER * CHUNK_SIZE <= 513
 // p is a prime
 // if num == 0 mod p, returns 0
 // else computes inv = num^{-1} mod p using extended euclidean algorithm

diff --git a/circuits/ecdsa/brainpoolP256r1/signatureVerification.circom b/circuits/ecdsa/brainpoolP256r1/signatureVerification.circom
@@ -1,4 +1,4 @@
-pragma circom 2.1.8;
+pragma circom 2.1.6;
 
 include "./circomPairing/curve.circom";
 include "circomlib/circuits/bitify.circom";
@@ -104,7 +104,7 @@ template verifyBrainpool(CHUNK_SIZE,CHUNK_NUMBER, ALGO){
     signal tmpPoint2[2][6];
 
     component scalarMult1 = BrainpoolGeneratorMultiplication(43,6);
-    component scalarMult2 = BrainpoolScalarMult(43,6);
+    component scalarMult2 = BrainpoolPipingerMult(43,6,4);
 
     scalarMult1.scalar <== sh;