replace local lib with official circomlib

circuits/aes-gcm/aes-gcm.circom

@@ -0,0 +1,74 @@
+pragma circom 2.1.9;
+
+include "../aes-ctr/ctr.circom";
+include "../ghash/ghash.circom";
+include "../aes-ctr/cipher.circom";
+include "circomlib/circuits/bitify.circom";
+
+template AESGCM(l, nk) {
+    // Inputs
+    signal input key[nk * 4];
+    signal input iv[12]; // IV length is 96 bits (12 bytes)
+    signal input plainText[l];
+    signal input additionalData[16]; // AAD length is 128 bits (16 bytes)
+
+    // Outputs
+    signal output cipherText[l];
+    signal output authTag[16]; // Authentication tag length is 128 bits (16 bytes)
+
+    // Step 1: Let H = CIPHK(0128)
+    component zeroBlock = Num2Bits(128);
+    zeroBlock.in <== 0;
+    component cipherH = Cipher(nk);
+    cipherH.key <== key;
+    cipherH.block <== zeroBlock.out;
+    signal H[128];
+    H <== cipherH.cipher;
+
+    // Step 2: Define a block, J0
+    signal J0[128];
+    if (iv.length == 12) {
+        for (var i = 0; i < 96; i++) {
+            J0[i] <== iv[i];
+        }
+        for (var i = 96; i < 127; i++) {
+            J0[i] <== 0;
+        }
+        J0[127] <== 1;
+    } else {
+        // Handle the case where IV length is not 96 bits
+        // This part is omitted for simplicity
+    }
+
+    // Step 3: Let C = GCTRK(inc32(J0), P)
+    component incJ0 = Increment32();
+    incJ0.in <== J0;
+    component gctr = GCTR(l, nk);
+    gctr.key <== key;
+    gctr.iv <== incJ0.out;
+    gctr.plainText <== plainText;
+    cipherText <== gctr.cipherText;
+
+    // Step 4: Let u and v
+    var u = 128 * Math.ceil(cipherText.length / 128) - cipherText.length;
+    var v = 128 * Math.ceil(additionalData.length / 128) - additionalData.length;
+
+    // Step 5: Define a block, S
+    component ghash = GHASH();
+    ghash.H <== H;
+    ghash.A <== additionalData;
+    ghash.C <== cipherText;
+    ghash.u <== u;
+    ghash.v <== v;
+    signal S[128];
+    S <== ghash.out;
+
+    // Step 6: Let T = MSBt(GCTRK(J0, S))
+    component gctrT = GCTR(16, nk);
+    gctrT.key <== key;
+    gctrT.iv <== J0;
+    gctrT.plainText <== S;
+    authTag <== gctrT.cipherText;
+
+}
+

circuits/aes-gcm/helper_functions.circom

@@ -1,8 +1,8 @@
 pragma circom 2.1.9;
 
-include "../lib_circuits/bitify.circom";
-include "../lib_circuits/gates.circom";
-include "../lib_circuits/comparators.circom";
+include "circomlib/circuits/bitify.circom";
+include "circomlib/circuits/gates.circom";
+include "circomlib/circuits/comparators.circom";
 
 template BitwiseRightShift(n, r) {
     signal input in[n];