rename circomlib for crypto

2026-04-05 03:00:53 -04:00 · 2025-01-16 00:37:18 +01:00
parent 2a59b0ae38
commit 26ee23e673
99 changed files with 34 additions and 34 deletions
--- a/circuits/circuits/dsc/openpassport_dsc.circom
+++ b/circuits/circuits/dsc/openpassport_dsc.circom
@@ -1,9 +1,9 @@
 pragma circom 2.1.9;

 include "circomlib/circuits/bitify.circom";
-include "../utils/circomlib/hasher/shaBytes/shaBytesDynamic.circom";
+include "../utils/crypto/hasher/shaBytes/shaBytesDynamic.circom";
 include "circomlib/circuits/comparators.circom";
-include "../utils/circomlib/hasher/hash.circom";
+include "../utils/crypto/hasher/hash.circom";
 include "circomlib/circuits/poseidon.circom";
 include "@zk-kit/binary-merkle-root.circom/src/binary-merkle-root.circom";
 include "../utils/passport/customHashers.circom";
--- a/circuits/circuits/tests/utils/ecdsa/test_brainpoolP224r1.circom
+++ b/circuits/circuits/tests/utils/ecdsa/test_brainpoolP224r1.circom
@@ -1,6 +1,6 @@
 pragma circom 2.1.9;

