bump version and fix tbox

crema-labs · Aug 3, 2024 · fceeb02 · fceeb02
1 parent 1903424
commit fceeb02
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 33 deletions.
diff --git a/circomkit.json b/circomkit.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.1.8",
+  "version": "2.1.9",
   "proofSystem": "groth16",
   "curve": "bn128"
 }
diff --git a/circuits/cipher.circom b/circuits/cipher.circom
@@ -1,4 +1,4 @@
-pragma circom 2.1.8;
+pragma circom 2.1.9;
 
 include "key_expansion.circom";
 include "circomlib/circuits/comparators.circom";

diff --git a/circuits/ctr.circom b/circuits/ctr.circom
@@ -1,4 +1,4 @@
-pragma circom 2.1.8;
+pragma circom 2.1.9;
 
 include "cipher.circom";
 include "transformations.circom";

diff --git a/circuits/key_expansion.circom b/circuits/key_expansion.circom
@@ -1,4 +1,4 @@
-pragma circom 2.1.8;
+pragma circom 2.1.9;
 
 include "sbox128.circom";
 include "utils.circom";

diff --git a/circuits/mix_columns.circom b/circuits/mix_columns.circom
@@ -1,4 +1,4 @@
-pragma circom 2.1.8;
+pragma circom 2.1.9;
 
 include "transformations.circom";
 include "circomlib/circuits/comparators.circom";
@@ -55,10 +55,10 @@ template S0(){
     }
 
     num2bits[0] = Num2Bits(8);
-    num2bits[0].in <-- TBox(2, in[0]);
+    num2bits[0].in <-- TBox(0, in[0]);
 
     num2bits[1] = Num2Bits(8);
-    num2bits[1].in <-- TBox(3, in[1]);
+    num2bits[1].in <-- TBox(1, in[1]);
 
     xor[0] = XorBits();
     xor[0].a <== num2bits[0].out;
@@ -92,10 +92,10 @@ template S1(){
     num2bits[0].in <== in[0];
 
     num2bits[1] = Num2Bits(8);
-    num2bits[1].in <-- TBox(2, in[1]);
+    num2bits[1].in <-- TBox(0, in[1]);
 
     num2bits[2] = Num2Bits(8);
-    num2bits[2].in <-- TBox(3, in[2]);
+    num2bits[2].in <-- TBox(1, in[2]);
 
     num2bits[3] = Num2Bits(8);
     num2bits[3].in <== in[3];
@@ -134,10 +134,10 @@ template S2() {
     }
 
     num2bits[2] = Num2Bits(8);
-    num2bits[2].in <-- TBox(2, in[2]);
+    num2bits[2].in <-- TBox(0, in[2]);
 
     num2bits[3] = Num2Bits(8);
-    num2bits[3].in <-- TBox(3, in[3]);
+    num2bits[3].in <-- TBox(1, in[3]);
 
     xor[0] = XorBits();
     xor[0].a <== num2bits[0].out;
@@ -173,10 +173,10 @@ template S3() {
     }
 
     num2bits[0] = Num2Bits(8);
-    num2bits[0].in <-- TBox(3, in[0]);
+    num2bits[0].in <-- TBox(1, in[0]);
 
     num2bits[3] = Num2Bits(8);
-    num2bits[3].in <-- TBox(2, in[3]);
+    num2bits[3].in <-- TBox(0, in[3]);
 
     xor[0] = XorBits();
     xor[0].a <== num2bits[0].out;

diff --git a/circuits/sbox128.circom b/circuits/sbox128.circom
@@ -1,4 +1,4 @@
-pragma circom 2.1.8;
+pragma circom 2.1.9;
 
 include "circomlib/circuits/comparators.circom";
 

diff --git a/circuits/tbox.circom b/circuits/tbox.circom
@@ -1,12 +1,12 @@
-pragma circom 2.1.8;
+pragma circom 2.1.9;
 
 include "transformations.circom";
 include "circomlib/circuits/bitify.circom";
 
 //tbox[0] =>> multiplication by 2
 //tbox[1] =>> multiplication by 3
 function TBox(index, subbyte) {
-    var tbox[2][16*16] = [
+    var tbox[2][256] = [
         [
             0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60,
             62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114,

diff --git a/circuits/transformations.circom b/circuits/transformations.circom
@@ -1,4 +1,4 @@
-pragma circom 2.1.8;
+pragma circom 2.1.9;
 
 include "circomlib/circuits/comparators.circom";
 include "circomlib/circuits/bitify.circom";

diff --git a/circuits/utils.circom b/circuits/utils.circom
@@ -1,4 +1,4 @@
-pragma circom 2.1.8;
+pragma circom 2.1.9;
 
 include "sbox128.circom";
 include "circomlib/circuits/comparators.circom";

diff --git a/tests/tbox.test.ts b/tests/tbox.test.ts