Internal change.

PiperOrigin-RevId: 631403624
Change-Id: I0c437179c90352f863092baf53510f08b9b77a6c

tink/BUILD.bazel

diff --git a/tink/BUILD.bazel b/tink/BUILD.bazel
index fc5c062..76dd681 100644
--- a/tink/BUILD.bazel
+++ b/tink/BUILD.bazel
@@ -880,12 +880,14 @@
     size = "small",
     srcs = ["core/binary_keyset_writer_test.cc"],
     deps = [
+        ":aead",
         ":binary_keyset_writer",
         ":insecure_secret_key_access",
+        ":keyset_handle",
         ":proto_keyset_format",
-        ":tink_cc",
         "//proto:tink_cc_proto",
         "//tink/aead:aead_config",
+        "//tink/aead:aead_key_templates",
         "//tink/config:global_registry",
         "//tink/util:secret_data",
         "//tink/util:statusor",
@@ -952,20 +954,24 @@
     size = "small",
     srcs = ["core/keyset_handle_test.cc"],
     deps = [
+        ":aead",
         ":binary_keyset_reader",
+        ":binary_keyset_writer",
         ":cleartext_keyset_handle",
         ":configuration",
         ":core/key_manager_impl",
         ":core/key_type_manager",
         ":core/template_util",
+        ":input_stream",
         ":json_keyset_reader",
         ":json_keyset_writer",
         ":key_gen_configuration",
         ":key_status",
         ":keyset_handle",
+        ":keyset_reader",
         ":primitive_set",
         ":primitive_wrapper",
-        ":tink_cc",
+        ":registry",
         "//proto:aes_gcm_cc_proto",
         "//proto:aes_gcm_siv_cc_proto",
         "//proto:ecdsa_cc_proto",

tink/CMakeLists.txt

diff --git a/tink/CMakeLists.txt b/tink/CMakeLists.txt
index 79377ae..e1c878d 100644
--- a/tink/CMakeLists.txt
+++ b/tink/CMakeLists.txt
@@ -825,14 +825,16 @@
   SRCS
     core/binary_keyset_writer_test.cc
   DEPS
+    tink::core::aead
     tink::core::binary_keyset_writer
-    tink::core::cc
     tink::core::insecure_secret_key_access
+    tink::core::keyset_handle
     tink::core::proto_keyset_format
     gmock
     absl::memory
     absl::status
     tink::aead::aead_config
+    tink::aead::aead_key_templates
     tink::config::global_registry
     tink::util::secret_data
     tink::util::statusor
@@ -893,20 +895,24 @@
   SRCS
     core/keyset_handle_test.cc
   DEPS
+    tink::core::aead
     tink::core::binary_keyset_reader
-    tink::core::cc
+    tink::core::binary_keyset_writer
     tink::core::cleartext_keyset_handle
     tink::core::configuration
     tink::core::key_manager_impl
     tink::core::key_type_manager
     tink::core::template_util
+    tink::core::input_stream
     tink::core::json_keyset_reader
     tink::core::json_keyset_writer
     tink::core::key_gen_configuration
     tink::core::key_status
     tink::core::keyset_handle
+    tink::core::keyset_reader
     tink::core::primitive_set
     tink::core::primitive_wrapper
+    tink::core::registry
     gmock
     absl::flat_hash_map
     absl::memory

tink/config/BUILD.bazel

diff --git a/tink/config/BUILD.bazel b/tink/config/BUILD.bazel
index 6c0139f..037bda8 100644
--- a/tink/config/BUILD.bazel
+++ b/tink/config/BUILD.bazel
@@ -173,9 +173,10 @@
         "//tink:hybrid_decrypt",
         "//tink:hybrid_encrypt",
         "//tink:mac",
+        "//tink:public_key_sign",
+        "//tink:public_key_verify",
         "//tink:registry",
         "//tink:streaming_aead",
-        "//tink:tink_cc",
         "//tink/aead:aes_gcm_key_manager",
         "//tink/util:status",
         "//tink/util:test_matchers",

tink/config/CMakeLists.txt

diff --git a/tink/config/CMakeLists.txt b/tink/config/CMakeLists.txt
index 0e62551..ae97525 100644
--- a/tink/config/CMakeLists.txt
+++ b/tink/config/CMakeLists.txt
@@ -158,12 +158,13 @@
     tink::config::tink_config
     gmock
     absl::status
-    tink::core::cc
     tink::core::aead
     tink::core::deterministic_aead
     tink::core::hybrid_decrypt
     tink::core::hybrid_encrypt
     tink::core::mac
+    tink::core::public_key_sign
+    tink::core::public_key_verify
     tink::core::registry
     tink::core::streaming_aead
     tink::aead::aes_gcm_key_manager

tink/core/binary_keyset_writer_test.cc

diff --git a/tink/core/binary_keyset_writer_test.cc b/tink/core/binary_keyset_writer_test.cc
index 9010f88..12634fc 100644
--- a/tink/core/binary_keyset_writer_test.cc
+++ b/tink/core/binary_keyset_writer_test.cc
@@ -28,7 +28,7 @@
 #include "absl/status/status.h"
 #include "tink/aead.h"
 #include "tink/aead/aead_config.h"
-#include "tink/aead_key_templates.h"
+#include "tink/aead/aead_key_templates.h"
 #include "tink/config/global_registry.h"
 #include "tink/insecure_secret_key_access.h"
 #include "tink/keyset_handle.h"

tink/core/keyset_handle_test.cc

diff --git a/tink/core/keyset_handle_test.cc b/tink/core/keyset_handle_test.cc
index 8b9ace9..e43c8b8 100644
--- a/tink/core/keyset_handle_test.cc
+++ b/tink/core/keyset_handle_test.cc
@@ -35,7 +35,6 @@
 #include "tink/aead/aead_key_templates.h"
 #include "tink/aead/aead_wrapper.h"
 #include "tink/aead/aes_gcm_key_manager.h"
-#include "tink/aead_key_templates.h"
 #include "tink/binary_keyset_reader.h"
 #include "tink/binary_keyset_writer.h"
 #include "tink/cleartext_keyset_handle.h"

tink/jwt/internal/BUILD.bazel

diff --git a/tink/jwt/internal/BUILD.bazel b/tink/jwt/internal/BUILD.bazel
index a9bd06c..db18a13 100644
--- a/tink/jwt/internal/BUILD.bazel
+++ b/tink/jwt/internal/BUILD.bazel
@@ -43,8 +43,9 @@
         "//proto:jwt_hmac_cc_proto",
         "//proto:tink_cc_proto",
         "//tink:core/key_manager_impl",
+        "//tink:keyset_handle",
         "//tink:mac",
-        "//tink:tink_cc",
+        "//tink:registry",
         "//tink/config:global_registry",
         "//tink/mac:mac_config",
         "//tink/util:istream_input_stream",

tink/jwt/internal/CMakeLists.txt

diff --git a/tink/jwt/internal/CMakeLists.txt b/tink/jwt/internal/CMakeLists.txt
index 2f0a15f..1bc58a4 100644
--- a/tink/jwt/internal/CMakeLists.txt
+++ b/tink/jwt/internal/CMakeLists.txt
@@ -101,9 +101,10 @@
     gmock
     absl::memory
     absl::status
-    tink::core::cc
     tink::core::key_manager_impl
+    tink::core::keyset_handle
     tink::core::mac
+    tink::core::registry
     tink::config::global_registry
     tink::mac::mac_config
     tink::util::istream_input_stream

tink/prf/BUILD.bazel

diff --git a/tink/prf/BUILD.bazel b/tink/prf/BUILD.bazel
index 5744a5e..3f82cc2 100644
--- a/tink/prf/BUILD.bazel
+++ b/tink/prf/BUILD.bazel
@@ -306,7 +306,8 @@
         ":prf_key_templates",
         ":prf_set",
         "//proto:tink_cc_proto",
-        "//tink:tink_cc",
+        "//tink:keyset_handle",
+        "//tink:registry",
         "//tink/config:global_registry",
         "//tink/internal:fips_utils",
         "//tink/util:status",

tink/prf/CMakeLists.txt

diff --git a/tink/prf/CMakeLists.txt b/tink/prf/CMakeLists.txt
index a82da2e..f4e3bca 100644
--- a/tink/prf/CMakeLists.txt
+++ b/tink/prf/CMakeLists.txt
@@ -296,7 +296,8 @@
     gmock
     absl::status
     crypto
-    tink::core::cc
+    tink::core::keyset_handle
+    tink::core::registry
     tink::config::global_registry
     tink::internal::fips_utils
     tink::util::status

tink/signature/BUILD.bazel

diff --git a/tink/signature/BUILD.bazel b/tink/signature/BUILD.bazel
index 9c8930c..26a8dc5 100644
--- a/tink/signature/BUILD.bazel
+++ b/tink/signature/BUILD.bazel
@@ -1311,7 +1311,10 @@
         "//proto:ecdsa_cc_proto",
         "//proto:rsa_ssa_pss_cc_proto",
         "//proto:tink_cc_proto",
-        "//tink:tink_cc",
+        "//tink:keyset_handle",
+        "//tink:keyset_reader",
+        "//tink:public_key_sign",
+        "//tink:public_key_verify",
         "//tink/internal:rsa_util",
         "//tink/internal:ssl_util",
         "//tink/subtle:pem_parser_boringssl",

tink/signature/CMakeLists.txt

diff --git a/tink/signature/CMakeLists.txt b/tink/signature/CMakeLists.txt
index 5318b3d..ddcee95 100644
--- a/tink/signature/CMakeLists.txt
+++ b/tink/signature/CMakeLists.txt
@@ -1257,7 +1257,10 @@
     gmock
     absl::status
     absl::strings
-    tink::core::cc
+    tink::core::keyset_handle
+    tink::core::keyset_reader
+    tink::core::public_key_sign
+    tink::core::public_key_verify
     tink::internal::rsa_util
     tink::internal::ssl_util
     tink::subtle::pem_parser_boringssl