diff options
author | ambrosin <ambrosin@google.com> | 2023-03-07 04:16:33 -0800 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2023-03-07 04:17:42 -0800 |
commit | 71ae13c8875f54c22855ab69cdb3d8057cb82ab1 (patch) | |
tree | a8c133f9bf8ad77f5ae62bc73fc78bf1d0b94db4 /cc/aead | |
parent | 7a12b021ce25a1b51de40fedce5e705ac257349f (diff) | |
download | tink-71ae13c8875f54c22855ab69cdb3d8057cb82ab1.tar.gz |
Delete config APIs marked for removal.
PiperOrigin-RevId: 514690513
Diffstat (limited to 'cc/aead')
-rw-r--r-- | cc/aead/aead_config.cc | 13 | ||||
-rw-r--r-- | cc/aead/aead_config.h | 12 |
2 files changed, 0 insertions, 25 deletions
diff --git a/cc/aead/aead_config.cc b/cc/aead/aead_config.cc index eb20ab010..b5a84cac8 100644 --- a/cc/aead/aead_config.cc +++ b/cc/aead/aead_config.cc @@ -34,19 +34,6 @@ namespace crypto { namespace tink { - -// NOLINTBEGIN(whitespace/line_length) (Formatted when commented in) -// TINK-PENDING-REMOVAL-IN-2.0.0-START -using ::google::crypto::tink::RegistryConfig; - -// static -const RegistryConfig& AeadConfig::Latest() { - static const RegistryConfig* config = new RegistryConfig(); - return *config; -} -// TINK-PENDING-REMOVAL-IN-2.0.0-END -// NOLINTEND(whitespace/line_length) - // static util::Status AeadConfig::Register() { auto status = MacConfig::Register(); diff --git a/cc/aead/aead_config.h b/cc/aead/aead_config.h index 1af3436c6..08cb196fe 100644 --- a/cc/aead/aead_config.h +++ b/cc/aead/aead_config.h @@ -34,18 +34,6 @@ namespace tink { // class AeadConfig { public: - // NOLINTBEGIN(whitespace/line_length) (Formatted when commented in) - // TINK-PENDING-REMOVAL-IN-2.0.0-START - static constexpr char kCatalogueName[] = "TinkAead"; - static constexpr char kPrimitiveName[] = "Aead"; - - // Returns config of Aead implementations supported - // in the current Tink release. - ABSL_DEPRECATED("This is not supported anymore.") - static const google::crypto::tink::RegistryConfig& Latest(); - // TINK-PENDING-REMOVAL-IN-2.0.0-END - // NOLINTEND(whitespace/line_length) - // Registers Aead primitive wrapper and key managers for all Aead key types // from the current Tink release. static crypto::tink::util::Status Register(); |