Skip to content

Commit a6ce1de

Browse files
tniessenjuanarbol
authored andcommitted
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]>
1 parent be863b7 commit a6ce1de

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

src/crypto/crypto_keys.cc

+4-11
Original file line numberDiff line numberDiff line change
@@ -838,20 +838,13 @@ ManagedEVPPKey ManagedEVPPKey::GetParsedKey(Environment* env,
838838
return ManagedEVPPKey(std::move(pkey));
839839
}
840840

841-
KeyObjectData::KeyObjectData(
842-
ByteSource symmetric_key)
841+
KeyObjectData::KeyObjectData(ByteSource symmetric_key)
843842
: key_type_(KeyType::kKeyTypeSecret),
844843
symmetric_key_(std::move(symmetric_key)),
845-
symmetric_key_len_(symmetric_key_.size()),
846844
asymmetric_key_() {}
847845

848-
KeyObjectData::KeyObjectData(
849-
KeyType type,
850-
const ManagedEVPPKey& pkey)
851-
: key_type_(type),
852-
symmetric_key_(),
853-
symmetric_key_len_(0),
854-
asymmetric_key_{pkey} {}
846+
KeyObjectData::KeyObjectData(KeyType type, const ManagedEVPPKey& pkey)
847+
: key_type_(type), symmetric_key_(), asymmetric_key_{pkey} {}
855848

856849
void KeyObjectData::MemoryInfo(MemoryTracker* tracker) const {
857850
switch (GetKeyType()) {
@@ -896,7 +889,7 @@ const char* KeyObjectData::GetSymmetricKey() const {
896889

897890
size_t KeyObjectData::GetSymmetricKeySize() const {
898891
CHECK_EQ(key_type_, kKeyTypeSecret);
899-
return symmetric_key_len_;
892+
return symmetric_key_.size();
900893
}
901894

902895
v8::Local<v8::Function> KeyObjectHandle::Initialize(Environment* env) {

src/crypto/crypto_keys.h

-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ class KeyObjectData : public MemoryRetainer {
158158

159159
const KeyType key_type_;
160160
const ByteSource symmetric_key_;
161-
const unsigned int symmetric_key_len_;
162161
const ManagedEVPPKey asymmetric_key_;
163162
};
164163

0 commit comments

Comments
 (0)