sha256 with number of bits as a paramter

circuits/sha256/sha256.circom

@@ -0,0 +1,81 @@
+
+
+include "constants.circom";
+include "sha256compression.circom";
+
+template Sha256(nBits) {
+    signal input in[nBits];
+    signal output out[256];
+
+    var i;
+    var k;
+    var nBlocks;
+    var bitsLastBlock;
+
+
+    nBlocks = ((nBits + 64)\512)+1;
+
+    signal paddedIn[nBlocks*512];
+
+    for (k=0; k<nBits; k++) {
+        paddedIn[k] <== in[k];
+    }
+    paddedIn[nBits] <== 1;
+
+    for (k=nBits+1; k<nBlocks*512-64; k++) {
+        paddedIn[k] <== 0;
+    }
+
+    for (k = 0; k< 64; k++) {
+        paddedIn[nBlocks*512 - k -1] <== (nBits >> k)&1;
+    }
+
+    component ha0 = H(0);
+    component hb0 = H(1);
+    component hc0 = H(2);
+    component hd0 = H(3);
+    component he0 = H(4);
+    component hf0 = H(5);
+    component hg0 = H(6);
+    component hh0 = H(7);
+
+    component sha256compression[nBlocks];
+
+    for (i=0; i<nBlocks; i++) {
+
+        sha256compression[i] = Sha256compression() ;
+
+        if (i==0) {
+            for (k=0; k<32; k++ ) {
+                sha256compression[i].hin[0*32+k] <== ha0.out[k];
+                sha256compression[i].hin[1*32+k] <== hb0.out[k];
+                sha256compression[i].hin[2*32+k] <== hc0.out[k];
+                sha256compression[i].hin[3*32+k] <== hd0.out[k];
+                sha256compression[i].hin[4*32+k] <== he0.out[k];
+                sha256compression[i].hin[5*32+k] <== hf0.out[k];
+                sha256compression[i].hin[6*32+k] <== hg0.out[k];
+                sha256compression[i].hin[7*32+k] <== hh0.out[k];
+            }
+        } else {
+            for (k=0; k<32; k++ ) {
+                sha256compression[i].hin[32*0+k] <== sha256compression[i-1].out[32*0+31-k];
+                sha256compression[i].hin[32*1+k] <== sha256compression[i-1].out[32*1+31-k];
+                sha256compression[i].hin[32*2+k] <== sha256compression[i-1].out[32*2+31-k];
+                sha256compression[i].hin[32*3+k] <== sha256compression[i-1].out[32*3+31-k];
+                sha256compression[i].hin[32*4+k] <== sha256compression[i-1].out[32*4+31-k];
+                sha256compression[i].hin[32*5+k] <== sha256compression[i-1].out[32*5+31-k];
+                sha256compression[i].hin[32*6+k] <== sha256compression[i-1].out[32*6+31-k];
+                sha256compression[i].hin[32*7+k] <== sha256compression[i-1].out[32*7+31-k];
+            }
+        }
+
+        for (k=0; k<512; k++) {
+            sha256compression[i].inp[k] <== paddedIn[i*512+k];
+        }
+    }
+
+    for (k=0; k<256; k++) {
+        out[k] <== sha256compression[nBlocks-1].out[k];
+    }
+
+}

circuits/sha256/sha256_2.circom

@@ -17,6 +17,7 @@
     along with circom. If not, see <https://www.gnu.org/licenses/>.
 */
 
+include "constants.circom";
 include "sha256compression.circom";
 include "../bitify.circom"
 
