Replace the deprecated crypto::tink::util::error::INVALID_ARGUMENT usages with its absl version absl::StatusCode::kInvalidArgument.

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

PiperOrigin-RevId: 407550759

8 files changed, 37 insertions, 20 deletions

diff --git a/cc/prf/BUILD.bazel b/cc/prf/BUILD.bazel
index 904fa2801..7b9f45ae4 100644
--- a/cc/prf/BUILD.bazel
+++ b/cc/prf/BUILD.bazel
@@ -27,6 +27,7 @@ cc_library(
         "//util:statusor",
         "//util:validation",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -118,6 +119,7 @@ cc_library(
         "//util:statusor",
         "//util:validation",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -146,6 +148,7 @@ cc_library(
         "//util:statusor",
         "//util:validation",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -163,6 +166,7 @@ cc_test(
         "//util:istream_input_stream",
         "//util:secret_data",
         "//util:test_matchers",
+        "@com_google_absl//absl/status",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -244,6 +248,7 @@ cc_test(
         "//util:status",
         "//util:statusor",
         "//util:test_matchers",
+        "@com_google_absl//absl/status",
         "@com_google_googletest//:gtest_main",
     ],
 )
diff --git a/cc/prf/CMakeLists.txt b/cc/prf/CMakeLists.txt
index cf2469d90..cfbd29e4b 100644
--- a/cc/prf/CMakeLists.txt
+++ b/cc/prf/CMakeLists.txt
@@ -23,6 +23,7 @@ tink_cc_library(
     tink::proto::hkdf_prf_cc_proto
     tink::proto::tink_cc_proto
     absl::memory
+    absl::status
     absl::strings
 )
 
@@ -105,6 +106,7 @@ tink_cc_library(
     tink::util::statusor
     tink::util::validation
     absl::memory
+    absl::status
     absl::strings
 )
 
@@ -132,6 +134,7 @@ tink_cc_library(
     tink::util::statusor
     tink::util::validation
     absl::memory
+    absl::status
     absl::strings
 )
 
@@ -151,6 +154,7 @@ tink_cc_test(
     tink::util::test_util
     tink::proto::common_cc_proto
     gmock
+    absl::status
 )
 
 tink_cc_test(
@@ -227,6 +231,7 @@ tink_cc_test(
     tink::util::statusor
     tink::util::test_matchers
     gmock
+    absl::status
 )
 
 tink_cc_test(
diff --git a/cc/prf/aes_cmac_prf_key_manager.h b/cc/prf/aes_cmac_prf_key_manager.h
index 4d77bdedd..77671ae3f 100644
--- a/cc/prf/aes_cmac_prf_key_manager.h
+++ b/cc/prf/aes_cmac_prf_key_manager.h
@@ -20,6 +20,7 @@
 #include <vector>
 
 #include "absl/memory/memory.h"
+#include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "tink/core/key_type_manager.h"
 #include "tink/key_manager.h"
@@ -76,7 +77,7 @@ class AesCmacPrfKeyManager
     if (!status.ok()) return status;
     if (key.key_value().size() != kKeySizeInBytes) {
       return crypto::tink::util::Status(
-          util::error::INVALID_ARGUMENT,
+          absl::StatusCode::kInvalidArgument,
           "Invalid AesCmacPrfKey: key_value wrong length.");
     }
     return util::OkStatus();
@@ -90,7 +91,7 @@ class AesCmacPrfKeyManager
     if (!status.ok()) return status;
     if (key_format.key_size() != kKeySizeInBytes) {
       return crypto::tink::util::Status(
-          crypto::tink::util::error::INVALID_ARGUMENT,
+          absl::StatusCode::kInvalidArgument,
           "Invalid AesCmacPrfKeyFormat: invalid key_size.");
     }
     return util::OkStatus();
diff --git a/cc/prf/hkdf_prf_key_manager.h b/cc/prf/hkdf_prf_key_manager.h
index 4d9e6a19f..07ba826d0 100644
--- a/cc/prf/hkdf_prf_key_manager.h
+++ b/cc/prf/hkdf_prf_key_manager.h
@@ -20,6 +20,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/input_stream.h"
@@ -136,7 +137,7 @@ class HkdfPrfKeyManager
   crypto::tink::util::Status ValidateKeySize(int key_size) const {
     if (key_size < kMinKeySizeBytes) {
       return crypto::tink::util::Status(
-          util::error::INVALID_ARGUMENT,
+          absl::StatusCode::kInvalidArgument,
           "Invalid HkdfPrfKey: key_value is too short.");
     }
     return crypto::tink::util::OkStatus();
@@ -148,7 +149,7 @@ class HkdfPrfKeyManager
     if (params.hash() != google::crypto::tink::HashType::SHA256 &&
         params.hash() != google::crypto::tink::HashType::SHA512) {
       return crypto::tink::util::Status(
-          util::error::INVALID_ARGUMENT,
+          absl::StatusCode::kInvalidArgument,
           "Invalid HkdfPrfKey: unsupported hash.");
     }
     return crypto::tink::util::OkStatus();
diff --git a/cc/prf/hkdf_prf_key_manager_test.cc b/cc/prf/hkdf_prf_key_manager_test.cc
index 43dc540f3..4ecbd665d 100644
--- a/cc/prf/hkdf_prf_key_manager_test.cc
+++ b/cc/prf/hkdf_prf_key_manager_test.cc
@@ -18,6 +18,7 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "absl/status/status.h"
 #include "tink/subtle/common_enums.h"
 #include "tink/subtle/prf/hkdf_streaming_prf.h"
 #include "tink/subtle/prf/prf_set_util.h"
@@ -52,7 +53,7 @@ TEST(HkdfPrfKeyManagerTest, Basics) {
 
 TEST(HkdfPrfKeyManagerTest, ValidateEmptyKey) {
   EXPECT_THAT(HkdfPrfKeyManager().ValidateKey(HkdfPrfKey()),
-              StatusIs(util::error::INVALID_ARGUMENT));
+              StatusIs(absl::StatusCode::kInvalidArgument));
 }
 
 TEST(HkdfPrfKeyManagerTest, ValidateValid32ByteKey) {
@@ -93,7 +94,7 @@ TEST(HkdfPrfKeyManagerTest, InvalidKeySizes31Bytes) {
   key.set_version(0);
   key.set_key_value("0123456789012345678901234567890");
   EXPECT_THAT(HkdfPrfKeyManager().ValidateKey(key),
-              StatusIs(util::error::INVALID_ARGUMENT));
+              StatusIs(absl::StatusCode::kInvalidArgument));
 }
 
 TEST(HkdfPrfKeyManagerTest, InvalidKeySha1) {
@@ -102,7 +103,7 @@ TEST(HkdfPrfKeyManagerTest, InvalidKeySha1) {
   key.set_key_value("01234567890123456789012345678901");
   key.mutable_params()->set_hash(::google::crypto::tink::SHA1);
   EXPECT_THAT(HkdfPrfKeyManager().ValidateKey(key),
-              StatusIs(util::error::INVALID_ARGUMENT));
+              StatusIs(absl::StatusCode::kInvalidArgument));
 }
 
 TEST(HkdfPrfKeyManagerTest, InvalidKeyVersion) {
@@ -111,12 +112,12 @@ TEST(HkdfPrfKeyManagerTest, InvalidKeyVersion) {
   key.set_key_value("01234567890123456789012345678901");
   key.mutable_params()->set_hash(::google::crypto::tink::SHA256);
   EXPECT_THAT(HkdfPrfKeyManager().ValidateKey(key),
-              StatusIs(util::error::INVALID_ARGUMENT));
+              StatusIs(absl::StatusCode::kInvalidArgument));
 }
 
 TEST(HkdfPrfKeyManagerTest, ValidateEmptyKeyFormat) {
   EXPECT_THAT(HkdfPrfKeyManager().ValidateKeyFormat(HkdfPrfKeyFormat()),
-              StatusIs(util::error::INVALID_ARGUMENT));
+              StatusIs(absl::StatusCode::kInvalidArgument));
 }
 
 TEST(HkdfPrfKeyManagerTest, ValidateValid32ByteKeyFormat) {
@@ -153,7 +154,7 @@ TEST(HkdfPrfKeyManagerTest, InvalidKeyFormatSha1) {
   key_format.set_key_size(32);
   key_format.mutable_params()->set_hash(::google::crypto::tink::SHA1);
   EXPECT_THAT(HkdfPrfKeyManager().ValidateKeyFormat(key_format),
-              StatusIs(util::error::INVALID_ARGUMENT));
+              StatusIs(absl::StatusCode::kInvalidArgument));
 }
 
 TEST(HkdfPrfKeyManagerTest, ValidateInvalid31ByteKeyFormat) {
@@ -161,7 +162,7 @@ TEST(HkdfPrfKeyManagerTest, ValidateInvalid31ByteKeyFormat) {
   key_format.set_key_size(31);
   key_format.mutable_params()->set_hash(::google::crypto::tink::SHA256);
   EXPECT_THAT(HkdfPrfKeyManager().ValidateKeyFormat(key_format),
-              StatusIs(util::error::INVALID_ARGUMENT));
+              StatusIs(absl::StatusCode::kInvalidArgument));
 }
 
 TEST(HkdfPrfKeyManagerTest, CreateKey) {
@@ -279,8 +280,9 @@ TEST(HmacPrfKeyManagerTest, DeriveKeyWrongVersion) {
   util::IstreamInputStream input_stream{
       absl::make_unique<std::stringstream>("0123456789abcdef0123456789abcdef")};
 
-  ASSERT_THAT(HkdfPrfKeyManager().DeriveKey(format, &input_stream).status(),
-              StatusIs(util::error::INVALID_ARGUMENT, HasSubstr("version")));
+  ASSERT_THAT(
+      HkdfPrfKeyManager().DeriveKey(format, &input_stream).status(),
+      StatusIs(absl::StatusCode::kInvalidArgument, HasSubstr("version")));
 }
 
 TEST(HkdfPrfKeyManagerTest, CreatePrfSet) {
diff --git a/cc/prf/hmac_prf_key_manager.cc b/cc/prf/hmac_prf_key_manager.cc
index 89c6d42e6..6a6d9d611 100644
--- a/cc/prf/hmac_prf_key_manager.cc
+++ b/cc/prf/hmac_prf_key_manager.cc
@@ -17,6 +17,7 @@
 
 #include <set>
 
+#include "absl/status/status.h"
 #include "tink/subtle/common_enums.h"
 #include "tink/util/enums.h"
 #include "tink/util/input_stream_util.h"
@@ -42,7 +43,7 @@ util::Status HmacPrfKeyManager::ValidateKey(const HmacPrfKey& key) const {
   util::Status status = ValidateVersion(key.version(), get_version());
   if (!status.ok()) return status;
   if (key.key_value().size() < kMinKeySizeInBytes) {
-    return util::Status(util::error::INVALID_ARGUMENT,
+    return util::Status(absl::StatusCode::kInvalidArgument,
                         "Invalid HmacPrfKey: key_value wrong length.");
   }
   return ValidateParams(key.params());
@@ -53,7 +54,7 @@ util::Status HmacPrfKeyManager::ValidateKeyFormat(
   util::Status status = ValidateVersion(key_format.version(), get_version());
   if (!status.ok()) return status;
   if (key_format.key_size() < kMinKeySizeInBytes) {
-    return util::Status(util::error::INVALID_ARGUMENT,
+    return util::Status(absl::StatusCode::kInvalidArgument,
                         "Invalid HmacPrfKeyFormat: invalid key_size.");
   }
   return ValidateParams(key_format.params());
@@ -94,7 +95,7 @@ Status HmacPrfKeyManager::ValidateParams(const HmacPrfParams& params) const {
                               HashType::SHA512});
   if (supported_hash_types->find(Enums::ProtoToSubtle(params.hash())) ==
       supported_hash_types->end()) {
-    return ToStatusF(util::error::INVALID_ARGUMENT,
+    return ToStatusF(absl::StatusCode::kInvalidArgument,
                      "Invalid HmacParams: HashType '%s' not supported.",
                      Enums::HashName(params.hash()));
   }
diff --git a/cc/prf/hmac_prf_key_manager_test.cc b/cc/prf/hmac_prf_key_manager_test.cc
index aef56fe37..3bea35741 100644
--- a/cc/prf/hmac_prf_key_manager_test.cc
+++ b/cc/prf/hmac_prf_key_manager_test.cc
@@ -18,6 +18,7 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "absl/status/status.h"
 #include "tink/core/key_manager_impl.h"
 #include "tink/prf/prf_set.h"
 #include "tink/subtle/hmac_boringssl.h"
@@ -152,8 +153,9 @@ TEST(HmacPrfKeyManagerTest, DeriveKeyWrongVersion) {
   IstreamInputStream input_stream{
       absl::make_unique<std::stringstream>("0123456789abcdef")};
 
-  ASSERT_THAT(HmacPrfKeyManager().DeriveKey(format, &input_stream).status(),
-              StatusIs(util::error::INVALID_ARGUMENT, HasSubstr("version")));
+  ASSERT_THAT(
+      HmacPrfKeyManager().DeriveKey(format, &input_stream).status(),
+      StatusIs(absl::StatusCode::kInvalidArgument, HasSubstr("version")));
 }
 
 TEST(HmacPrfKeyManagerTest, GetPrimitive) {
diff --git a/cc/prf/prf_set_wrapper.cc b/cc/prf/prf_set_wrapper.cc
index 6891e1838..0c66f635b 100644
--- a/cc/prf/prf_set_wrapper.cc
+++ b/cc/prf/prf_set_wrapper.cc
@@ -54,12 +54,12 @@ util::Status Validate(PrimitiveSet<Prf>* prf_set) {
                         "prf_set must be non-NULL");
   }
   if (prf_set->get_primary() == nullptr) {
-    return util::Status(util::error::INVALID_ARGUMENT,
+    return util::Status(absl::StatusCode::kInvalidArgument,
                         "prf_set has no primary");
   }
   for (auto prf : prf_set->get_all()) {
     if (prf->get_output_prefix_type() != OutputPrefixType::RAW) {
-      return util::Status(util::error::INVALID_ARGUMENT,
+      return util::Status(absl::StatusCode::kInvalidArgument,
                           "PrfSet should only be used with prefix type RAW");
     }
   }