aboutsummaryrefslogtreecommitdiff
path: root/cc/daead
diff options
context:
space:
mode:
authorlizatretyakova <lizatretyakova@google.com>2021-10-25 06:48:21 -0700
committerCopybara-Service <copybara-worker@google.com>2021-10-25 06:49:01 -0700
commite87c7797b5eb840bc986f58acea9ea4007a9d6a9 (patch)
treedce9b1d9d27b9f8304eebd9214763666e4901c06 /cc/daead
parent2f4cde5f3ab861bebb8d4e91b6cd9e178928799f (diff)
downloadtink-e87c7797b5eb840bc986f58acea9ea4007a9d6a9.tar.gz
Replace the deprecated crypto::tink::util::Status::error_message() method with its absl-compatible version crypto::tink::util::Status::message().
This CL is a part of Tink migration to using absl::Status{,Or}. PiperOrigin-RevId: 405387586
Diffstat (limited to 'cc/daead')
-rw-r--r--cc/daead/deterministic_aead_factory_test.cc4
-rw-r--r--cc/daead/deterministic_aead_wrapper_test.cc6
2 files changed, 5 insertions, 5 deletions
diff --git a/cc/daead/deterministic_aead_factory_test.cc b/cc/daead/deterministic_aead_factory_test.cc
index 41c1e3083..3a99e7216 100644
--- a/cc/daead/deterministic_aead_factory_test.cc
+++ b/cc/daead/deterministic_aead_factory_test.cc
@@ -50,7 +50,7 @@ TEST_F(DeterministicAeadFactoryTest, testBasic) {
EXPECT_FALSE(daead_result.ok());
EXPECT_EQ(absl::StatusCode::kInvalidArgument, daead_result.status().code());
EXPECT_PRED_FORMAT2(testing::IsSubstring, "at least one key",
- daead_result.status().error_message());
+ std::string(daead_result.status().message()));
}
TEST_F(DeterministicAeadFactoryTest, testPrimitive) {
@@ -112,7 +112,7 @@ TEST_F(DeterministicAeadFactoryTest, testPrimitive) {
EXPECT_EQ(absl::StatusCode::kInvalidArgument,
decrypt_result.status().code());
EXPECT_PRED_FORMAT2(testing::IsSubstring, "decryption failed",
- decrypt_result.status().error_message());
+ std::string(decrypt_result.status().message()));
// Create raw ciphertext with 2nd key, and decrypt
// with DeterministicAead-instance.
diff --git a/cc/daead/deterministic_aead_wrapper_test.cc b/cc/daead/deterministic_aead_wrapper_test.cc
index ab9b9fa0b..e8e3d8475 100644
--- a/cc/daead/deterministic_aead_wrapper_test.cc
+++ b/cc/daead/deterministic_aead_wrapper_test.cc
@@ -49,7 +49,7 @@ TEST_F(DeterministicAeadSetWrapperTest, testBasic) {
EXPECT_FALSE(daead_result.ok());
EXPECT_EQ(absl::StatusCode::kInternal, daead_result.status().code());
EXPECT_PRED_FORMAT2(testing::IsSubstring, "non-NULL",
- daead_result.status().error_message());
+ std::string(daead_result.status().message()));
}
{ // daead_set has no primary primitive.
@@ -61,7 +61,7 @@ TEST_F(DeterministicAeadSetWrapperTest, testBasic) {
EXPECT_EQ(absl::StatusCode::kInvalidArgument,
daead_result.status().code());
EXPECT_PRED_FORMAT2(testing::IsSubstring, "no primary",
- daead_result.status().error_message());
+ std::string(daead_result.status().message()));
}
{ // Correct daead_set;
@@ -130,7 +130,7 @@ TEST_F(DeterministicAeadSetWrapperTest, testBasic) {
EXPECT_EQ(absl::StatusCode::kInvalidArgument,
decrypt_result.status().code());
EXPECT_PRED_FORMAT2(testing::IsSubstring, "decryption failed",
- decrypt_result.status().error_message());
+ std::string(decrypt_result.status().message()));
}
}