src: remove KeyObjectData::symmetric_key_len_

symmetric_key_len_ is always equal to symmetric_key_.size(). Storing it separately is redundant and has no significant benefit. PR-URL: #44346 Reviewed-By: Zeyu "Alex" Yang <[email protected]> Reviewed-By: Filip Skokan <[email protected]>
nodejs · Sep 5, 2022 · 88d9566 · 88d9566
1 parent 8b0a4af
commit 88d9566
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/crypto/crypto_keys.cc b/src/crypto/crypto_keys.cc
@@ -839,20 +839,13 @@ ManagedEVPPKey ManagedEVPPKey::GetParsedKey(Environment* env,
   return ManagedEVPPKey(std::move(pkey));
 }
 
-KeyObjectData::KeyObjectData(
-    ByteSource symmetric_key)
+KeyObjectData::KeyObjectData(ByteSource symmetric_key)
     : key_type_(KeyType::kKeyTypeSecret),
       symmetric_key_(std::move(symmetric_key)),
-      symmetric_key_len_(symmetric_key_.size()),
       asymmetric_key_() {}
 
-KeyObjectData::KeyObjectData(
-    KeyType type,
-    const ManagedEVPPKey& pkey)
-    : key_type_(type),
-      symmetric_key_(),
-      symmetric_key_len_(0),
-      asymmetric_key_{pkey} {}
+KeyObjectData::KeyObjectData(KeyType type, const ManagedEVPPKey& pkey)
+    : key_type_(type), symmetric_key_(), asymmetric_key_{pkey} {}
 
 void KeyObjectData::MemoryInfo(MemoryTracker* tracker) const {
   switch (GetKeyType()) {
@@ -896,7 +889,7 @@ const char* KeyObjectData::GetSymmetricKey() const {
 
 size_t KeyObjectData::GetSymmetricKeySize() const {
   CHECK_EQ(key_type_, kKeyTypeSecret);
-  return symmetric_key_len_;
+  return symmetric_key_.size();
 }
 
 v8::Local<v8::Function> KeyObjectHandle::Initialize(Environment* env) {

diff --git a/src/crypto/crypto_keys.h b/src/crypto/crypto_keys.h
@@ -158,7 +158,6 @@ class KeyObjectData : public MemoryRetainer {
 
   const KeyType key_type_;
   const ByteSource symmetric_key_;
-  const unsigned int symmetric_key_len_;
   const ManagedEVPPKey asymmetric_key_;
 };