Internal change.

dpf-team-bot · dpf-team-bot · commit 66746db2fe09 · 2025-12-22T14:32:51.000-08:00
PiperOrigin-RevId: 614866592
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -22,7 +22,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_cc",
-    version = "0.1.1",
+    version = "0.1.5",
 )
 bazel_dep(
     name = "protobuf",
diff --git a/dcf/BUILD b/dcf/BUILD
@@ -14,6 +14,8 @@
 
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
diff --git a/dcf/fss_gates/BUILD b/dcf/fss_gates/BUILD
@@ -19,6 +19,8 @@
 
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
diff --git a/dcf/fss_gates/prng/BUILD b/dcf/fss_gates/prng/BUILD
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 package(
     default_visibility = ["//:__subpackages__"],
diff --git a/dpf/BUILD b/dpf/BUILD
@@ -14,6 +14,8 @@
 
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
diff --git a/dpf/internal/BUILD b/dpf/internal/BUILD
@@ -14,6 +14,8 @@
 
 load("@com_github_google_iree//build_tools/embed_data:build_defs.bzl", "cc_embed_data")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 package(
     default_visibility = ["//:__subpackages__"],
diff --git a/experiments/BUILD b/experiments/BUILD
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 
 package(
     default_visibility = ["//visibility:private"],
diff --git a/pir/BUILD b/pir/BUILD
@@ -15,6 +15,8 @@
 load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
diff --git a/pir/cuckoo_hashed_dpf_pir_database_test.cc b/pir/cuckoo_hashed_dpf_pir_database_test.cc
@@ -164,7 +164,7 @@ TEST_F(CuckooHashedDpfPirDatabaseBuilderTest,
 TEST_F(CuckooHashedDpfPirDatabaseBuilderTest, BuildsEmptyDatabase) {
   EXPECT_THAT(
       builder_.Build(),
-      IsOkAndHolds(Truly([](auto &db) -> bool { return db->size() == 0; })));
+      IsOkAndHolds(Truly([](auto& db) -> bool { return db->size() == 0; })));
 }
 
 TEST_F(CuckooHashedDpfPirDatabaseBuilderTest, FailsToBuildWithEmptyKey) {
diff --git a/pir/hashing/BUILD b/pir/hashing/BUILD
@@ -15,6 +15,8 @@
 load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
diff --git a/pir/internal/BUILD b/pir/internal/BUILD
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 package(
     default_visibility = ["//:__subpackages__"],
diff --git a/pir/prng/BUILD b/pir/prng/BUILD
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 package(
     default_visibility = ["//visibility:public"],
diff --git a/pir/testing/BUILD b/pir/testing/BUILD
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 package(
     default_testonly = True,
@@ -98,16 +100,14 @@ cc_library(
         "//pir/testing/data:embedded_public_key",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/log:absl_check",
-        "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@tink_cc//tink:cleartext_keyset_handle_testonly",
         "@tink_cc//tink:hybrid_decrypt",
         "@tink_cc//tink:hybrid_encrypt",
         "@tink_cc//tink:keyset_handle",
         "@tink_cc//tink:keyset_reader",
-        "@tink_cc//tink/hybrid:hybrid_config",
+        "@tink_cc//tink/hybrid:config_v0",
         "@tink_cc//tink/json:json_keyset_reader",
     ],
 )
diff --git a/pir/testing/encrypt_decrypt.cc b/pir/testing/encrypt_decrypt.cc
@@ -19,15 +19,15 @@
 
 #include "absl/base/attributes.h"
 #include "absl/base/call_once.h"
-#include "absl/log/absl_check.h"
-#include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "dpf/status_macros.h"
 #include "pir/testing/data/embedded_private_key.h"
 #include "pir/testing/data/embedded_public_key.h"
 #include "tink/cleartext_keyset_handle.h"
-#include "tink/hybrid/hybrid_config.h"
+#include "tink/hybrid/config_v0.h"
+#include "tink/hybrid_decrypt.h"
+#include "tink/hybrid_encrypt.h"
 #include "tink/json/json_keyset_reader.h"
 #include "tink/keyset_handle.h"
 #include "tink/keyset_reader.h"
@@ -45,10 +45,6 @@ using ::crypto::tink::KeysetReader;
 absl::once_flag register_tink_once ABSL_ATTRIBUTE_UNUSED;
 
 absl::StatusOr<std::unique_ptr<HybridDecrypt>> CreateFakeHybridDecrypt() {
-  absl::call_once(register_tink_once, []() {
-    ABSL_CHECK_OK(crypto::tink::HybridConfig::Register());
-  });
-
   const auto* const toc = embedded_private_key_create();
   absl::string_view private_key_json(toc->data, toc->size);
 
@@ -59,14 +55,11 @@ absl::StatusOr<std::unique_ptr<HybridDecrypt>> CreateFakeHybridDecrypt() {
       std::unique_ptr<KeysetHandle> private_key_handle,
       CleartextKeysetHandle::Read(std::move(private_key_reader)));
 
-  return private_key_handle->GetPrimitive<HybridDecrypt>();
+  return private_key_handle->GetPrimitive<HybridDecrypt>(
+      crypto::tink::ConfigHybridV0());
 }
 
 absl::StatusOr<std::unique_ptr<HybridEncrypt>> CreateFakeHybridEncrypt() {
-  absl::call_once(register_tink_once, []() {
-    ABSL_CHECK_OK(crypto::tink::HybridConfig::Register());
-  });
-
   const auto* const toc = embedded_public_key_create();
   absl::string_view public_key_json(toc->data, toc->size);
 
@@ -77,7 +70,8 @@ absl::StatusOr<std::unique_ptr<HybridEncrypt>> CreateFakeHybridEncrypt() {
       std::unique_ptr<KeysetHandle> public_key_handle,
       CleartextKeysetHandle::Read(std::move(public_key_reader)));
 
-  return public_key_handle->GetPrimitive<HybridEncrypt>();
+  return public_key_handle->GetPrimitive<HybridEncrypt>(
+      crypto::tink::ConfigHybridV0());
 }
 
 }  // namespace pir_testing

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ bazel_dep(`
`22`	`22`	`)`
`23`	`23`	`bazel_dep(`
`24`	`24`	`name = "rules_cc",`
`25`		`- version = "0.1.1",`
	`25`	`+ version = "0.1.5",`
`26`	`26`	`)`
`27`	`27`	`bazel_dep(`
`28`	`28`	`name = "protobuf",`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ TEST_F(CuckooHashedDpfPirDatabaseBuilderTest,`
`164`	`164`	`TEST_F(CuckooHashedDpfPirDatabaseBuilderTest, BuildsEmptyDatabase) {`
`165`	`165`	`EXPECT_THAT(`
`166`	`166`	`builder_.Build(),`
`167`		`- IsOkAndHolds(Truly([](auto &db) -> bool { return db->size() == 0; })));`
	`167`	`+ IsOkAndHolds(Truly([](auto& db) -> bool { return db->size() == 0; })));`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`TEST_F(CuckooHashedDpfPirDatabaseBuilderTest, FailsToBuildWithEmptyKey) {`