-include "../../../utils/circomlib/signature/ecdsa/ecdsaVerifier.circom";
+include "../../../utils/crypto/signature/ecdsa/ecdsaVerifier.circom";

 template VerifyBrainpoolP224r1Sha160() {
    signal input signature[2 * 7];
--- a/circuits/circuits/tests/utils/ecdsa/test_brainpoolP256r1.circom
+++ b/circuits/circuits/tests/utils/ecdsa/test_brainpoolP256r1.circom
@@ -1,6 +1,6 @@
 pragma circom 2.1.9;

-include "../../../utils/circomlib/signature/ecdsa/ecdsaVerifier.circom";
+include "../../../utils/crypto/signature/ecdsa/ecdsaVerifier.circom";

 template VerifyBrainpoolP256r1Sha512() {
    signal input signature[2 * 4];
--- a/circuits/circuits/tests/utils/ecdsa/test_brainpoolP384r1.circom
+++ b/circuits/circuits/tests/utils/ecdsa/test_brainpoolP384r1.circom
@@ -1,6 +1,6 @@
 pragma circom 2.1.9;

-include "../../../utils/circomlib/signature/ecdsa/ecdsaVerifier.circom";
+include "../../../utils/crypto/signature/ecdsa/ecdsaVerifier.circom";

 template VerifyBrainpoolP384r1Sha384() {
    signal input signature[2 * 6];
--- a/circuits/circuits/tests/utils/rsa/test_rsa_sha1_65537_2048.circom
+++ b/circuits/circuits/tests/utils/rsa/test_rsa_sha1_65537_2048.circom
@@ -1,6 +1,6 @@
 pragma circom 2.1.9;

-include "../../../utils/circomlib/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";
+include "../../../utils/crypto/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";

 template VerifyRsaPkcs1v1_5Tester() {
    signal input signature[35];
--- a/circuits/circuits/tests/utils/rsa/test_rsa_sha256_3_2048.circom
+++ b/circuits/circuits/tests/utils/rsa/test_rsa_sha256_3_2048.circom
@@ -1,6 +1,6 @@
 pragma circom 2.1.9;

-include "../../../utils/circomlib/signature/rsa/verifyRsa3Pkcs1v1_5.circom";
+include "../../../utils/crypto/signature/rsa/verifyRsa3Pkcs1v1_5.circom";

 template VerifyRsaPkcs1v1_5Tester() {
    signal input signature[35];
--- a/circuits/circuits/tests/utils/rsa/test_rsa_sha256_65537_2048.circom
+++ b/circuits/circuits/tests/utils/rsa/test_rsa_sha256_65537_2048.circom
@@ -1,6 +1,6 @@
 pragma circom 2.1.9;

-include "../../../utils/circomlib/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";
+include "../../../utils/crypto/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";

 template VerifyRsaPkcs1v1_5Tester() {
    signal input signature[35];
--- a/circuits/circuits/tests/utils/rsa/test_rsa_sha256_65537_3072.circom
+++ b/circuits/circuits/tests/utils/rsa/test_rsa_sha256_65537_3072.circom
@@ -1,6 +1,6 @@
 pragma circom 2.1.9;

-include "../../../utils/circomlib/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";
+include "../../../utils/crypto/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";

 template VerifyRsaPkcs1v1_5Tester() {
    signal input signature[35];
--- a/circuits/circuits/tests/utils/rsa/test_rsa_sha256_65537_4096.circom
+++ b/circuits/circuits/tests/utils/rsa/test_rsa_sha256_65537_4096.circom
@@ -1,6 +1,6 @@
 pragma circom 2.1.9;

-include "../../../utils/circomlib/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";
+include "../../../utils/crypto/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";

 template VerifyRsaPkcs1v1_5Tester() {
    signal input signature[35];
--- a/circuits/circuits/tests/utils/rsa/test_rsa_sha512_65537_4096.circom
+++ b/circuits/circuits/tests/utils/rsa/test_rsa_sha512_65537_4096.circom
@@ -1,6 +1,6 @@
 pragma circom 2.1.9;

-include "../../../utils/circomlib/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";
+include "../../../utils/crypto/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";

 template VerifyRsaPkcs1v1_5Tester() {
    signal input signature[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_3_2048_32.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_3_2048_32.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss3.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss3.circom";

 template VerifyRsaPss3Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_3_3072_32.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_3_3072_32.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss3.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss3.circom";

 template VerifyRsaPss3Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_3_4096_32.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_3_4096_32.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss3.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss3.circom";

 template VerifyRsaPss3Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_65537_2048_32.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_65537_2048_32.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss65537.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss65537.circom";

 template VerifyRsaPss65537Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_65537_3072_32.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_65537_3072_32.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss65537.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss65537.circom";

 template VerifyRsaPss65537Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_65537_4096_32.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha256_65537_4096_32.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss65537.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss65537.circom";

 template VerifyRsaPss65537Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha384_3_3072_48.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha384_3_3072_48.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss3.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss3.circom";

 template VerifyRsaPss3Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha384_3_4096_48.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha384_3_4096_48.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss3.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss3.circom";

 template VerifyRsaPss3Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha384_65537_3072_48.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha384_65537_3072_48.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss65537.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss65537.circom";

 template VerifyRsaPss65537Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha384_65537_4096_48.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha384_65537_4096_48.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss65537.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss65537.circom";

 template VerifyRsaPss65537Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha512_3_2048_64.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha512_3_2048_64.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss3.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss3.circom";

 template VerifyRsaPss65537Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/tests/utils/rsapss/test_rsapss_sha512_3_4096_64.circom
+++ b/circuits/circuits/tests/utils/rsapss/test_rsapss_sha512_3_4096_64.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../../../utils/circomlib/signature/rsapss/rsapss3.circom";
+include "../../../utils/crypto/signature/rsapss/rsapss3.circom";

 template VerifyRsaPss65537Sig_tester() {
    signal input modulus[35];
--- a/circuits/circuits/utils/circomlib/bigInt/bigInt.circom
+++ b/circuits/circuits/utils/circomlib/bigInt/bigInt.circom
--- a/circuits/circuits/utils/circomlib/bigInt/bigIntComparators.circom
+++ b/circuits/circuits/utils/circomlib/bigInt/bigIntComparators.circom
--- a/circuits/circuits/utils/circomlib/bigInt/bigIntFunc.circom
+++ b/circuits/circuits/utils/circomlib/bigInt/bigIntFunc.circom
--- a/circuits/circuits/utils/circomlib/bigInt/bigIntHelpers.circom
+++ b/circuits/circuits/utils/circomlib/bigInt/bigIntHelpers.circom
--- a/circuits/circuits/utils/circomlib/bigInt/bigIntOverflow.circom
+++ b/circuits/circuits/utils/circomlib/bigInt/bigIntOverflow.circom
--- a/circuits/circuits/utils/circomlib/bigInt/dontOpenPlease.circom
+++ b/circuits/circuits/utils/circomlib/bigInt/dontOpenPlease.circom
--- a/circuits/circuits/utils/circomlib/bigInt/karatsuba.circom
+++ b/circuits/circuits/utils/circomlib/bigInt/karatsuba.circom
--- a/circuits/circuits/utils/circomlib/bitify/gates.circom
+++ b/circuits/circuits/utils/circomlib/bitify/gates.circom
--- a/circuits/circuits/utils/circomlib/bitify/operations.circom
+++ b/circuits/circuits/utils/circomlib/bitify/operations.circom
--- a/circuits/circuits/utils/circomlib/ec/curve.circom
+++ b/circuits/circuits/utils/circomlib/ec/curve.circom
--- a/circuits/circuits/utils/circomlib/ec/get.circom
+++ b/circuits/circuits/utils/circomlib/ec/get.circom
--- a/circuits/circuits/utils/circomlib/ec/powers/brainpoolP224r1pows.circom
+++ b/circuits/circuits/utils/circomlib/ec/powers/brainpoolP224r1pows.circom
--- a/circuits/circuits/utils/circomlib/ec/powers/brainpoolP256r1pows.circom
+++ b/circuits/circuits/utils/circomlib/ec/powers/brainpoolP256r1pows.circom
--- a/circuits/circuits/utils/circomlib/ec/powers/brainpoolP384r1pows.circom
+++ b/circuits/circuits/utils/circomlib/ec/powers/brainpoolP384r1pows.circom
--- a/circuits/circuits/utils/circomlib/ec/powers/brainpoolP512r1pows.circom
+++ b/circuits/circuits/utils/circomlib/ec/powers/brainpoolP512r1pows.circom
--- a/circuits/circuits/utils/circomlib/ec/powers/p256pows.circom
+++ b/circuits/circuits/utils/circomlib/ec/powers/p256pows.circom
--- a/circuits/circuits/utils/circomlib/ec/powers/p384pows.circom
+++ b/circuits/circuits/utils/circomlib/ec/powers/p384pows.circom
--- a/circuits/circuits/utils/circomlib/ec/powers/secp224r1pows.circom
+++ b/circuits/circuits/utils/circomlib/ec/powers/secp224r1pows.circom
--- a/circuits/circuits/utils/circomlib/ec/powers/secp256k1pows.circom
+++ b/circuits/circuits/utils/circomlib/ec/powers/secp256k1pows.circom
--- a/circuits/circuits/utils/circomlib/ec/powers/secp521r1pows.circom
+++ b/circuits/circuits/utils/circomlib/ec/powers/secp521r1pows.circom
--- a/circuits/circuits/utils/circomlib/hasher/hash.circom
+++ b/circuits/circuits/utils/circomlib/hasher/hash.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha1/constants.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha1/constants.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha1/f.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha1/f.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha1/parity.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha1/parity.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha1/rotate.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha1/rotate.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha1/sha1.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha1/sha1.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha1/sha1compression.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha1/sha1compression.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha1/t.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha1/t.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha1/xor4.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha1/xor4.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha224/sha224HashBits.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha224/sha224HashBits.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha224/sha224HashChunks.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha224/sha224HashChunks.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha224/sha224InitialValue.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha224/sha224InitialValue.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256Compress.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256Compress.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256HashBits.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256HashBits.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256HashChunks.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256HashChunks.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256InitialValue.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256InitialValue.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256RoundConst.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256RoundConst.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256Rounds.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256Rounds.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256Schedule.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha256/sha256Schedule.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha2Common.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha2Common.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha384/sha384HashBits.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha384/sha384HashBits.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha384/sha384HashChunks.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha384/sha384HashChunks.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha384/sha384InitialValue.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha384/sha384InitialValue.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512Compress.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512Compress.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512HashBits.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512HashBits.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512HashChunks.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512HashChunks.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512InitialValue.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512InitialValue.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512RoundConst.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512RoundConst.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512Rounds.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512Rounds.circom
--- a/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512Schedule.circom
+++ b/circuits/circuits/utils/circomlib/hasher/sha2/sha512/sha512Schedule.circom
--- a/circuits/circuits/utils/circomlib/hasher/shaBytes/dynamic/sha1Bytes.circom
+++ b/circuits/circuits/utils/circomlib/hasher/shaBytes/dynamic/sha1Bytes.circom
--- a/circuits/circuits/utils/circomlib/hasher/shaBytes/dynamic/sha224Bytes.circom
+++ b/circuits/circuits/utils/circomlib/hasher/shaBytes/dynamic/sha224Bytes.circom
--- a/circuits/circuits/utils/circomlib/hasher/shaBytes/dynamic/sha384Bytes.circom
+++ b/circuits/circuits/utils/circomlib/hasher/shaBytes/dynamic/sha384Bytes.circom
--- a/circuits/circuits/utils/circomlib/hasher/shaBytes/dynamic/sha512Bytes.circom
+++ b/circuits/circuits/utils/circomlib/hasher/shaBytes/dynamic/sha512Bytes.circom
--- a/circuits/circuits/utils/circomlib/hasher/shaBytes/shaBytesDynamic.circom
+++ b/circuits/circuits/utils/circomlib/hasher/shaBytes/shaBytesDynamic.circom
--- a/circuits/circuits/utils/circomlib/hasher/shaBytes/shaBytesStatic.circom
+++ b/circuits/circuits/utils/circomlib/hasher/shaBytes/shaBytesStatic.circom
--- a/circuits/circuits/utils/circomlib/hasher/shaBytes/static/Sha384BytesStatic.circom
+++ b/circuits/circuits/utils/circomlib/hasher/shaBytes/static/Sha384BytesStatic.circom
--- a/circuits/circuits/utils/circomlib/hasher/shaBytes/static/Sha512BytesStatic.circom
+++ b/circuits/circuits/utils/circomlib/hasher/shaBytes/static/Sha512BytesStatic.circom
--- a/circuits/circuits/utils/circomlib/int/arithmetic.circom
+++ b/circuits/circuits/utils/circomlib/int/arithmetic.circom
--- a/circuits/circuits/utils/circomlib/merkle-trees/smt.circom
+++ b/circuits/circuits/utils/circomlib/merkle-trees/smt.circom
--- a/circuits/circuits/utils/circomlib/signature/FpPowMod.circom
+++ b/circuits/circuits/utils/circomlib/signature/FpPowMod.circom
--- a/circuits/circuits/utils/circomlib/signature/ecdsa/ecdsa.circom
+++ b/circuits/circuits/utils/circomlib/signature/ecdsa/ecdsa.circom
--- a/circuits/circuits/utils/circomlib/signature/ecdsa/ecdsaVerifier.circom
+++ b/circuits/circuits/utils/circomlib/signature/ecdsa/ecdsaVerifier.circom
--- a/circuits/circuits/utils/circomlib/signature/rsa/pkcs1v1_5Padding.circom
+++ b/circuits/circuits/utils/circomlib/signature/rsa/pkcs1v1_5Padding.circom
--- a/circuits/circuits/utils/circomlib/signature/rsa/verifyRsa3Pkcs1v1_5.circom
+++ b/circuits/circuits/utils/circomlib/signature/rsa/verifyRsa3Pkcs1v1_5.circom
--- a/circuits/circuits/utils/circomlib/signature/rsa/verifyRsa65537Pkcs1v1_5.circom
+++ b/circuits/circuits/utils/circomlib/signature/rsa/verifyRsa65537Pkcs1v1_5.circom
--- a/circuits/circuits/utils/circomlib/signature/rsapss/mgf1.circom
+++ b/circuits/circuits/utils/circomlib/signature/rsapss/mgf1.circom
--- a/circuits/circuits/utils/circomlib/signature/rsapss/rsapss.circom
+++ b/circuits/circuits/utils/circomlib/signature/rsapss/rsapss.circom
--- a/circuits/circuits/utils/circomlib/signature/rsapss/rsapss3.circom
+++ b/circuits/circuits/utils/circomlib/signature/rsapss/rsapss3.circom
--- a/circuits/circuits/utils/circomlib/signature/rsapss/rsapss65537.circom
+++ b/circuits/circuits/utils/circomlib/signature/rsapss/rsapss65537.circom
--- a/circuits/circuits/utils/circomlib/utils/switcher.circom
+++ b/circuits/circuits/utils/circomlib/utils/switcher.circom
--- a/circuits/circuits/utils/passport/customHashers.circom
+++ b/circuits/circuits/utils/passport/customHashers.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
-include "../circomlib/bigInt/bigIntFunc.circom";
+include "../crypto/bigInt/bigIntFunc.circom";
 include "circomlib/circuits/poseidon.circom";

 template CustomHasher(k) {
--- a/circuits/circuits/utils/passport/ofac/ofac_name.circom
+++ b/circuits/circuits/utils/passport/ofac/ofac_name.circom
@@ -1,7 +1,7 @@
 pragma circom 2.1.9;

 include "circomlib/circuits/poseidon.circom";
-include "../../circomlib/merkle-trees/smt.circom";
+include "../../crypto/merkle-trees/smt.circom";

 template OFAC_NAME() {

--- a/circuits/circuits/utils/passport/ofac/ofac_name_dob.circom
+++ b/circuits/circuits/utils/passport/ofac/ofac_name_dob.circom
@@ -1,7 +1,7 @@
 pragma circom 2.1.9;

 include "circomlib/circuits/poseidon.circom";
-include "../../circomlib/merkle-trees/smt.circom";
+include "../../crypto/merkle-trees/smt.circom";

 template OFAC_NAME_DOB() {

--- a/circuits/circuits/utils/passport/ofac/ofac_passport_number.circom
+++ b/circuits/circuits/utils/passport/ofac/ofac_passport_number.circom
@@ -1,6 +1,6 @@
 pragma circom 2.1.9;

-include "../../circomlib/merkle-trees/smt.circom";
+include "../../crypto/merkle-trees/smt.circom";

 template OFAC_PASSPORT_NUMBER() {

--- a/circuits/circuits/utils/passport/passportVerifier.circom
+++ b/circuits/circuits/utils/passport/passportVerifier.circom
@@ -2,8 +2,8 @@ pragma circom 2.1.9;

 include "@zk-email/circuits/utils/array.circom";
 include "@zk-email/circuits/utils/bytes.circom";
-include "../circomlib/hasher/shaBytes/shaBytesDynamic.circom";
-include "../circomlib/hasher/hash.circom";
+include "../crypto/hasher/shaBytes/shaBytesDynamic.circom";
+include "../crypto/hasher/hash.circom";
 include "./signatureAlgorithm.circom";
 include "./signatureVerifier.circom";

--- a/circuits/circuits/utils/passport/signatureVerifier.circom
+++ b/circuits/circuits/utils/passport/signatureVerifier.circom
@@ -1,10 +1,10 @@
 pragma circom 2.1.9;

-include "../circomlib/signature/rsapss/rsapss3.circom";
-include "../circomlib/signature/rsapss/rsapss65537.circom";
-include "../circomlib/signature/ecdsa/ecdsaVerifier.circom";
-include "../circomlib/signature/rsa/verifyRsa3Pkcs1v1_5.circom";
-include "../circomlib/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";
+include "../crypto/signature/rsapss/rsapss3.circom";
+include "../crypto/signature/rsapss/rsapss65537.circom";
+include "../crypto/signature/ecdsa/ecdsaVerifier.circom";
+include "../crypto/signature/rsa/verifyRsa3Pkcs1v1_5.circom";
+include "../crypto/signature/rsa/verifyRsa65537Pkcs1v1_5.circom";
 include "@zk-email/circuits/utils/bytes.circom";

 template SignatureVerifier(signatureAlgorithm, n, k) {