Remove all remaining dependencies on rapidjson.

This requires us to remove the subtle::WycheproofUtil, because it uses rapidjson in its interface. I think it is unlikely that there are any external users of these functions. If there are, they should just copy WycheproofUtil into their code. PiperOrigin-RevId: 705390211 Change-Id: Ia82e44e7b00b2ab39b686627b9f2838fa7df4450
tink-crypto · Dec 12, 2024 · 39ea800 · 39ea800
1 parent 4416be5
commit 39ea800
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 317 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -53,10 +53,6 @@ bazel_dep(
     name = "boringssl",
     version = "0.20240930.0",
 )
-bazel_dep(
-    name = "rapidjson",
-    version = "1.1.0",
-)
 bazel_dep(
     name = "abseil-cpp",
     version = "20240722.0",

diff --git a/cmake/TinkWorkspace.cmake b/cmake/TinkWorkspace.cmake
@@ -115,19 +115,6 @@ else()
   message(STATUS "crypto Include Dir: ${crypto_INCLUDE_DIR}")
 endif()
 
-set(RAPIDJSON_BUILD_DOC OFF CACHE BOOL "Tink dependency override" FORCE)
-set(RAPIDJSON_BUILD_EXAMPLES OFF CACHE BOOL "Tink dependency override" FORCE)
-set(RAPIDJSON_BUILD_TESTS OFF CACHE BOOL "Tink dependency override" FORCE)
-
-http_archive(
-  NAME rapidjson
-  URL https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz
-  SHA256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
-)
-# Rapidjson is a header-only library with no explicit target. Here we create one.
-add_library(rapidjson INTERFACE)
-target_include_directories(rapidjson INTERFACE "${rapidjson_SOURCE_DIR}")
-
 if (NOT TINK_USE_INSTALLED_PROTOBUF)
   set(protobuf_BUILD_TESTS OFF CACHE BOOL "Tink dependency override" FORCE)
   set(protobuf_BUILD_EXAMPLES OFF CACHE BOOL "Tink dependency override" FORCE)

diff --git a/third_party/rapidjson.BUILD.bazel b/third_party/rapidjson.BUILD.bazel
diff --git a/tink/aead/internal/BUILD.bazel b/tink/aead/internal/BUILD.bazel
@@ -218,7 +218,6 @@ cc_test(
         "//tink:aead",
         "//tink/aead:cord_aead",
         "//tink/subtle:aes_gcm_boringssl",
-        "//tink/subtle:wycheproof_util",
         "//tink/util:secret_data",
         "//tink/util:statusor",
         "//tink/util:test_matchers",

diff --git a/tink/aead/internal/CMakeLists.txt b/tink/aead/internal/CMakeLists.txt
@@ -245,7 +245,6 @@ tink_cc_test(
     tink::core::aead
     tink::aead::cord_aead
     tink::subtle::aes_gcm_boringssl
-    tink::subtle::wycheproof_util
     tink::util::secret_data
     tink::util::statusor
     tink::util::test_matchers

diff --git a/tink/subtle/BUILD.bazel b/tink/subtle/BUILD.bazel
@@ -731,24 +731,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "wycheproof_util",
-    testonly = 1,
-    srcs = ["wycheproof_util.cc"],
-    hdrs = ["wycheproof_util.h"],
-    include_prefix = "tink/subtle",
-    deps = [
-        ":common_enums",
-        "//tink/internal:test_file_util",
-        "//tink/util:status",
-        "//tink/util:statusor",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-        "@rapidjson",
-    ],
-)
-
 cc_library(
     name = "stream_segment_decrypter",
     hdrs = ["stream_segment_decrypter.h"],

diff --git a/tink/subtle/CMakeLists.txt b/tink/subtle/CMakeLists.txt
@@ -693,23 +693,6 @@ tink_cc_library(
     tink::util::statusor
 )
 
-tink_cc_library(
-  NAME wycheproof_util
-  SRCS
-    wycheproof_util.cc
-    wycheproof_util.h
-  DEPS
-    tink::subtle::common_enums
-    absl::log
-    absl::status
-    absl::strings
-    rapidjson
-    tink::internal::test_file_util
-    tink::util::status
-    tink::util::statusor
-  TESTONLY
-)
-
 tink_cc_library(
   NAME stream_segment_decrypter
   SRCS

diff --git a/tink/subtle/wycheproof_util.cc b/tink/subtle/wycheproof_util.cc
diff --git a/tink/subtle/wycheproof_util.h b/tink/subtle/wycheproof_util.h
diff --git a/tink_cc_deps.bzl b/tink_cc_deps.bzl
@@ -86,19 +86,6 @@ def tink_cc_deps():
         url = "https://github.com/bazelbuild/rules_license/releases/download/1.0.0/rules_license-1.0.0.tar.gz",
     )
 
-    # -------------------------------------------------------------------------
-    # Rapidjson.
-    # -------------------------------------------------------------------------
-    # Release from 2016-08-25 (still the latest release as of 2022-05-05).
-    maybe(
-        http_archive,
-        build_file = "@tink_cc//:third_party/rapidjson.BUILD.bazel",
-        name = "rapidjson",
-        sha256 = "bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e",
-        strip_prefix = "rapidjson-1.1.0",
-        url = "https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz",
-    )
-
 def tink_cc_testonly_deps():
     """Test only dependencies for tink-cc."""