Rename key getter to be consistent among key classes.

#tinkApiChange

PiperOrigin-RevId: 536687093

5 files changed, 14 insertions, 13 deletions

diff --git a/cc/mac/aes_cmac_key.cc b/cc/mac/aes_cmac_key.cc
index aa0a9eaa8..b5f30bb31 100644
--- a/cc/mac/aes_cmac_key.cc
+++ b/cc/mac/aes_cmac_key.cc
@@ -35,9 +35,9 @@ namespace tink {
 
 
 util::StatusOr<AesCmacKey> AesCmacKey::Create(
-    AesCmacParameters parameters, RestrictedData aes_key_bytes,
+    AesCmacParameters parameters, RestrictedData key_bytes,
     absl::optional<int> id_requirement, PartialKeyAccessToken token) {
-  if (parameters.KeySizeInBytes() != aes_key_bytes.size()) {
+  if (parameters.KeySizeInBytes() != key_bytes.size()) {
     return util::Status(absl::StatusCode::kInvalidArgument,
                         "Key size does not match AES-CMAC parameters");
   }
@@ -58,7 +58,7 @@ util::StatusOr<AesCmacKey> AesCmacKey::Create(
   if (!output_prefix.ok()) {
     return output_prefix.status();
   }
-  return AesCmacKey(parameters, aes_key_bytes, id_requirement,
+  return AesCmacKey(parameters, key_bytes, id_requirement,
                     *std::move(output_prefix));
 }
 
@@ -106,7 +106,7 @@ bool AesCmacKey::operator==(const Key& other) const {
   if (id_requirement_ != that->id_requirement_) {
     return false;
   }
-  return aes_key_bytes_ == that->aes_key_bytes_;
+  return key_bytes_ == that->key_bytes_;
 }
 
 }  // namespace tink
diff --git a/cc/mac/aes_cmac_key.h b/cc/mac/aes_cmac_key.h
index 38ac13caa..50e8c5641 100644
--- a/cc/mac/aes_cmac_key.h
+++ b/cc/mac/aes_cmac_key.h
@@ -42,13 +42,14 @@ class AesCmacKey : public MacKey {
   // Creates a new AES-CMAC key.  If the parameters specify a variant that uses
   // a prefix, then the id is used to compute this prefix.
   static util::StatusOr<AesCmacKey> Create(AesCmacParameters parameters,
-                                           RestrictedData aes_key_bytes,
+                                           RestrictedData key_bytes,
                                            absl::optional<int> id_requirement,
                                            PartialKeyAccessToken token);
 
   // Returns the underlying AES key.
-  util::StatusOr<RestrictedData> GetAesKey(PartialKeyAccessToken token) const {
-    return aes_key_bytes_;
+  util::StatusOr<RestrictedData> GetKeyBytes(
+      PartialKeyAccessToken token) const {
+    return key_bytes_;
   }
 
   std::string GetOutputPrefix() const override;
@@ -64,10 +65,10 @@ class AesCmacKey : public MacKey {
   bool operator==(const Key& other) const override;
 
  private:
-  AesCmacKey(AesCmacParameters parameters, RestrictedData aes_key_bytes,
+  AesCmacKey(AesCmacParameters parameters, RestrictedData key_bytes,
              absl::optional<int> id_requirement, std::string output_prefix)
       : parameters_(parameters),
-        aes_key_bytes_(aes_key_bytes),
+        key_bytes_(key_bytes),
         id_requirement_(id_requirement),
         output_prefix_(std::move(output_prefix)) {}
 
@@ -75,7 +76,7 @@ class AesCmacKey : public MacKey {
       const AesCmacParameters& parameters, absl::optional<int> id_requirement);
 
   AesCmacParameters parameters_;
-  RestrictedData aes_key_bytes_;
+  RestrictedData key_bytes_;
   absl::optional<int> id_requirement_;
   std::string output_prefix_;
 };
diff --git a/cc/mac/aes_cmac_key_test.cc b/cc/mac/aes_cmac_key_test.cc
index e7b76079f..8bb87cfcf 100644
--- a/cc/mac/aes_cmac_key_test.cc
+++ b/cc/mac/aes_cmac_key_test.cc
@@ -142,7 +142,7 @@ TEST_P(AesCmacKeyTest, GetAesCmacKey) {
       *params, secret, test_case.id_requirement, GetPartialKeyAccess());
   ASSERT_THAT(key.status(), IsOk());
 
-  EXPECT_THAT(key->GetAesKey(GetPartialKeyAccess()), IsOkAndHolds(secret));
+  EXPECT_THAT(key->GetKeyBytes(GetPartialKeyAccess()), IsOkAndHolds(secret));
 }
 
 TEST_P(AesCmacKeyTest, KeyEquals) {
diff --git a/cc/mac/aes_cmac_proto_serialization.cc b/cc/mac/aes_cmac_proto_serialization.cc
index 1045b19c0..74bd7fd9a 100644
--- a/cc/mac/aes_cmac_proto_serialization.cc
+++ b/cc/mac/aes_cmac_proto_serialization.cc
@@ -170,7 +170,7 @@ util::StatusOr<AesCmacKey> ParseKey(
 util::StatusOr<internal::ProtoKeySerialization> SerializeKey(
     AesCmacKey key, SecretKeyAccessToken token) {
   util::StatusOr<RestrictedData> restricted_input =
-      key.GetAesKey(GetPartialKeyAccess());
+      key.GetKeyBytes(GetPartialKeyAccess());
   if (!restricted_input.ok()) return restricted_input.status();
 
   AesCmacParams proto_params;
diff --git a/cc/mac/aes_cmac_proto_serialization_test.cc b/cc/mac/aes_cmac_proto_serialization_test.cc
index cf8272b4d..0edd1fc76 100644
--- a/cc/mac/aes_cmac_proto_serialization_test.cc
+++ b/cc/mac/aes_cmac_proto_serialization_test.cc
@@ -219,7 +219,7 @@ TEST_P(AesCmacProtoSerializationTest, ParseKey) {
   const AesCmacKey* cmac_key = dynamic_cast<const AesCmacKey*>(key->get());
   ASSERT_THAT(cmac_key, NotNull());
   util::StatusOr<RestrictedData> parsed_key =
-      cmac_key->GetAesKey(GetPartialKeyAccess());
+      cmac_key->GetKeyBytes(GetPartialKeyAccess());
   ASSERT_THAT(parsed_key, IsOk());
   EXPECT_THAT(parsed_key->GetSecret(InsecureSecretKeyAccess::Get()),
               Eq(raw_key_bytes));