@@ -25,6 +26,9 @@ template Sha256_2() {
     signal input b;
     signal output out;
 
+    var i;
+    var k;
+
     component bits2num = Bits2Num(216);
     component num2bits[2];
 
@@ -34,9 +38,28 @@ template Sha256_2() {
     num2bits[0].in <== a;
     num2bits[1].in <== b;
 
+
     component sha256compression = Sha256compression() ;
 
-    var i;
+    component ha0 = H(0);
+    component hb0 = H(1);
+    component hc0 = H(2);
+    component hd0 = H(3);
+    component he0 = H(4);
+    component hf0 = H(5);
+    component hg0 = H(6);
+    component hh0 = H(7);
+
+    for (k=0; k<32; k++ ) {
+        sha256compression.hin[0*32+k] <== ha0.out[k];
+        sha256compression.hin[1*32+k] <== hb0.out[k];
+        sha256compression.hin[2*32+k] <== hc0.out[k];
+        sha256compression.hin[3*32+k] <== hd0.out[k];
+        sha256compression.hin[4*32+k] <== he0.out[k];
+        sha256compression.hin[5*32+k] <== hf0.out[k];
+        sha256compression.hin[6*32+k] <== hg0.out[k];
+        sha256compression.hin[7*32+k] <== hh0.out[k];
+    }
 
     for (i=0; i<216; i++) {
         sha256compression.inp[i] <== num2bits[0].out[215-i];

circuits/sha256/sha256compression.circom

@@ -24,6 +24,7 @@ include "../binsum.circom";
 include "sigmaplus.circom";
 
 template Sha256compression() {
+    signal input hin[256];
     signal input inp[512];
     signal output out[256];
     signal a[65][32];
@@ -44,15 +45,6 @@ template Sha256compression() {
     component ct_k[64];
     for (i=0; i<64; i++) ct_k[i] = K(i);
 
-    component ha0 = H(0);
-    component hb0 = H(1);
-    component hc0 = H(2);
-    component hd0 = H(3);
-    component he0 = H(4);
-    component hf0 = H(5);
-    component hg0 = H(6);
-    component hh0 = H(7);
-
     component t1[64];
     for (i=0; i<64; i++) t1[i] = T1();
 
@@ -88,14 +80,14 @@ template Sha256compression() {
     }
 
     for (k=0; k<32; k++ ) {
-        a[0][k] <== ha0.out[k]
+        a[0][k] <== hin[k];
-        b[0][k] <== hb0.out[k]
+        b[0][k] <== hin[32*1 + k];
-        c[0][k] <== hc0.out[k]
+        c[0][k] <== hin[32*2 + k];
-        d[0][k] <== hd0.out[k]
+        d[0][k] <== hin[32*3 + k];
-        e[0][k] <== he0.out[k]
+        e[0][k] <== hin[32*4 + k];
-        f[0][k] <== hf0.out[k]
+        f[0][k] <== hin[32*5 + k];
-        g[0][k] <== hg0.out[k]
+        g[0][k] <== hin[32*6 + k];
-        h[0][k] <== hh0.out[k]
+        h[0][k] <== hin[32*7 + k];
     }
 
     for (t = 0; t<64; t++) {
@@ -133,21 +125,21 @@ template Sha256compression() {
     }
 
     for (k=0; k<32; k++) {
-        fsum[0].in[0][k] <==  ha0.out[k];
+        fsum[0].in[0][k] <==  hin[32*0+k];
         fsum[0].in[1][k] <==  a[64][k];
-        fsum[1].in[0][k] <==  hb0.out[k];
+        fsum[1].in[0][k] <==  hin[32*1+k];
         fsum[1].in[1][k] <==  b[64][k];
-        fsum[2].in[0][k] <==  hc0.out[k];
+        fsum[2].in[0][k] <==  hin[32*2+k];
         fsum[2].in[1][k] <==  c[64][k];
-        fsum[3].in[0][k] <==  hd0.out[k];
+        fsum[3].in[0][k] <==  hin[32*3+k];
         fsum[3].in[1][k] <==  d[64][k];
-        fsum[4].in[0][k] <==  he0.out[k];
+        fsum[4].in[0][k] <==  hin[32*4+k];
         fsum[4].in[1][k] <==  e[64][k];
-        fsum[5].in[0][k] <==  hf0.out[k];
+        fsum[5].in[0][k] <==  hin[32*5+k];
         fsum[5].in[1][k] <==  f[64][k];
-        fsum[6].in[0][k] <==  hg0.out[k];
+        fsum[6].in[0][k] <==  hin[32*6+k];
         fsum[6].in[1][k] <==  g[64][k];
-        fsum[7].in[0][k] <==  hh0.out[k];
+        fsum[7].in[0][k] <==  hin[32*7+k];
         fsum[7].in[1][k] <==  h[64][k];
     }
 

test/circuits/circuit.json

@@ -1,776 +0,0 @@
-{
- "mainCode": "{\n    {\n    }\n}\n",
- "signalName2Idx": {
-  "one": 0,
-  "main.in": 33,
-  "main.out[0][0]": 1,
-  "main.out[0][1]": 2,
-  "main.out[1][0]": 3,
-  "main.out[1][1]": 4,
-  "main.out[2][0]": 5,
-  "main.out[2][1]": 6,
-  "main.out[3][0]": 7,
-  "main.out[3][1]": 8,
-  "main.out[4][0]": 9,
-  "main.out[4][1]": 10,
-  "main.out[5][0]": 11,
-  "main.out[5][1]": 12,
-  "main.out[6][0]": 13,
-  "main.out[6][1]": 14,
-  "main.out[7][0]": 15,
-  "main.out[7][1]": 16,
-  "main.out[8][0]": 17,
-  "main.out[8][1]": 18,
-  "main.out[9][0]": 19,
-  "main.out[9][1]": 20,
-  "main.out[10][0]": 21,
-  "main.out[10][1]": 22,
-  "main.out[11][0]": 23,
-  "main.out[11][1]": 24,
-  "main.out[12][0]": 25,
-  "main.out[12][1]": 26,
-  "main.out[13][0]": 27,
-  "main.out[13][1]": 28,
-  "main.out[14][0]": 29,
-  "main.out[14][1]": 30,
-  "main.out[15][0]": 31,
-  "main.out[15][1]": 32,
-  "main.escalarMul.out[0][0]": 34,
-  "main.escalarMul.out[0][1]": 35,
-  "main.escalarMul.out[1][0]": 36,
-  "main.escalarMul.out[1][1]": 37,
-  "main.escalarMul.out[2][0]": 38,
-  "main.escalarMul.out[2][1]": 39,
-  "main.escalarMul.out[3][0]": 40,
-  "main.escalarMul.out[3][1]": 41,
-  "main.escalarMul.out[4][0]": 42,
-  "main.escalarMul.out[4][1]": 43,
-  "main.escalarMul.out[5][0]": 44,
-  "main.escalarMul.out[5][1]": 45,
-  "main.escalarMul.out[6][0]": 46,
-  "main.escalarMul.out[6][1]": 47,
-  "main.escalarMul.out[7][0]": 48,
-  "main.escalarMul.out[7][1]": 49,
-  "main.escalarMul.out[8][0]": 50,
-  "main.escalarMul.out[8][1]": 51,
-  "main.escalarMul.out[9][0]": 52,
-  "main.escalarMul.out[9][1]": 53,
-  "main.escalarMul.out[10][0]": 54,
-  "main.escalarMul.out[10][1]": 55,
-  "main.escalarMul.out[11][0]": 56,
-  "main.escalarMul.out[11][1]": 57,
-  "main.escalarMul.out[12][0]": 58,
-  "main.escalarMul.out[12][1]": 59,
-  "main.escalarMul.out[13][0]": 60,
-  "main.escalarMul.out[13][1]": 61,
-  "main.escalarMul.out[14][0]": 62,
-  "main.escalarMul.out[14][1]": 63,
-  "main.escalarMul.out[15][0]": 64,
-  "main.escalarMul.out[15][1]": 65
- },
- "components": [
-  {
-   "name": "main",
-   "params": {},
-   "template": "Main",
-   "inputSignals": 1
-  },
-  {
-   "name": "main.escalarMul",
-   "params": {
-    "base": [
-     "5299619240641551281634865583518297030282874472190772894086521144482721001553",
-     "16950150798460657717958625567821834550301663161624707787222815936182638968203"
-    ],
-    "k": "0"
-   },
-   "template": "EscalarMulW4Table",
-   "inputSignals": 0
-  }
- ],
- "componentName2Idx": {
-  "main": 0,
-  "main.escalarMul": 1
- },
- "signals": [
-  {
-   "names": [
-    "one"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[0][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[0][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[1][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[1][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[2][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[2][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[3][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[3][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[4][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[4][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[5][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[5][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[6][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[6][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[7][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[7][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[8][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[8][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[9][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[9][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[10][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[10][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[11][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[11][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[12][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[12][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[13][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[13][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[14][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[14][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[15][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.out[15][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.in"
-   ],
-   "triggerComponents": [
-    0
-   ]
-  },
-  {
-   "names": [
-    "main.escalarMul.out[0][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[0][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[1][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[1][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[2][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[2][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[3][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[3][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[4][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[4][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[5][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[5][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[6][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[6][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[7][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[7][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[8][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[8][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[9][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[9][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[10][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[10][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[11][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[11][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[12][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[12][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[13][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[13][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[14][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[14][1]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[15][0]"
-   ],
-   "triggerComponents": []
-  },
-  {
-   "names": [
-    "main.escalarMul.out[15][1]"
-   ],
-   "triggerComponents": []
-  }
- ],
- "constraints": [
-  [
-   {},
-   {
-    "33": "1"
-   },
-   {
-    "1": "21888242871839275222246405745257275088548364400416034343698204186575808495616"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "2": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "1"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "3": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "5299619240641551281634865583518297030282874472190772894086521144482721001553"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "4": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "16950150798460657717958625567821834550301663161624707787222815936182638968203"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "5": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "10031262171927540148667355526369034398030886437092045105752248699557385197826"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "6": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "633281375905621697187330766174974863687049529291089048651929454608812697683"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "7": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "2763488322167937039616325905516046217694264098671987087929565332380420898366"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "8": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "15305195750036305661220525648961313310481046260814497672243197092298550508693"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "9": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "12252886604826192316928789929706397349846234911198931249025449955069330867144"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "10": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "1286140751908834028607023759717162073146610688084909004843365841635476459484"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "11": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "11480966271046430430613841218147196773252373073876138147006741179837832100836"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "12": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "15148236048131954717802795400425086368006776860859772698778589175317365693546"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "13": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "10483991165196995731760716870725509190315033255344071753161464961897900552628"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "14": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "16822899191463256771813724222715007505997804748105685077895991386716774358231"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "15": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "20092560661213339045022877747484245238324772779820628739268223482659246842641"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "16": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "12112450042127193446189577552007703839818242727902437791835414514847797088033"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "17": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "7582035475627193640797276505418002166691739036475590846121162698650004832581"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "18": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "7801528930831391612913542953849263092120765287178679640990215688947513841260"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "19": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "4705897243203718691035604313913899717760209962238015362153877735592901317263"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "20": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "11533909001000295577818857040682494493436124051895563619976413559559984357704"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "21": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "153240920024090527149238595127650983736082984617707450012091413752625486998"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "22": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "4020276081434545615309760015178511782232038136121596626881988383789905359767"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "23": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "21605515851820432880964235241069234202284600780825340516808373216881770219365"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "24": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "18856460861531942120859708048677603751294231190189224157283439874962410808705"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "25": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "13745444942333935831105476262872495530232646590228527111681360848540626474828"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "26": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "12593235468414968750242085888471035041062129592669413010808753916989521208231"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "27": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "2645068156583085050795409844793952496341966587935372213947442411891928926825"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "28": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "18721023485287444620535873833099074300132272004358512346950884094158923211889"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "29": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "6271573312546148160329629673815240458676221818610765478794395550121752710497"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "30": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "20729133862440981855920571719405839551572203482913253618619962546642052100217"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "31": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "5958787406588418500595239545974275039455545059833263445973445578199987122248"
-   }
-  ],
-  [
-   {},
-   {},
-   {
-    "32": "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-    "33": "6291453822075498887551694851992571215511219854100590306020486222643399599966"
-   }
-  ]
- ],
- "templates": {
-  "EscalarMulW4Table": "function(ctx) {\n    ctx.setVar(\"dbl\", [], ctx.getVar(\"base\",[]));\n    for (ctx.setVar(\"i\", [], \"0\");bigInt(bigInt(ctx.getVar(\"i\",[])).lt(bigInt(bigInt(ctx.getVar(\"k\",[])).mul(bigInt(\"4\")).mod(__P__))) ? 1 : 0).neq(bigInt(0));(ctx.setVar(\"i\", [], bigInt(ctx.getVar(\"i\",[])).add(bigInt(\"1\")).mod(__P__))).add(__P__).sub(bigInt(1)).mod(__P__)) { \n    {\n        ctx.setVar(\"dbl\", [], ctx.callFunction(\"pointAdd\", [ctx.getVar(\"dbl\",[\"0\"]),ctx.getVar(\"dbl\",[\"1\"]),ctx.getVar(\"dbl\",[\"0\"]),ctx.getVar(\"dbl\",[\"1\"])]));\n    }\n\n     }\n    ctx.setSignal(\"out\", [\"0\",\"0\"], \"0\");\n    ctx.assert(ctx.getSignal(\"out\", [\"0\",\"0\"]), \"0\");\n    ctx.setSignal(\"out\", [\"0\",\"1\"], \"1\");\n    ctx.assert(ctx.getSignal(\"out\", [\"0\",\"1\"]), \"1\");\n    for (ctx.setVar(\"i\", [], \"1\");bigInt(bigInt(ctx.getVar(\"i\",[])).lt(bigInt(\"16\")) ? 1 : 0).neq(bigInt(0));(ctx.setVar(\"i\", [], bigInt(ctx.getVar(\"i\",[])).add(bigInt(\"1\")).mod(__P__))).add(__P__).sub(bigInt(1)).mod(__P__)) { \n    {\n        ctx.setVar(\"p\", [], ctx.callFunction(\"pointAdd\", [ctx.getSignal(\"out\", [bigInt(ctx.getVar(\"i\",[])).add(__P__).sub(bigInt(\"1\")).mod(__P__),\"0\"]),ctx.getSignal(\"out\", [bigInt(ctx.getVar(\"i\",[])).add(__P__).sub(bigInt(\"1\")).mod(__P__),\"1\"]),ctx.getVar(\"dbl\",[\"0\"]),ctx.getVar(\"dbl\",[\"1\"])]));\n        ctx.setSignal(\"out\", [ctx.getVar(\"i\",[]),\"0\"], ctx.getVar(\"p\",[\"0\"]));\n        ctx.assert(ctx.getSignal(\"out\", [ctx.getVar(\"i\",[]),\"0\"]), ctx.getVar(\"p\",[\"0\"]));\n        ctx.setSignal(\"out\", [ctx.getVar(\"i\",[]),\"1\"], ctx.getVar(\"p\",[\"1\"]));\n        ctx.assert(ctx.getSignal(\"out\", [ctx.getVar(\"i\",[]),\"1\"]), ctx.getVar(\"p\",[\"1\"]));\n    }\n\n     }\n}\n",
-  "Main": "function(ctx) {\n    ctx.setVar(\"base\", [], [\"5299619240641551281634865583518297030282874472190772894086521144482721001553\",\"16950150798460657717958625567821834550301663161624707787222815936182638968203\"]);\n    for (ctx.setVar(\"i\", [], \"0\");bigInt(bigInt(ctx.getVar(\"i\",[])).lt(bigInt(\"16\")) ? 1 : 0).neq(bigInt(0));(ctx.setVar(\"i\", [], bigInt(ctx.getVar(\"i\",[])).add(bigInt(\"1\")).mod(__P__))).add(__P__).sub(bigInt(1)).mod(__P__)) { \n    {\n        ctx.setSignal(\"out\", [ctx.getVar(\"i\",[]),\"0\"], bigInt(ctx.getPin(\"escalarMul\", [], \"out\", [ctx.getVar(\"i\",[]),\"0\"])).mul(bigInt(ctx.getSignal(\"in\", []))).mod(__P__));\n        ctx.assert(ctx.getSignal(\"out\", [ctx.getVar(\"i\",[]),\"0\"]), bigInt(ctx.getPin(\"escalarMul\", [], \"out\", [ctx.getVar(\"i\",[]),\"0\"])).mul(bigInt(ctx.getSignal(\"in\", []))).mod(__P__));\n        ctx.setSignal(\"out\", [ctx.getVar(\"i\",[]),\"1\"], bigInt(ctx.getPin(\"escalarMul\", [], \"out\", [ctx.getVar(\"i\",[]),\"1\"])).mul(bigInt(ctx.getSignal(\"in\", []))).mod(__P__));\n        ctx.assert(ctx.getSignal(\"out\", [ctx.getVar(\"i\",[]),\"1\"]), bigInt(ctx.getPin(\"escalarMul\", [], \"out\", [ctx.getVar(\"i\",[]),\"1\"])).mul(bigInt(ctx.getSignal(\"in\", []))).mod(__P__));\n    }\n\n     }\n}\n"
- },
- "functions": {
-  "pointAdd": {
-   "params": [
-    "x1",
-    "y1",
-    "x2",
-    "y2"
-   ],
-   "func": "function(ctx) {\n    ctx.setVar(\"a\", [], \"168700\");\n    ctx.setVar(\"d\", [], \"168696\");\n    ctx.setVar(\"res\", [\"0\"], bigInt(bigInt(bigInt(ctx.getVar(\"x1\",[])).mul(bigInt(ctx.getVar(\"y2\",[]))).mod(__P__)).add(bigInt(bigInt(ctx.getVar(\"y1\",[])).mul(bigInt(ctx.getVar(\"x2\",[]))).mod(__P__))).mod(__P__)).mul( bigInt(bigInt(\"1\").add(bigInt(bigInt(bigInt(bigInt(bigInt(ctx.getVar(\"d\",[])).mul(bigInt(ctx.getVar(\"x1\",[]))).mod(__P__)).mul(bigInt(ctx.getVar(\"x2\",[]))).mod(__P__)).mul(bigInt(ctx.getVar(\"y1\",[]))).mod(__P__)).mul(bigInt(ctx.getVar(\"y2\",[]))).mod(__P__))).mod(__P__)).inverse(__P__) ).mod(__P__));\n    ctx.setVar(\"res\", [\"1\"], bigInt(bigInt(bigInt(ctx.getVar(\"y1\",[])).mul(bigInt(ctx.getVar(\"y2\",[]))).mod(__P__)).add(__P__).sub(bigInt(bigInt(bigInt(ctx.getVar(\"a\",[])).mul(bigInt(ctx.getVar(\"x1\",[]))).mod(__P__)).mul(bigInt(ctx.getVar(\"x2\",[]))).mod(__P__))).mod(__P__)).mul( bigInt(bigInt(\"1\").add(__P__).sub(bigInt(bigInt(bigInt(bigInt(bigInt(ctx.getVar(\"d\",[])).mul(bigInt(ctx.getVar(\"x1\",[]))).mod(__P__)).mul(bigInt(ctx.getVar(\"x2\",[]))).mod(__P__)).mul(bigInt(ctx.getVar(\"y1\",[]))).mod(__P__)).mul(bigInt(ctx.getVar(\"y2\",[]))).mod(__P__))).mod(__P__)).inverse(__P__) ).mod(__P__));\n    return ctx.getVar(\"res\",[]);;\n}\n"
-  }
- },
- "nPrvInputs": 0,
- "nPubInputs": 1,
- "nInputs": 1,
- "nOutputs": 32,
- "nVars": 34,
- "nConstants": 32,
- "nSignals": 66
-}

test/circuits/sha256_test448.circom

@@ -0,0 +1,3 @@
+include "../../circuits/sha256/sha256.circom";
+
+component main = Sha256(448);

test/circuits/sha256_test512.circom

@@ -0,0 +1,3 @@
+include "../../circuits/sha256/sha256.circom";
+
+component main = Sha256(512);

test/sha256.js

@@ -12,8 +12,43 @@ const sha256 = require("./helpers/sha256");
 // const printSignal = require("./helpers/printsignal");
 
 
+function buffer2bitArray(b) {
+    const res = [];
+    for (let i=0; i<b.length; i++) {
+        for (let j=0; j<8; j++) {
+            res.push((b[i] >> (7-j) &1));
+        }
+    }
+    return res;
+}
+
+function bitArray2buffer(a) {
+    const len = Math.floor((a.length -1 )/8)+1;
+    const b = new Buffer.alloc(len);
+
+    for (let i=0; i<a.length; i++) {
+        const p = Math.floor(i/8);
+        b[p] = b[p] | (Number(a[i]) << ( 7 - (i%8)  ));
+    }
+    return b;
+}
+
+
 describe("SHA256 test", () => {
-    it("Should calculate a hash", async () => {
+
+
+    it("Should work bits to array and array to bits", async () => {
+        const b = new Buffer.alloc(64);
+        for (let i=0; i<64; i++) {
+            b[i] = i+1;
+        }
+        const a = buffer2bitArray(b);
+        const b2 = bitArray2buffer(a);
+
+        assert.equal(b.toString("hex"), b2.toString("hex"));
+    });
+
+    it("Should calculate a hash of 1 compressor", async () => {
         const cirDef = await compiler(path.join(__dirname, "circuits", "sha256_2_test.circom"));
         const circuit = new snarkjs.Circuit(cirDef);
 
@@ -38,5 +73,64 @@ describe("SHA256 test", () => {
         assert(witness[1].equals(snarkjs.bigInt(r)));
     }).timeout(1000000);
 
+    it("Should calculate a hash of 2 compressor", async () => {
+        const cirDef = await compiler(path.join(__dirname, "circuits", "sha256_test512.circom"),  {reduceConstraints:false}  );
+        const circuit = new snarkjs.Circuit(cirDef);
 
+        console.log("Vars: "+circuit.nVars);
+        console.log("Constraints: "+circuit.nConstraints);
+
+/*
+        const testStr = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
+
+        const b = Buffer.from(testStr, 'utf8');
+*/
+        const b = new Buffer.alloc(64);
+        for (let i=0; i<64; i++) {
+            b[i] = i+1;
+        }
+
+        const hash = crypto.createHash("sha256")
+            .update(b)
+            .digest("hex");
+
+        const arrIn = buffer2bitArray(b);
+        const witness = circuit.calculateWitness({ "in": arrIn } /*, {logOutput: true} */);
+
+        const arrOut = witness.slice(1, 257);
+        const hash2 = bitArray2buffer(arrOut).toString("hex");
+
+        assert.equal(hash, hash2);
+
+    }).timeout(1000000);
+
+
+    it("Should calculate a hash of 2 compressor", async () => {
+        const cirDef = await compiler(path.join(__dirname, "circuits", "sha256_test448.circom"),  {reduceConstraints:false}  );
+        const circuit = new snarkjs.Circuit(cirDef);
+
+        console.log("Vars: "+circuit.nVars);
+        console.log("Constraints: "+circuit.nConstraints);
+
+
+        const testStr = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
+
+        const b = Buffer.from(testStr, 'utf8');
+        for (let i=0; i<64; i++) {
+            b[i] = i+1;
+        }
+
+        const hash = crypto.createHash("sha256")
+            .update(b)
+            .digest("hex");
+
+        const arrIn = buffer2bitArray(b);
+        const witness = circuit.calculateWitness({ "in": arrIn } /*, {logOutput: true} */);
+
+        const arrOut = witness.slice(1, 257);
+        const hash2 = bitArray2buffer(arrOut).toString("hex");
+
+        assert.equal(hash, hash2);
+
+    }).timeout(1000000);
 });