diff options
| author | Tobias Nießen <tniessen@tnie.de> | 2022-08-24 22:05:10 +0300 |
|---|---|---|
| committer | Juan José Arboleda <soyjuanarbol@gmail.com> | 2022-10-11 22:45:19 +0300 |
| commit | a6ce1de833c4a43013cbdb276e6fe99e4ab8fe9b (patch) | |
| tree | 599ed834e1fa1bc4ae4a983ba489aa498f103a5a /src | |
| parent | be863b7a977ff63d98cdcaa2aee7b82b29a59367 (diff) | |
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: https://github.com/nodejs/node/pull/44346
Reviewed-By: Zeyu "Alex" Yang <himself65@outlook.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/crypto/crypto_keys.cc | 15 | ||||
| -rw-r--r-- | src/crypto/crypto_keys.h | 1 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/crypto/crypto_keys.cc b/src/crypto/crypto_keys.cc index 8999e7ab03c..73678765426 100644 --- a/src/crypto/crypto_keys.cc +++ b/src/crypto/crypto_keys.cc @@ -838,20 +838,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 index 3889f3f321d..7b9c8d7e4ff 100644 --- 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_; }; |