Migrate from crypto::tink::PrimitiveSet to crypto::tink::internal::PrimitiveSet in cc/kem/internal. PiperOrigin-RevId: 979843575 Change-Id: I8aa196d438f111058b246b94f5ac74bee395e119
diff --git a/tink/kem/internal/BUILD.bazel b/tink/kem/internal/BUILD.bazel index 76d06ae..02a1640 100644 --- a/tink/kem/internal/BUILD.bazel +++ b/tink/kem/internal/BUILD.bazel
@@ -35,10 +35,10 @@ "//proto:tink_cc_proto", "//tink:crypto_format", "//tink:keyset_handle", - "//tink:primitive_set", "//tink:primitive_wrapper", "//tink/internal:monitoring", "//tink/internal:monitoring_util", + "//tink/internal:primitive_set", "//tink/internal:registry_impl", "//tink/kem:kem_decapsulate", "//tink/util:status", @@ -59,7 +59,6 @@ ":kem_encapsulate_wrapper", "//tink:aead", "//tink:keyset_handle", - "//tink:primitive_set", "//tink:registry", "//tink/aead:aead_config", "//tink/aead:aes_gcm_parameters", @@ -71,6 +70,7 @@ "//tink/experimental/pqcrypto/kem/internal:ml_kem_test_util", "//tink/internal:monitoring", "//tink/internal:monitoring_client_mocks", + "//tink/internal:primitive_set", "//tink/internal:registry_impl", "//tink/kem:kem_decapsulate", "//tink/kem:kem_encapsulate", @@ -94,10 +94,10 @@ include_prefix = "tink/kem/internal", deps = [ "//proto:tink_cc_proto", - "//tink:primitive_set", "//tink:primitive_wrapper", "//tink/internal:monitoring", "//tink/internal:monitoring_util", + "//tink/internal:primitive_set", "//tink/internal:registry_impl", "//tink/kem:kem_encapsulate", "//tink/util:status", @@ -114,7 +114,6 @@ srcs = ["kem_encapsulate_wrapper_test.cc"], deps = [ ":kem_encapsulate_wrapper", - "//tink:primitive_set", "//tink:registry", "//tink/aead:aead_config", "//tink/aead:aes_gcm_parameters", @@ -124,6 +123,7 @@ "//tink/experimental/pqcrypto/kem/internal:ml_kem_test_util", "//tink/internal:monitoring", "//tink/internal:monitoring_client_mocks", + "//tink/internal:primitive_set", "//tink/internal:registry_impl", "//tink/kem:kem_encapsulate", "//tink/util:statusor",
diff --git a/tink/kem/internal/CMakeLists.txt b/tink/kem/internal/CMakeLists.txt index 9609604..850966a 100644 --- a/tink/kem/internal/CMakeLists.txt +++ b/tink/kem/internal/CMakeLists.txt
@@ -30,10 +30,10 @@ absl::string_view tink::core::crypto_format tink::core::keyset_handle - tink::core::primitive_set tink::core::primitive_wrapper tink::internal::monitoring tink::internal::monitoring_util + tink::internal::primitive_set tink::internal::registry_impl tink::kem::kem_decapsulate tink::util::status @@ -59,7 +59,6 @@ crypto tink::core::aead tink::core::keyset_handle - tink::core::primitive_set tink::core::registry tink::aead::aead_config tink::aead::aes_gcm_parameters @@ -71,6 +70,7 @@ tink::experimental::pqcrypto::kem::internal::ml_kem_test_util tink::internal::monitoring tink::internal::monitoring_client_mocks + tink::internal::primitive_set tink::internal::registry_impl tink::kem::kem_decapsulate tink::kem::kem_encapsulate @@ -87,10 +87,10 @@ absl::memory absl::status absl::string_view - tink::core::primitive_set tink::core::primitive_wrapper tink::internal::monitoring tink::internal::monitoring_util + tink::internal::primitive_set tink::internal::registry_impl tink::kem::kem_encapsulate tink::util::status @@ -111,7 +111,6 @@ absl::status_matchers absl::optional crypto - tink::core::primitive_set tink::core::registry tink::aead::aead_config tink::aead::aes_gcm_parameters @@ -121,6 +120,7 @@ tink::experimental::pqcrypto::kem::internal::ml_kem_test_util tink::internal::monitoring tink::internal::monitoring_client_mocks + tink::internal::primitive_set tink::internal::registry_impl tink::kem::kem_encapsulate tink::util::statusor
diff --git a/tink/kem/internal/kem_decapsulate_wrapper.cc b/tink/kem/internal/kem_decapsulate_wrapper.cc index a866cce..c88b24f 100644 --- a/tink/kem/internal/kem_decapsulate_wrapper.cc +++ b/tink/kem/internal/kem_decapsulate_wrapper.cc
@@ -31,7 +31,7 @@ #include "tink/internal/registry_impl.h" #include "tink/kem/kem_decapsulate.h" #include "tink/keyset_handle.h" -#include "tink/primitive_set.h" +#include "tink/internal/primitive_set.h" #include "tink/util/status.h" #include "tink/util/statusor.h"
diff --git a/tink/kem/internal/kem_decapsulate_wrapper.h b/tink/kem/internal/kem_decapsulate_wrapper.h index f4aa8ed..675c01e 100644 --- a/tink/kem/internal/kem_decapsulate_wrapper.h +++ b/tink/kem/internal/kem_decapsulate_wrapper.h
@@ -20,7 +20,7 @@ #include <memory> #include "tink/kem/kem_decapsulate.h" -#include "tink/primitive_set.h" +#include "tink/internal/primitive_set.h" #include "tink/primitive_wrapper.h" #include "tink/util/statusor.h" #include "proto/tink.pb.h"
diff --git a/tink/kem/internal/kem_decapsulate_wrapper_test.cc b/tink/kem/internal/kem_decapsulate_wrapper_test.cc index 7f8d615..8ad6b15 100644 --- a/tink/kem/internal/kem_decapsulate_wrapper_test.cc +++ b/tink/kem/internal/kem_decapsulate_wrapper_test.cc
@@ -47,7 +47,7 @@ #include "tink/kem/kem_decapsulate.h" #include "tink/kem/kem_encapsulate.h" #include "tink/keyset_handle.h" -#include "tink/primitive_set.h" +#include "tink/internal/primitive_set.h" #include "tink/registry.h" #include "tink/util/test_util.h"
diff --git a/tink/kem/internal/kem_encapsulate_wrapper.cc b/tink/kem/internal/kem_encapsulate_wrapper.cc index 9cf3837..4e3cba8 100644 --- a/tink/kem/internal/kem_encapsulate_wrapper.cc +++ b/tink/kem/internal/kem_encapsulate_wrapper.cc
@@ -28,7 +28,7 @@ #include "tink/internal/monitoring_util.h" #include "tink/internal/registry_impl.h" #include "tink/kem/kem_encapsulate.h" -#include "tink/primitive_set.h" +#include "tink/internal/primitive_set.h" #include "tink/util/status.h" #include "tink/util/statusor.h"
diff --git a/tink/kem/internal/kem_encapsulate_wrapper.h b/tink/kem/internal/kem_encapsulate_wrapper.h index 69249b4..51a7b53 100644 --- a/tink/kem/internal/kem_encapsulate_wrapper.h +++ b/tink/kem/internal/kem_encapsulate_wrapper.h
@@ -20,7 +20,7 @@ #include <memory> #include "tink/kem/kem_encapsulate.h" -#include "tink/primitive_set.h" +#include "tink/internal/primitive_set.h" #include "tink/primitive_wrapper.h" #include "tink/util/statusor.h" #include "proto/tink.pb.h"
diff --git a/tink/kem/internal/kem_encapsulate_wrapper_test.cc b/tink/kem/internal/kem_encapsulate_wrapper_test.cc index ad64721..6d2ff29 100644 --- a/tink/kem/internal/kem_encapsulate_wrapper_test.cc +++ b/tink/kem/internal/kem_encapsulate_wrapper_test.cc
@@ -39,7 +39,7 @@ #include "tink/internal/monitoring_client_mocks.h" #include "tink/internal/registry_impl.h" #include "tink/kem/kem_encapsulate.h" -#include "tink/primitive_set.h" +#include "tink/internal/primitive_set.h" #include "tink/registry.h" #include "tink/util/statusor.h" #include "tink/util/test_matchers.h"