Skip to content

Commit 88d9566

Browse files
tniessenRafaelGSS
authored andcommittedSep 5, 2022
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 <himself65@outlook.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 8b0a4af commit 88d9566

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
@@ -839,20 +839,13 @@ ManagedEVPPKey ManagedEVPPKey::GetParsedKey(Environment* env,
839839
return ManagedEVPPKey(std::move(pkey));
840840
}
841841

842-
KeyObjectData::KeyObjectData(
843-
ByteSource symmetric_key)
842+
KeyObjectData::KeyObjectData(ByteSource symmetric_key)
844843
: key_type_(KeyType::kKeyTypeSecret),
845844
symmetric_key_(std::move(symmetric_key)),
846-
symmetric_key_len_(symmetric_key_.size()),
847845
asymmetric_key_() {}
848846

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

857850
void KeyObjectData::MemoryInfo(MemoryTracker* tracker) const {
858851
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)
Please sign in to comment.