Commit a6ce1de
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 be863b7 commit a6ce1de
2 files changed
Lines changed: 4 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -838,20 +838,13 @@ ManagedEVPPKey ManagedEVPPKey::GetParsedKey(Environment* env, | |||
| 838 | 838 | return ManagedEVPPKey(std::move(pkey)); | |
| 839 | 839 | } | |
| 840 | 840 | ||
| 841 | - KeyObjectData::KeyObjectData( | ||
| 842 | - ByteSource symmetric_key) | ||
| 841 | + KeyObjectData::KeyObjectData(ByteSource symmetric_key) | ||
| 843 | 842 | : key_type_(KeyType::kKeyTypeSecret), | |
| 844 | 843 | symmetric_key_(std::move(symmetric_key)), | |
| 845 | - symmetric_key_len_(symmetric_key_.size()), | ||
| 846 | 844 | asymmetric_key_() {} | |
| 847 | 845 | ||
| 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} {} | ||
| 855 | 848 | ||
| 856 | 849 | void KeyObjectData::MemoryInfo(MemoryTracker* tracker) const { | |
| 857 | 850 | switch (GetKeyType()) { | |
@@ -896,7 +889,7 @@ const char* KeyObjectData::GetSymmetricKey() const { | |||
| 896 | 889 | ||
| 897 | 890 | size_t KeyObjectData::GetSymmetricKeySize() const { | |
| 898 | 891 | CHECK_EQ(key_type_, kKeyTypeSecret); | |
| 899 | - return symmetric_key_len_; | ||
| 892 | + return symmetric_key_.size(); | ||
| 900 | 893 | } | |
| 901 | 894 | ||
| 902 | 895 | v8::Local<v8::Function> KeyObjectHandle::Initialize(Environment* env) { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -158,7 +158,6 @@ class KeyObjectData : public MemoryRetainer { | |||
| 158 | 158 | ||
| 159 | 159 | const KeyType key_type_; | |
| 160 | 160 | const ByteSource symmetric_key_; | |
| 161 | - const unsigned int symmetric_key_len_; | ||
| 162 | 161 | const ManagedEVPPKey asymmetric_key_; | |
| 163 | 162 | }; | |
| 164 | 163 | ||
0 commit comments