Remove the deprecated catalogue.h header and target.

PiperOrigin-RevId: 516160112 Change-Id: I3dec8e6595c18dbf37876f384697f123abed9926
tink-crypto · Mar 13, 2023 · 74a1ab6 · 74a1ab6
1 parent 753c5c0
commit 74a1ab6
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 79 deletions.
diff --git a/tink/BUILD.bazel b/tink/BUILD.bazel
@@ -23,7 +23,6 @@ cc_library(
         "aead_key_templates.h",
         "binary_keyset_reader.h",
         "binary_keyset_writer.h",
-        "catalogue.h",
         "deterministic_aead.h",
         "deterministic_aead_config.h",
         "deterministic_aead_factory.h",
@@ -395,17 +394,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "catalogue",
-    hdrs = ["catalogue.h"],
-    include_prefix = "tink",
-    deps = [
-        ":key_manager",
-        "//tink/util:statusor",
-        "@com_google_absl//absl/base:core_headers",
-    ],
-)
-
 cc_library(
     name = "crypto_format",
     srcs = ["core/crypto_format.cc"],

diff --git a/tink/CMakeLists.txt b/tink/CMakeLists.txt
@@ -33,7 +33,6 @@ tink_cc_library(
     aead_key_templates.h
     binary_keyset_reader.h
     binary_keyset_writer.h
-    catalogue.h
     cleartext_keyset_handle.h
     deterministic_aead.h
     deterministic_aead_config.h
@@ -366,16 +365,6 @@ tink_cc_library(
     tink::proto::tink_cc_proto
 )
 
-tink_cc_library(
-  NAME catalogue
-  SRCS
-    catalogue.h
-  DEPS
-    tink::core::key_manager
-    absl::core_headers
-    tink::util::statusor
-)
-
 tink_cc_library(
   NAME crypto_format
   SRCS

diff --git a/tink/catalogue.h b/tink/catalogue.h
diff --git a/tink/internal/BUILD.bazel b/tink/internal/BUILD.bazel
@@ -93,7 +93,6 @@ cc_library(
         ":fips_utils",
         ":keyset_wrapper",
         ":keyset_wrapper_impl",
-        "//tink:catalogue",
         "//tink:core/key_manager_impl",
         "//tink:core/key_type_manager",
         "//tink:core/private_key_manager_impl",
@@ -286,7 +285,6 @@ cc_test(
         ":fips_utils",
         ":registry_impl",
         "//tink:aead",
-        "//tink:catalogue",
         "//tink:core/key_manager_impl",
         "//tink:core/key_type_manager",
         "//tink:core/private_key_manager_impl",

diff --git a/tink/internal/CMakeLists.txt b/tink/internal/CMakeLists.txt
@@ -104,7 +104,6 @@ tink_cc_library(
     absl::strings
     absl::synchronization
     absl::optional
-    tink::core::catalogue
     tink::core::key_manager_impl
     tink::core::key_type_manager
     tink::core::private_key_manager_impl
@@ -252,7 +251,6 @@ tink_cc_test(
     absl::strings
     crypto
     tink::core::aead
-    tink::core::catalogue
     tink::core::key_manager_impl
     tink::core::key_type_manager
     tink::core::private_key_manager_impl

diff --git a/tink/internal/registry_impl.h b/tink/internal/registry_impl.h
@@ -38,7 +38,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
 #include "absl/types/optional.h"
-#include "tink/catalogue.h"
 #include "tink/core/key_manager_impl.h"
 #include "tink/core/key_type_manager.h"
 #include "tink/core/private_key_manager_impl.h"

diff --git a/tink/internal/registry_impl_test.cc b/tink/internal/registry_impl_test.cc
@@ -35,7 +35,6 @@
 #include "tink/aead.h"
 #include "tink/aead/aead_wrapper.h"
 #include "tink/aead/aes_gcm_key_manager.h"
-#include "tink/catalogue.h"
 #include "tink/core/key_manager_impl.h"
 #include "tink/core/key_type_manager.h"
 #include "tink/core/private_key_manager_impl.h"