aboutsummaryrefslogtreecommitdiff
path: root/cc/aead
diff options
context:
space:
mode:
authortholenst <tholenst@google.com>2022-12-29 07:51:53 -0800
committerCopybara-Service <copybara-worker@google.com>2022-12-29 07:53:06 -0800
commit05fe1fbcfcb2745c2010c8ed9eeed93d681a9c9e (patch)
treee24313dcf724f89abf80bd2a47c7ed669b6e0f29 /cc/aead
parent36f1c42930cebb8e734025b8f661d05e986b49ec (diff)
downloadtink-05fe1fbcfcb2745c2010c8ed9eeed93d681a9c9e.tar.gz
Mark several config APIs for removal in Tink 2.
PiperOrigin-RevId: 498387395
Diffstat (limited to 'cc/aead')
-rw-r--r--cc/aead/aead_config.cc4
-rw-r--r--cc/aead/aead_config.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/cc/aead/aead_config.cc b/cc/aead/aead_config.cc
index d627064c3..eb20ab010 100644
--- a/cc/aead/aead_config.cc
+++ b/cc/aead/aead_config.cc
@@ -35,6 +35,8 @@
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
@@ -42,6 +44,8 @@ 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() {
diff --git a/cc/aead/aead_config.h b/cc/aead/aead_config.h
index 6431d64cb..1af3436c6 100644
--- a/cc/aead/aead_config.h
+++ b/cc/aead/aead_config.h
@@ -34,6 +34,8 @@ 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";
@@ -41,6 +43,8 @@ class AeadConfig {
// 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.