Replace the deprecated crypto::tink::util::error::INVALID_ARGUMENT usages with its absl version absl::StatusCode::kInvalidArgument in tink/cc/{,daead}.

This CL is a part of Tink migration to using absl::Status{,Or} and absl::StatusCode.

PiperOrigin-RevId: 408296075

5 files changed, 13 insertions, 7 deletions

diff --git a/cc/daead/BUILD.bazel b/cc/daead/BUILD.bazel
index 8f67719c9..bd749e539 100644
--- a/cc/daead/BUILD.bazel
+++ b/cc/daead/BUILD.bazel
@@ -20,6 +20,7 @@ cc_library(
         "//util:status",
         "//util:statusor",
         "//util:validation",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -109,6 +110,7 @@ cc_test(
         "//util:status",
         "//util:statusor",
         "//util:test_matchers",
+        "@com_google_absl//absl/status",
         "@com_google_googletest//:gtest_main",
     ],
 )
diff --git a/cc/daead/CMakeLists.txt b/cc/daead/CMakeLists.txt
index 3d7883047..f91791641 100644
--- a/cc/daead/CMakeLists.txt
+++ b/cc/daead/CMakeLists.txt
@@ -21,6 +21,7 @@ tink_cc_library(
     tink::util::validation
     tink::proto::aes_siv_cc_proto
     absl::memory
+    absl::status
     absl::strings
 )
 
@@ -101,6 +102,7 @@ tink_cc_test(
     tink::util::statusor
     tink::proto::aes_siv_cc_proto
     gmock
+    absl::status
 )
 
 tink_cc_test(
diff --git a/cc/daead/aes_siv_key_manager.h b/cc/daead/aes_siv_key_manager.h
index 4e15e3a45..930f8d433 100644
--- a/cc/daead/aes_siv_key_manager.h
+++ b/cc/daead/aes_siv_key_manager.h
@@ -19,6 +19,7 @@
 #include <string>
 
 #include "absl/memory/memory.h"
+#include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "tink/core/key_type_manager.h"
 #include "tink/deterministic_aead.h"
@@ -96,7 +97,7 @@ class AesSivKeyManager
     if (!randomness.ok()) {
       if (randomness.status().code() == absl::StatusCode::kOutOfRange) {
         return crypto::tink::util::Status(
-            crypto::tink::util::error::INVALID_ARGUMENT,
+            absl::StatusCode::kInvalidArgument,
             "Could not get enough pseudorandomness from input stream");
       }
       return randomness.status();
@@ -111,7 +112,7 @@ class AesSivKeyManager
   crypto::tink::util::Status ValidateKeySize(uint32_t key_size) const {
     if (key_size != kKeySizeInBytes) {
       return crypto::tink::util::Status(
-          crypto::tink::util::error::INVALID_ARGUMENT,
+          absl::StatusCode::kInvalidArgument,
           absl::StrCat("Invalid key size: key size is ", key_size,
                        " bytes; supported size: ", kKeySizeInBytes, " bytes."));
     }
diff --git a/cc/daead/aes_siv_key_manager_test.cc b/cc/daead/aes_siv_key_manager_test.cc
index e6a5c5daa..1e1eec504 100644
--- a/cc/daead/aes_siv_key_manager_test.cc
+++ b/cc/daead/aes_siv_key_manager_test.cc
@@ -18,6 +18,7 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "absl/status/status.h"
 #include "tink/deterministic_aead.h"
 #include "tink/util/istream_input_stream.h"
 #include "tink/util/secret_data.h"
@@ -143,7 +144,7 @@ TEST(AesSivKeyManagerTest, DeriveKeyWithoutEnoughEntropy) {
   util::IstreamInputStream input_stream{
       absl::make_unique<std::stringstream>("0123456789abcdef0123456789abcdef")};
   auto key_or = AesSivKeyManager().DeriveKey(format, &input_stream);
-  ASSERT_THAT(key_or.status(), StatusIs(util::error::INVALID_ARGUMENT,
+  ASSERT_THAT(key_or.status(), StatusIs(absl::StatusCode::kInvalidArgument,
                                         HasSubstr("pseudorandomness")));
 }
 
@@ -155,8 +156,8 @@ TEST(AesSivKeyManagerTest, DeriveKeyWrongVersion) {
   format.set_version(1);
   auto key_or = AesSivKeyManager().DeriveKey(format, &input_stream);
 
-  ASSERT_THAT(key_or.status(),
-              StatusIs(util::error::INVALID_ARGUMENT, HasSubstr("version")));
+  ASSERT_THAT(key_or.status(), StatusIs(absl::StatusCode::kInvalidArgument,
+                                        HasSubstr("version")));
 }
 
 TEST(AesSivKeyManagerTest, ValidateKey) {
diff --git a/cc/daead/deterministic_aead_wrapper.cc b/cc/daead/deterministic_aead_wrapper.cc
index 0d7d3c5ec..75039ee79 100644
--- a/cc/daead/deterministic_aead_wrapper.cc
+++ b/cc/daead/deterministic_aead_wrapper.cc
@@ -35,7 +35,7 @@ util::Status Validate(PrimitiveSet<DeterministicAead>* daead_set) {
                         "daead_set must be non-NULL");
   }
   if (daead_set->get_primary() == nullptr) {
-    return util::Status(util::error::INVALID_ARGUMENT,
+    return util::Status(absl::StatusCode::kInvalidArgument,
                         "daead_set has no primary");
   }
   return util::OkStatus();
@@ -116,7 +116,7 @@ DeterministicAeadSetWrapper::DecryptDeterministically(
       }
     }
   }
-  return util::Status(util::error::INVALID_ARGUMENT, "decryption failed");
+  return util::Status(absl::StatusCode::kInvalidArgument, "decryption failed");
 }
 
 }  // anonymous namespace