From 91fce60eff01b8674ffd17d810f9b4f037ec5443 Mon Sep 17 00:00:00 2001 From: Jun FENG <99384777+6fj@users.noreply.github.com> Date: Fri, 29 Mar 2024 14:19:25 +0800 Subject: [PATCH] repo-sync-2024-03-29T13:49:53+0800 (#103) --- RELEASE.md | 3 +++ bazel/repositories.bzl | 6 +++--- examples/pir/BUILD.bazel | 2 +- examples/pir/generate_pir_data.cc | 2 +- examples/psi/generate_psi_data.py | 1 - psi/apsi/BUILD.bazel | 2 +- psi/apsi/pir.cc | 4 ++-- psi/apsi/pir_test.cc | 2 +- psi/apsi/sender_db.cc | 2 +- psi/apsi/sender_kvdb.cc | 2 +- psi/bc22/BUILD.bazel | 8 ++++---- psi/bc22/bc22_psi.cc | 2 +- psi/bc22/emp_vole.cc | 2 +- psi/bc22/emp_vole_test.cc | 2 +- psi/bc22/generalized_cuckoo_hash.cc | 2 +- psi/bc22/generalized_cuckoo_hash.h | 2 +- psi/cryptor/BUILD.bazel | 12 ++++++------ psi/cryptor/ecc_cryptor.cc | 2 +- psi/cryptor/ecc_utils.h | 2 +- psi/cryptor/fourq_cryptor.cc | 2 +- psi/cryptor/hash_to_curve_elligator2.cc | 2 +- psi/cryptor/sm2_cryptor.cc | 2 +- psi/cryptor/sm2_cryptor_test.cc | 2 +- psi/cryptor/sodium_curve25519_cryptor.cc | 2 +- psi/ecdh/BUILD.bazel | 8 ++++---- psi/ecdh/basic_ecdh_oprf.cc | 4 ++-- psi/ecdh/basic_ecdh_oprf.h | 2 +- psi/ecdh/basic_ecdh_oprf_test.cc | 2 +- psi/ecdh/ecdh_oprf_psi_test.cc | 2 +- psi/ecdh/ecdh_psi.cc | 2 +- psi/kkrt/BUILD.bazel | 12 ++++++------ psi/kkrt/kkrt_psi.cc | 10 +++++----- psi/kkrt/kkrt_psi.h | 2 +- psi/kkrt/kkrt_psi_benchmark.cc | 2 +- psi/kkrt/kkrt_psi_test.cc | 4 ++-- psi/kkrt/receiver.cc | 2 +- psi/kkrt/receiver.h | 2 +- psi/kkrt/sender.cc | 2 +- psi/kkrt/sender.h | 2 +- psi/legacy/bucket_psi.cc | 4 ++-- psi/legacy/bucket_psi_test.cc | 2 +- psi/legacy/bucket_ub_psi.cc | 2 +- psi/legacy/bucket_ub_psi_test.cc | 2 +- psi/legacy/dp_psi/BUILD.bazel | 2 +- psi/legacy/dp_psi/dp_psi.cc | 2 +- psi/legacy/dp_psi/dp_psi_payload_benchmark.cc | 2 +- psi/legacy/kkrt_2party_psi.cc | 2 +- psi/legacy/mini_psi/BUILD.bazel | 2 +- psi/legacy/mini_psi/mini_psi.cc | 4 ++-- psi/legacy/nparty_psi.cc | 2 +- psi/legacy/rr22_2party_psi.cc | 2 +- psi/rr22/BUILD.bazel | 14 +++++++------- psi/rr22/davis_meyer_hash.cc | 4 ++-- psi/rr22/davis_meyer_hash_test.cc | 2 +- psi/rr22/okvs/BUILD.bazel | 10 +++++----- psi/rr22/okvs/aes_crhash.h | 2 +- psi/rr22/okvs/baxos_test.cc | 2 +- psi/rr22/okvs/galois128_test.cc | 2 +- psi/rr22/okvs/paxos_hash_test.cc | 2 +- psi/rr22/receiver.cc | 4 ++-- psi/rr22/rr22_oprf.cc | 2 +- psi/rr22/rr22_oprf.h | 2 +- psi/rr22/rr22_psi_benchmark.cc | 2 +- psi/rr22/rr22_psi_test.cc | 2 +- psi/rr22/sender.cc | 2 +- psi/seal_pir/BUILD.bazel | 2 +- psi/seal_pir/seal_mpir.h | 2 +- psi/utils/BUILD.bazel | 10 +++++----- psi/utils/batch_provider.cc | 2 +- psi/utils/csv_checker.cc | 2 +- psi/utils/cuckoo_index_test.cc | 2 +- psi/utils/test_utils.h | 2 +- psi/utils/ub_psi_cache_test.cc | 2 +- psi/version.h | 4 ++-- 74 files changed, 119 insertions(+), 117 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 9e751e6..add2b17 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -5,6 +5,9 @@ > - `[API]` prefix for API changes. > - `[Improvement]` prefix for implementation improvement. +## v0.4.0.dev240329 +- [Improvement] upgrade yacl to 0.4.4b3. + ## v0.3.0beta - [Improvement] add uuid in system temp folder. - [Improvement] use arrow csv reader in pir. diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index ce5aa44..5bbd792 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -51,10 +51,10 @@ def _yacl(): http_archive, name = "yacl", urls = [ - "https://github.com/secretflow/yacl/archive/refs/tags/0.4.3b0.tar.gz", + "https://github.com/secretflow/yacl/archive/refs/tags/0.4.4b3.tar.gz", ], - strip_prefix = "yacl-0.4.3b0", - sha256 = "76f40897a360c9f8cce25840d6a068144cc703c630e0a23679f7d2aae3a015d1", + strip_prefix = "yacl-0.4.4b3", + sha256 = "c6b5f32e92d2e31c1c5d7176792965fcf332d1ae892ab8b049d2e66f6f47e4f2", ) def _bazel_platform(): diff --git a/examples/pir/BUILD.bazel b/examples/pir/BUILD.bazel index 0aaa5d7..c20bee7 100644 --- a/examples/pir/BUILD.bazel +++ b/examples/pir/BUILD.bazel @@ -22,6 +22,6 @@ psi_cc_binary( deps = [ "@com_github_gflags_gflags//:gflags", "@com_google_absl//absl/strings", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/rand", ], ) diff --git a/examples/pir/generate_pir_data.cc b/examples/pir/generate_pir_data.cc index 9793948..c07df80 100644 --- a/examples/pir/generate_pir_data.cc +++ b/examples/pir/generate_pir_data.cc @@ -26,7 +26,7 @@ #include "fmt/format.h" #include "gflags/gflags.h" #include "spdlog/spdlog.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" DEFINE_int32(data_count, 100000, "example data count"); diff --git a/examples/psi/generate_psi_data.py b/examples/psi/generate_psi_data.py index f95d423..0dead88 100644 --- a/examples/psi/generate_psi_data.py +++ b/examples/psi/generate_psi_data.py @@ -55,7 +55,6 @@ def write_table( table = create_table(id_cnt, label_cnt) with csv.CSVWriter(output_path, table.schema) as table_writer: - cnt = 0 while cnt < intersection_cnt: table_row = min(batch_size, intersection_cnt - cnt) diff --git a/psi/apsi/BUILD.bazel b/psi/apsi/BUILD.bazel index 9c77419..8e17b28 100644 --- a/psi/apsi/BUILD.bazel +++ b/psi/apsi/BUILD.bazel @@ -198,7 +198,7 @@ psi_cc_library( "//psi/proto:pir_cc_proto", "//psi/utils:serialize", "//psi/utils:sync", - "@yacl//yacl/crypto/base/block_cipher:symmetric_crypto", + "@yacl//yacl/crypto/block_cipher:symmetric_crypto", ], ) diff --git a/psi/apsi/pir.cc b/psi/apsi/pir.cc index 1667e5d..9fe617f 100644 --- a/psi/apsi/pir.cc +++ b/psi/apsi/pir.cc @@ -21,8 +21,8 @@ #include #include -#include "yacl/crypto/base/hash/hash_utils.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/hash/hash_utils.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/io/kv/leveldb_kvstore.h" #include "yacl/io/rw/csv_writer.h" diff --git a/psi/apsi/pir_test.cc b/psi/apsi/pir_test.cc index 8194cba..4986e01 100644 --- a/psi/apsi/pir_test.cc +++ b/psi/apsi/pir_test.cc @@ -22,8 +22,8 @@ #include "gtest/gtest.h" #include "spdlog/spdlog.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" -#include "yacl/crypto/utils/rand.h" #include "yacl/link/test_util.h" #include "yacl/utils/scope_guard.h" diff --git a/psi/apsi/sender_db.cc b/psi/apsi/sender_db.cc index b84fe90..9080547 100644 --- a/psi/apsi/sender_db.cc +++ b/psi/apsi/sender_db.cc @@ -42,7 +42,7 @@ #include "seal/util/streambuf.h" #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/utils/parallel.h" #include "psi/apsi/serialize.h" diff --git a/psi/apsi/sender_kvdb.cc b/psi/apsi/sender_kvdb.cc index 374fe5f..6fd0aa0 100644 --- a/psi/apsi/sender_kvdb.cc +++ b/psi/apsi/sender_kvdb.cc @@ -52,7 +52,7 @@ #include "absl/strings/escaping.h" #include "seal/util/common.h" #include "seal/util/streambuf.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/utils/parallel.h" namespace psi::apsi { diff --git a/psi/bc22/BUILD.bazel b/psi/bc22/BUILD.bazel index 6824f1a..543f129 100644 --- a/psi/bc22/BUILD.bazel +++ b/psi/bc22/BUILD.bazel @@ -31,7 +31,7 @@ psi_cc_library( "@com_google_absl//absl/strings", "@yacl//yacl/base:exception", "@yacl//yacl/base:int128", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/rand", "@yacl//yacl/link", "@yacl//yacl/utils:parallel", ], @@ -58,7 +58,7 @@ psi_cc_library( "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/rand", "@yacl//yacl/link", ], ) @@ -84,9 +84,9 @@ psi_cc_library( "@yacl//yacl/base:byte_container_view", "@yacl//yacl/base:exception", "@yacl//yacl/base:int128", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", + "@yacl//yacl/crypto/rand", "@yacl//yacl/crypto/tools:prg", - "@yacl//yacl/crypto/utils:rand", "@yacl//yacl/link", "@yacl//yacl/utils:parallel", ], diff --git a/psi/bc22/bc22_psi.cc b/psi/bc22/bc22_psi.cc index 11de3f5..4f364fb 100644 --- a/psi/bc22/bc22_psi.cc +++ b/psi/bc22/bc22_psi.cc @@ -24,7 +24,7 @@ #include "absl/strings/escaping.h" #include "openssl/rand.h" #include "spdlog/spdlog.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/utils/parallel.h" #include "psi/bc22/emp_vole.h" diff --git a/psi/bc22/emp_vole.cc b/psi/bc22/emp_vole.cc index 794ca96..eefef41 100644 --- a/psi/bc22/emp_vole.cc +++ b/psi/bc22/emp_vole.cc @@ -17,7 +17,7 @@ #include #include "spdlog/spdlog.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" namespace psi::bc22 { diff --git a/psi/bc22/emp_vole_test.cc b/psi/bc22/emp_vole_test.cc index bd938f9..4fb01af 100644 --- a/psi/bc22/emp_vole_test.cc +++ b/psi/bc22/emp_vole_test.cc @@ -22,7 +22,7 @@ #include "absl/strings/escaping.h" #include "gtest/gtest.h" #include "spdlog/spdlog.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/link/test_util.h" #include "psi/utils/serialize.h" diff --git a/psi/bc22/generalized_cuckoo_hash.cc b/psi/bc22/generalized_cuckoo_hash.cc index 5dc7cec..c97c861 100644 --- a/psi/bc22/generalized_cuckoo_hash.cc +++ b/psi/bc22/generalized_cuckoo_hash.cc @@ -20,7 +20,7 @@ #include "absl/strings/escaping.h" #include "spdlog/spdlog.h" #include "yacl/base/int128.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/utils/parallel.h" namespace psi::bc22 { diff --git a/psi/bc22/generalized_cuckoo_hash.h b/psi/bc22/generalized_cuckoo_hash.h index 3594fbc..1dd84d8 100644 --- a/psi/bc22/generalized_cuckoo_hash.h +++ b/psi/bc22/generalized_cuckoo_hash.h @@ -23,7 +23,7 @@ #include "yacl/base/byte_container_view.h" #include "yacl/base/exception.h" #include "yacl/base/int128.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "psi/utils/cuckoo_index.h" diff --git a/psi/cryptor/BUILD.bazel b/psi/cryptor/BUILD.bazel index 4405fb5..644bba0 100644 --- a/psi/cryptor/BUILD.bazel +++ b/psi/cryptor/BUILD.bazel @@ -24,7 +24,7 @@ psi_cc_library( "//psi/proto:psi_cc_proto", "@com_google_absl//absl/types:span", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", "@yacl//yacl/utils:parallel", ], ) @@ -39,7 +39,7 @@ psi_cc_library( "@com_github_libsodium//:libsodium", "@com_github_openssl_openssl//:openssl", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", "@yacl//yacl/link", "@yacl//yacl/utils:parallel", ], @@ -97,8 +97,8 @@ psi_cc_library( ":fourq_cryptor", ":sm2_cryptor", ":sodium_curve25519_cryptor", - "//psi/proto:psi_v2_cc_proto", "//psi:prelude", + "//psi/proto:psi_v2_cc_proto", "@yacl//yacl/utils:platform_utils", ] + select({ "@platforms//cpu:x86_64": [ @@ -116,7 +116,7 @@ psi_cc_library( deps = [ "@com_github_openssl_openssl//:openssl", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", "@yacl//yacl/utils:parallel", ], ) @@ -148,7 +148,7 @@ psi_cc_test( srcs = ["sm2_cryptor_test.cc"], deps = [ ":sm2_cryptor", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", "@yacl//yacl/crypto/tools:prg", ], ) @@ -159,7 +159,7 @@ psi_cc_library( hdrs = ["hash_to_curve_elligator2.h"], deps = [ "@yacl//yacl/base:byte_container_view", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", "@yacl//yacl/math/mpint", ], ) diff --git a/psi/cryptor/ecc_cryptor.cc b/psi/cryptor/ecc_cryptor.cc index ec12389..ce4bda5 100644 --- a/psi/cryptor/ecc_cryptor.cc +++ b/psi/cryptor/ecc_cryptor.cc @@ -16,7 +16,7 @@ #include -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" namespace psi { diff --git a/psi/cryptor/ecc_utils.h b/psi/cryptor/ecc_utils.h index fe8ab2c..5e82f56 100644 --- a/psi/cryptor/ecc_utils.h +++ b/psi/cryptor/ecc_utils.h @@ -22,7 +22,7 @@ #include "openssl/bn.h" #include "openssl/ec.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" namespace psi { diff --git a/psi/cryptor/fourq_cryptor.cc b/psi/cryptor/fourq_cryptor.cc index 35d7fb4..4efa9ff 100644 --- a/psi/cryptor/fourq_cryptor.cc +++ b/psi/cryptor/fourq_cryptor.cc @@ -18,7 +18,7 @@ #include "apsi/fourq/FourQ_api.h" #include "apsi/fourq/FourQ_internal.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" namespace psi { diff --git a/psi/cryptor/hash_to_curve_elligator2.cc b/psi/cryptor/hash_to_curve_elligator2.cc index b22844e..c7e305c 100644 --- a/psi/cryptor/hash_to_curve_elligator2.cc +++ b/psi/cryptor/hash_to_curve_elligator2.cc @@ -21,7 +21,7 @@ #include "absl/strings/escaping.h" #include "spdlog/spdlog.h" -#include "yacl/crypto/base/hash/ssl_hash.h" +#include "yacl/crypto/hash/ssl_hash.h" #include "yacl/math/mpint/mp_int.h" namespace psi { diff --git a/psi/cryptor/sm2_cryptor.cc b/psi/cryptor/sm2_cryptor.cc index 4a39be4..56b3e3e 100644 --- a/psi/cryptor/sm2_cryptor.cc +++ b/psi/cryptor/sm2_cryptor.cc @@ -17,7 +17,7 @@ #include "absl/types/span.h" #include "openssl/bn.h" #include "openssl/ec.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" #include "psi/cryptor/ecc_utils.h" diff --git a/psi/cryptor/sm2_cryptor_test.cc b/psi/cryptor/sm2_cryptor_test.cc index aed99f3..9440318 100644 --- a/psi/cryptor/sm2_cryptor_test.cc +++ b/psi/cryptor/sm2_cryptor_test.cc @@ -20,7 +20,7 @@ #include "absl/strings/escaping.h" #include "gtest/gtest.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/crypto/tools/prg.h" namespace psi { diff --git a/psi/cryptor/sodium_curve25519_cryptor.cc b/psi/cryptor/sodium_curve25519_cryptor.cc index cd6687c..c93260a 100644 --- a/psi/cryptor/sodium_curve25519_cryptor.cc +++ b/psi/cryptor/sodium_curve25519_cryptor.cc @@ -20,7 +20,7 @@ extern "C" { #include -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" #include "psi/cryptor/hash_to_curve_elligator2.h" diff --git a/psi/ecdh/BUILD.bazel b/psi/ecdh/BUILD.bazel index c7418fe..29afb88 100644 --- a/psi/ecdh/BUILD.bazel +++ b/psi/ecdh/BUILD.bazel @@ -67,8 +67,8 @@ psi_cc_library( "@com_github_microsoft_apsi//:apsi", "@com_google_absl//absl/types:span", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/base/hash:blake3", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:blake3", + "@yacl//yacl/crypto/hash:hash_utils", "@yacl//yacl/utils:parallel", ], ) @@ -78,8 +78,8 @@ psi_cc_test( srcs = ["basic_ecdh_oprf_test.cc"], deps = [ ":ecdh_oprf_selector", + "@yacl//yacl/crypto/rand", "@yacl//yacl/crypto/tools:prg", - "@yacl//yacl/crypto/utils:rand", ], ) @@ -171,8 +171,8 @@ psi_cc_test( "//psi/utils:test_utils", "@boost//:uuid", "@com_google_absl//absl/time", + "@yacl//yacl/crypto/rand", "@yacl//yacl/crypto/tools:prg", - "@yacl//yacl/crypto/utils:rand", "@yacl//yacl/utils:scope_guard", ], ) diff --git a/psi/ecdh/basic_ecdh_oprf.cc b/psi/ecdh/basic_ecdh_oprf.cc index 397512a..b2850bd 100644 --- a/psi/ecdh/basic_ecdh_oprf.cc +++ b/psi/ecdh/basic_ecdh_oprf.cc @@ -20,8 +20,8 @@ #include "absl/strings/escaping.h" #include "apsi/fourq/FourQ_api.h" #include "apsi/fourq/FourQ_internal.h" -#include "yacl/crypto/base/hash/blake3.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/blake3.h" +#include "yacl/crypto/hash/hash_utils.h" #include "psi/cryptor/ecc_utils.h" diff --git a/psi/ecdh/basic_ecdh_oprf.h b/psi/ecdh/basic_ecdh_oprf.h index a5d2ce5..c5f84db 100644 --- a/psi/ecdh/basic_ecdh_oprf.h +++ b/psi/ecdh/basic_ecdh_oprf.h @@ -24,7 +24,7 @@ #include "openssl/rand.h" #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_interface.h" +#include "yacl/crypto/hash/hash_interface.h" #include "psi/cryptor/ecc_cryptor.h" #include "psi/cryptor/sm2_cryptor.h" diff --git a/psi/ecdh/basic_ecdh_oprf_test.cc b/psi/ecdh/basic_ecdh_oprf_test.cc index 093ad98..1b42f65 100644 --- a/psi/ecdh/basic_ecdh_oprf_test.cc +++ b/psi/ecdh/basic_ecdh_oprf_test.cc @@ -25,8 +25,8 @@ #include "gtest/gtest.h" #include "spdlog/spdlog.h" #include "yacl/base/exception.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" -#include "yacl/crypto/utils/rand.h" #include "psi/ecdh/ecdh_oprf_selector.h" diff --git a/psi/ecdh/ecdh_oprf_psi_test.cc b/psi/ecdh/ecdh_oprf_psi_test.cc index ec26aa1..c1e253c 100644 --- a/psi/ecdh/ecdh_oprf_psi_test.cc +++ b/psi/ecdh/ecdh_oprf_psi_test.cc @@ -29,8 +29,8 @@ #include "gtest/gtest.h" #include "spdlog/spdlog.h" #include "yacl/base/exception.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" -#include "yacl/crypto/utils/rand.h" #include "yacl/link/test_util.h" #include "yacl/utils/scope_guard.h" diff --git a/psi/ecdh/ecdh_psi.cc b/psi/ecdh/ecdh_psi.cc index 8cd9870..672ef94 100644 --- a/psi/ecdh/ecdh_psi.cc +++ b/psi/ecdh/ecdh_psi.cc @@ -20,7 +20,7 @@ #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" #include "yacl/utils/serialize.h" diff --git a/psi/kkrt/BUILD.bazel b/psi/kkrt/BUILD.bazel index 194ccf5..1b2c4c6 100644 --- a/psi/kkrt/BUILD.bazel +++ b/psi/kkrt/BUILD.bazel @@ -25,11 +25,11 @@ psi_cc_library( "//psi/utils:cuckoo_index", "//psi/utils:serialize", "@com_google_absl//absl/strings", - "@yacl//yacl/crypto/base/hash:hash_utils", - "@yacl//yacl/crypto/primitives/ot:base_ot", - "@yacl//yacl/crypto/primitives/ot:iknp_ote", - "@yacl//yacl/crypto/primitives/ot:kkrt_ote", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/hash:hash_utils", + "@yacl//yacl/crypto/rand", + "@yacl//yacl/kernels/algorithms:base_ot", + "@yacl//yacl/kernels/algorithms:iknp_ote", + "@yacl//yacl/kernels/algorithms:kkrt_ote", "@yacl//yacl/link", ], ) @@ -39,7 +39,7 @@ psi_cc_test( srcs = ["kkrt_psi_test.cc"], deps = [ ":kkrt_psi", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", ], ) diff --git a/psi/kkrt/kkrt_psi.cc b/psi/kkrt/kkrt_psi.cc index 9fd5913..50519ab 100644 --- a/psi/kkrt/kkrt_psi.cc +++ b/psi/kkrt/kkrt_psi.cc @@ -22,12 +22,12 @@ #include "openssl/rand.h" #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" -#include "yacl/crypto/primitives/ot/base_ot.h" -#include "yacl/crypto/primitives/ot/iknp_ote.h" -#include "yacl/crypto/primitives/ot/kkrt_ote.h" +#include "yacl/crypto/hash/hash_utils.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/kernels/algorithms/base_ot.h" +#include "yacl/kernels/algorithms/iknp_ote.h" +#include "yacl/kernels/algorithms/kkrt_ote.h" #include "psi/utils/communication.h" #include "psi/utils/cuckoo_index.h" diff --git a/psi/kkrt/kkrt_psi.h b/psi/kkrt/kkrt_psi.h index 160bf51..c97bf8d 100644 --- a/psi/kkrt/kkrt_psi.h +++ b/psi/kkrt/kkrt_psi.h @@ -21,7 +21,7 @@ #include #include -#include "yacl/crypto/primitives/ot/ot_store.h" +#include "yacl/kernels/algorithms/ot_store.h" #include "yacl/link/link.h" // diff --git a/psi/kkrt/kkrt_psi_benchmark.cc b/psi/kkrt/kkrt_psi_benchmark.cc index 52c8d29..3b0ab21 100644 --- a/psi/kkrt/kkrt_psi_benchmark.cc +++ b/psi/kkrt/kkrt_psi_benchmark.cc @@ -17,7 +17,7 @@ #include "benchmark/benchmark.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/link/test_util.h" #include "psi/kkrt/kkrt_psi.h" diff --git a/psi/kkrt/kkrt_psi_test.cc b/psi/kkrt/kkrt_psi_test.cc index 7522880..7e25c57 100644 --- a/psi/kkrt/kkrt_psi_test.cc +++ b/psi/kkrt/kkrt_psi_test.cc @@ -20,9 +20,9 @@ #include "gtest/gtest.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" -#include "yacl/crypto/utils/secparam.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/link/test_util.h" +#include "yacl/secparam.h" struct TestParams { std::vector items_a; diff --git a/psi/kkrt/receiver.cc b/psi/kkrt/receiver.cc index 76f3fac..0b8b75b 100644 --- a/psi/kkrt/receiver.cc +++ b/psi/kkrt/receiver.cc @@ -14,7 +14,7 @@ #include "psi/kkrt/receiver.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" #include "psi/kkrt/common.h" diff --git a/psi/kkrt/receiver.h b/psi/kkrt/receiver.h index e7e3e33..d2cd81d 100644 --- a/psi/kkrt/receiver.h +++ b/psi/kkrt/receiver.h @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "yacl/crypto/primitives/ot/ot_store.h" +#include "yacl/kernels/algorithms/ot_store.h" #include "psi/interface.h" #include "psi/utils/hash_bucket_cache.h" diff --git a/psi/kkrt/sender.cc b/psi/kkrt/sender.cc index f3e366c..ded6f93 100644 --- a/psi/kkrt/sender.cc +++ b/psi/kkrt/sender.cc @@ -18,7 +18,7 @@ #include #include -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" #include "psi/kkrt/common.h" diff --git a/psi/kkrt/sender.h b/psi/kkrt/sender.h index cbacb0d..5435373 100644 --- a/psi/kkrt/sender.h +++ b/psi/kkrt/sender.h @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "yacl/crypto/primitives/ot/ot_store.h" +#include "yacl/kernels/algorithms/ot_store.h" #include "psi/interface.h" #include "psi/utils/hash_bucket_cache.h" diff --git a/psi/legacy/bucket_psi.cc b/psi/legacy/bucket_psi.cc index 0d09d52..9f89c5c 100644 --- a/psi/legacy/bucket_psi.cc +++ b/psi/legacy/bucket_psi.cc @@ -30,8 +30,8 @@ #include "absl/synchronization/notification.h" #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/hash/hash_utils.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/utils/serialize.h" #include "psi/cryptor/cryptor_selector.h" diff --git a/psi/legacy/bucket_psi_test.cc b/psi/legacy/bucket_psi_test.cc index 7d27692..502330d 100644 --- a/psi/legacy/bucket_psi_test.cc +++ b/psi/legacy/bucket_psi_test.cc @@ -20,7 +20,7 @@ #include "absl/strings/escaping.h" #include "gtest/gtest.h" #include "spdlog/spdlog.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/link/test_util.h" #include "psi/utils/io.h" diff --git a/psi/legacy/bucket_ub_psi.cc b/psi/legacy/bucket_ub_psi.cc index 8a3147d..70c790f 100644 --- a/psi/legacy/bucket_ub_psi.cc +++ b/psi/legacy/bucket_ub_psi.cc @@ -17,7 +17,7 @@ #include #include -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/utils/scope_guard.h" #include "psi/prelude.h" diff --git a/psi/legacy/bucket_ub_psi_test.cc b/psi/legacy/bucket_ub_psi_test.cc index 6669e3d..26e153c 100644 --- a/psi/legacy/bucket_ub_psi_test.cc +++ b/psi/legacy/bucket_ub_psi_test.cc @@ -18,7 +18,7 @@ #include "absl/strings/escaping.h" #include "gtest/gtest.h" #include "spdlog/spdlog.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/link/test_util.h" #include "yacl/utils/scope_guard.h" diff --git a/psi/legacy/dp_psi/BUILD.bazel b/psi/legacy/dp_psi/BUILD.bazel index f78e704..60b9981 100644 --- a/psi/legacy/dp_psi/BUILD.bazel +++ b/psi/legacy/dp_psi/BUILD.bazel @@ -44,7 +44,7 @@ psi_cc_library( "//psi/utils:serialize", "@com_google_absl//absl/strings", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/rand", "@yacl//yacl/link", "@yacl//yacl/utils:parallel", ], diff --git a/psi/legacy/dp_psi/dp_psi.cc b/psi/legacy/dp_psi/dp_psi.cc index 782b06d..d39e311 100644 --- a/psi/legacy/dp_psi/dp_psi.cc +++ b/psi/legacy/dp_psi/dp_psi.cc @@ -21,7 +21,7 @@ #include "spdlog/spdlog.h" #include "yacl/base/buffer.h" #include "yacl/base/exception.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/utils/parallel.h" #include "psi/cryptor/cryptor_selector.h" diff --git a/psi/legacy/dp_psi/dp_psi_payload_benchmark.cc b/psi/legacy/dp_psi/dp_psi_payload_benchmark.cc index a3e3adf..e132f3f 100644 --- a/psi/legacy/dp_psi/dp_psi_payload_benchmark.cc +++ b/psi/legacy/dp_psi/dp_psi_payload_benchmark.cc @@ -23,7 +23,7 @@ #include "absl/strings/str_split.h" #include "benchmark/benchmark.h" #include "spdlog/spdlog.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/link/test_util.h" #include "psi/legacy/dp_psi/dp_psi.h" diff --git a/psi/legacy/kkrt_2party_psi.cc b/psi/legacy/kkrt_2party_psi.cc index a0d04c5..8072982 100644 --- a/psi/legacy/kkrt_2party_psi.cc +++ b/psi/legacy/kkrt_2party_psi.cc @@ -16,7 +16,7 @@ #include -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" #include "psi/kkrt/kkrt_psi.h" diff --git a/psi/legacy/mini_psi/BUILD.bazel b/psi/legacy/mini_psi/BUILD.bazel index 8fa5903..90e5505 100644 --- a/psi/legacy/mini_psi/BUILD.bazel +++ b/psi/legacy/mini_psi/BUILD.bazel @@ -55,7 +55,7 @@ psi_cc_library( "@com_github_floodyberry_curve25519_donna//:curve25519_donna", "@com_google_absl//absl/strings", "@com_google_googletest//:gtest", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", "@yacl//yacl/crypto/tools:prg", "@yacl//yacl/link", "@yacl//yacl/utils:parallel", diff --git a/psi/legacy/mini_psi/mini_psi.cc b/psi/legacy/mini_psi/mini_psi.cc index 6e21347..66ad98e 100644 --- a/psi/legacy/mini_psi/mini_psi.cc +++ b/psi/legacy/mini_psi/mini_psi.cc @@ -32,8 +32,8 @@ extern "C" { } #include "yacl/base/exception.h" -#include "yacl/crypto/base/block_cipher/symmetric_crypto.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/block_cipher/symmetric_crypto.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/crypto/tools/prg.h" #include "yacl/utils/parallel.h" diff --git a/psi/legacy/nparty_psi.cc b/psi/legacy/nparty_psi.cc index 60c6c20..5a3689c 100644 --- a/psi/legacy/nparty_psi.cc +++ b/psi/legacy/nparty_psi.cc @@ -22,7 +22,7 @@ #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" #include "psi/legacy/factory.h" diff --git a/psi/legacy/rr22_2party_psi.cc b/psi/legacy/rr22_2party_psi.cc index edb13d1..260d6da 100644 --- a/psi/legacy/rr22_2party_psi.cc +++ b/psi/legacy/rr22_2party_psi.cc @@ -17,7 +17,7 @@ #include #include "omp.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" #include "psi/legacy/factory.h" diff --git a/psi/rr22/BUILD.bazel b/psi/rr22/BUILD.bazel index 2e864a4..a2f3814 100644 --- a/psi/rr22/BUILD.bazel +++ b/psi/rr22/BUILD.bazel @@ -23,8 +23,8 @@ psi_cc_library( hdrs = ["davis_meyer_hash.h"], copts = AES_COPT_FLAGS, deps = [ - "@yacl//yacl/crypto/base/aes:aes_opt", - "@yacl//yacl/crypto/base/block_cipher:symmetric_crypto", + "@yacl//yacl/crypto/aes:aes_opt", + "@yacl//yacl/crypto/block_cipher:symmetric_crypto", "@yacl//yacl/utils:platform_utils", ], ) @@ -34,8 +34,8 @@ psi_cc_test( srcs = ["davis_meyer_hash_test.cc"], deps = [ ":davis_meyer_hash", + "@yacl//yacl/crypto/rand", "@yacl//yacl/crypto/tools:prg", - "@yacl//yacl/crypto/utils:rand", ], ) @@ -48,10 +48,10 @@ psi_cc_library( "//psi/rr22/okvs:aes_crhash", "//psi/rr22/okvs:baxos", "@yacl//yacl/base:buffer", - "@yacl//yacl/crypto/primitives/vole:silent_vole", + "@yacl//yacl/crypto/rand", "@yacl//yacl/crypto/tools:prg", "@yacl//yacl/crypto/tools:ro", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/kernels/algorithms:silent_vole", "@yacl//yacl/link", "@yacl//yacl/math/f2k", "@yacl//yacl/utils:parallel", @@ -105,7 +105,7 @@ psi_cc_test( srcs = ["rr22_psi_test.cc"], deps = [ ":rr22_psi", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/rand", ], ) @@ -116,7 +116,7 @@ psi_cc_binary( ":rr22_psi", "//psi/utils:test_utils", "@com_github_google_benchmark//:benchmark_main", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/rand", ], ) diff --git a/psi/rr22/davis_meyer_hash.cc b/psi/rr22/davis_meyer_hash.cc index dd28bb6..919a894 100644 --- a/psi/rr22/davis_meyer_hash.cc +++ b/psi/rr22/davis_meyer_hash.cc @@ -14,8 +14,8 @@ #include "psi/rr22/davis_meyer_hash.h" -#include "yacl/crypto/base/aes/aes_opt.h" -#include "yacl/crypto/base/block_cipher/symmetric_crypto.h" +#include "yacl/crypto/aes/aes_opt.h" +#include "yacl/crypto/block_cipher/symmetric_crypto.h" #include "yacl/utils/platform_utils.h" namespace psi::rr22 { diff --git a/psi/rr22/davis_meyer_hash_test.cc b/psi/rr22/davis_meyer_hash_test.cc index 818e259..f601501 100644 --- a/psi/rr22/davis_meyer_hash_test.cc +++ b/psi/rr22/davis_meyer_hash_test.cc @@ -16,8 +16,8 @@ #include "gtest/gtest.h" #include "spdlog/spdlog.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" -#include "yacl/crypto/utils/rand.h" namespace psi::rr22 { diff --git a/psi/rr22/okvs/BUILD.bazel b/psi/rr22/okvs/BUILD.bazel index 543493d..d8f7bbe 100644 --- a/psi/rr22/okvs/BUILD.bazel +++ b/psi/rr22/okvs/BUILD.bazel @@ -36,8 +36,8 @@ psi_cc_test( deps = [ ":baxos", "@com_google_absl//absl/strings", + "@yacl//yacl/crypto/rand", "@yacl//yacl/crypto/tools:prg", - "@yacl//yacl/crypto/utils:rand", ], ) @@ -61,8 +61,8 @@ psi_cc_test( deps = [ ":paxos", "@com_google_absl//absl/strings", + "@yacl//yacl/crypto/rand", "@yacl//yacl/crypto/tools:prg", - "@yacl//yacl/crypto/utils:rand", ], ) @@ -89,7 +89,7 @@ psi_cc_test( srcs = ["paxos_hash_test.cc"], deps = [ ":paxos_hash", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/rand", ], ) @@ -109,7 +109,7 @@ psi_cc_library( srcs = ["aes_crhash.cc"], hdrs = ["aes_crhash.h"], deps = [ - "@yacl//yacl/crypto/base/block_cipher:symmetric_crypto", + "@yacl//yacl/crypto/block_cipher:symmetric_crypto", "@yacl//yacl/utils:parallel", ], ) @@ -150,8 +150,8 @@ psi_cc_test( deps = [ ":galois128", "@com_google_absl//absl/strings", + "@yacl//yacl/crypto/rand", "@yacl//yacl/crypto/tools:prg", - "@yacl//yacl/crypto/utils:rand", ], ) diff --git a/psi/rr22/okvs/aes_crhash.h b/psi/rr22/okvs/aes_crhash.h index baa0792..5319a45 100644 --- a/psi/rr22/okvs/aes_crhash.h +++ b/psi/rr22/okvs/aes_crhash.h @@ -16,7 +16,7 @@ #include "yacl/base/byte_container_view.h" #include "yacl/base/int128.h" -#include "yacl/crypto/base/block_cipher/symmetric_crypto.h" +#include "yacl/crypto/block_cipher/symmetric_crypto.h" // Correlation robust hash function. // H(x) = AES(x) + x. diff --git a/psi/rr22/okvs/baxos_test.cc b/psi/rr22/okvs/baxos_test.cc index ae28aa5..2b4ad37 100644 --- a/psi/rr22/okvs/baxos_test.cc +++ b/psi/rr22/okvs/baxos_test.cc @@ -19,8 +19,8 @@ #include "gtest/gtest.h" #include "spdlog/spdlog.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" -#include "yacl/crypto/utils/rand.h" namespace psi::rr22::okvs { diff --git a/psi/rr22/okvs/galois128_test.cc b/psi/rr22/okvs/galois128_test.cc index 074d711..04e78a9 100644 --- a/psi/rr22/okvs/galois128_test.cc +++ b/psi/rr22/okvs/galois128_test.cc @@ -20,8 +20,8 @@ #include "gtest/gtest.h" #include "openssl/modes.h" #include "spdlog/spdlog.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" -#include "yacl/crypto/utils/rand.h" namespace psi::rr22::okvs { diff --git a/psi/rr22/okvs/paxos_hash_test.cc b/psi/rr22/okvs/paxos_hash_test.cc index ee40c0a..b109cb8 100644 --- a/psi/rr22/okvs/paxos_hash_test.cc +++ b/psi/rr22/okvs/paxos_hash_test.cc @@ -16,8 +16,8 @@ #include "gtest/gtest.h" #include "spdlog/spdlog.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" -#include "yacl/crypto/utils/rand.h" namespace psi::rr22::okvs { diff --git a/psi/rr22/receiver.cc b/psi/rr22/receiver.cc index 73a7643..5a8e2c1 100644 --- a/psi/rr22/receiver.cc +++ b/psi/rr22/receiver.cc @@ -14,8 +14,8 @@ #include "psi/rr22/receiver.h" -#include "yacl/crypto/base/hash/hash_utils.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/hash/hash_utils.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/utils/parallel.h" #include "psi/legacy/bucket_psi.h" diff --git a/psi/rr22/rr22_oprf.cc b/psi/rr22/rr22_oprf.cc index d02bd16..04acbf9 100644 --- a/psi/rr22/rr22_oprf.cc +++ b/psi/rr22/rr22_oprf.cc @@ -21,9 +21,9 @@ #include "spdlog/spdlog.h" #include "yacl/base/buffer.h" #include "yacl/base/byte_container_view.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" #include "yacl/crypto/tools/ro.h" -#include "yacl/crypto/utils/rand.h" #include "yacl/math/f2k/f2k.h" #include "yacl/utils/parallel.h" diff --git a/psi/rr22/rr22_oprf.h b/psi/rr22/rr22_oprf.h index 201416f..c2b5af7 100644 --- a/psi/rr22/rr22_oprf.h +++ b/psi/rr22/rr22_oprf.h @@ -18,7 +18,7 @@ #include #include "yacl/base/int128.h" -#include "yacl/crypto/primitives/vole/silent_vole.h" +#include "yacl/kernels/algorithms/silent_vole.h" #include "yacl/link/context.h" #include "psi/rr22/okvs/baxos.h" diff --git a/psi/rr22/rr22_psi_benchmark.cc b/psi/rr22/rr22_psi_benchmark.cc index 4c273d0..878d5cb 100644 --- a/psi/rr22/rr22_psi_benchmark.cc +++ b/psi/rr22/rr22_psi_benchmark.cc @@ -21,8 +21,8 @@ #include "absl/strings/str_split.h" #include "benchmark/benchmark.h" #include "spdlog/spdlog.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" -#include "yacl/crypto/utils/rand.h" #include "yacl/link/context.h" #include "yacl/link/test_util.h" diff --git a/psi/rr22/rr22_psi_test.cc b/psi/rr22/rr22_psi_test.cc index 6c12ba9..664b914 100644 --- a/psi/rr22/rr22_psi_test.cc +++ b/psi/rr22/rr22_psi_test.cc @@ -19,8 +19,8 @@ #include "gtest/gtest.h" #include "spdlog/spdlog.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" -#include "yacl/crypto/utils/rand.h" #include "yacl/link/test_util.h" namespace psi::rr22 { diff --git a/psi/rr22/sender.cc b/psi/rr22/sender.cc index 8ad7ab9..47b0507 100644 --- a/psi/rr22/sender.cc +++ b/psi/rr22/sender.cc @@ -14,7 +14,7 @@ #include "psi/rr22/sender.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/parallel.h" #include "psi/legacy/bucket_psi.h" diff --git a/psi/seal_pir/BUILD.bazel b/psi/seal_pir/BUILD.bazel index 1f65800..3638ee5 100644 --- a/psi/seal_pir/BUILD.bazel +++ b/psi/seal_pir/BUILD.bazel @@ -53,7 +53,7 @@ psi_cc_library( deps = [ ":seal_pir", "//psi/utils:cuckoo_index", - "@yacl//yacl/crypto/base/block_cipher:symmetric_crypto", + "@yacl//yacl/crypto/block_cipher:symmetric_crypto", ], ) diff --git a/psi/seal_pir/seal_mpir.h b/psi/seal_pir/seal_mpir.h index bbabf9a..8afd736 100644 --- a/psi/seal_pir/seal_mpir.h +++ b/psi/seal_pir/seal_mpir.h @@ -20,7 +20,7 @@ #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/block_cipher/symmetric_crypto.h" +#include "yacl/crypto/block_cipher/symmetric_crypto.h" #include "yacl/utils/parallel.h" #include "psi/seal_pir/seal_pir.h" diff --git a/psi/utils/BUILD.bazel b/psi/utils/BUILD.bazel index 62ba621..c3605b8 100644 --- a/psi/utils/BUILD.bazel +++ b/psi/utils/BUILD.bazel @@ -61,7 +61,7 @@ psi_cc_library( "@com_google_absl//absl/time", "@org_apache_arrow//:arrow", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", "@yacl//yacl/utils:scope_guard", ], ) @@ -126,7 +126,7 @@ psi_cc_library( ":key", "@com_google_absl//absl/strings", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/rand", ], ) @@ -148,7 +148,7 @@ psi_cc_library( ], deps = [ "//psi/proto:psi_cc_proto", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", ], ) @@ -202,7 +202,7 @@ psi_cc_test( ":ub_psi_cache", "@boost//:uuid", "@com_google_absl//absl/time", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/rand", "@yacl//yacl/utils:scope_guard", ], ) @@ -413,6 +413,6 @@ psi_cc_test( srcs = ["cuckoo_index_test.cc"], deps = [ ":cuckoo_index", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/rand", ], ) diff --git a/psi/utils/batch_provider.cc b/psi/utils/batch_provider.cc index 4d0400e..42c8c9d 100644 --- a/psi/utils/batch_provider.cc +++ b/psi/utils/batch_provider.cc @@ -24,7 +24,7 @@ #include "absl/strings/string_view.h" #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "psi/utils/key.h" diff --git a/psi/utils/csv_checker.cc b/psi/utils/csv_checker.cc index 8136b8e..80060f5 100644 --- a/psi/utils/csv_checker.cc +++ b/psi/utils/csv_checker.cc @@ -34,7 +34,7 @@ #include "boost/uuid/uuid_io.hpp" #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/scope_guard.h" #include "psi/utils/io.h" diff --git a/psi/utils/cuckoo_index_test.cc b/psi/utils/cuckoo_index_test.cc index e4501f0..dabd131 100644 --- a/psi/utils/cuckoo_index_test.cc +++ b/psi/utils/cuckoo_index_test.cc @@ -18,7 +18,7 @@ #include #include "gtest/gtest.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" namespace psi { diff --git a/psi/utils/test_utils.h b/psi/utils/test_utils.h index 3065a78..daebc9f 100644 --- a/psi/utils/test_utils.h +++ b/psi/utils/test_utils.h @@ -19,7 +19,7 @@ #include #include -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "psi/proto/psi.pb.h" diff --git a/psi/utils/ub_psi_cache_test.cc b/psi/utils/ub_psi_cache_test.cc index 0521d2d..48bceae 100644 --- a/psi/utils/ub_psi_cache_test.cc +++ b/psi/utils/ub_psi_cache_test.cc @@ -24,7 +24,7 @@ #include "boost/uuid/uuid_generators.hpp" #include "boost/uuid/uuid_io.hpp" #include "gtest/gtest.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/utils/scope_guard.h" namespace psi { diff --git a/psi/version.h b/psi/version.h index 2444111..0fb5179 100644 --- a/psi/version.h +++ b/psi/version.h @@ -15,6 +15,6 @@ #pragma once #define PSI_VERSION_MAJOR 0 -#define PSI_VERSION_MINOR 3 +#define PSI_VERSION_MINOR 4 #define PSI_VERSION_PATCH 0 -#define PSI_DEV_IDENTIFIER "beta" +#define PSI_DEV_IDENTIFIER ".dev240329"