Skip to content

src: remove KeyObjectData::symmetric_key_len_ #44346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2022
Merged

src: remove KeyObjectData::symmetric_key_len_ #44346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions src/crypto/crypto_keys.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion src/crypto/crypto_keys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
};

Expand Down