src: implement MemoryRetainer protocol for ByteSource

Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #64660
Backport-PR-URL: #65087
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

Author: panva

src/crypto/crypto_aes.cc

@@ -491,8 +491,7 @@ void UseDefaultIV(AESCipherConfig* params) {
 } // namespace
 
 AESCipherConfig::AESCipherConfig(AESCipherConfig&& other) noexcept
- : mode(other.mode),
-variant(other.variant),
+ : variant(other.variant),
 cipher(other.cipher),
  length(other.length),
  iv(std::move(other.iv)),
@@ -505,12 +504,8 @@ AESCipherConfig& AESCipherConfig::operator=(AESCipherConfig&& other) noexcept {
 }
 
 voidAESCipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the AESCipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> AESCipherTraits::AdditionalConfig(
@@ -521,8 +516,6 @@ Maybe<void> AESCipherTraits::AdditionalConfig(
  AESCipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsUint32()); // Key Variant
  params->variant =
 static_cast<AESKeyVariant>(args[offset].As<Uint32>()->Value());

src/crypto/crypto_aes.h

@@ -58,7 +58,6 @@ enum class AESKeyVariant {
 };
 
 structAESCipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  AESKeyVariant variant;
  ncrypto::Cipher cipher;
 size_t length;

src/crypto/crypto_argon2.cc

@@ -21,8 +21,7 @@ using v8::Uint32;
 using v8::Value;
 
 Argon2Config::Argon2Config(Argon2Config&& other) noexcept
- : mode{other.mode},
- key{std::move(other.key)},
+ : key{std::move(other.key)},
  pass{std::move(other.pass)},
  salt{std::move(other.salt)},
  secret{std::move(other.secret)},
@@ -40,13 +39,13 @@ Argon2Config& Argon2Config::operator=(Argon2Config&& other) noexcept {
 }
 
 voidArgon2Config::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("pass", pass.size());
- tracker->TrackFieldWithSize("salt", salt.size());
-tracker->TrackFieldWithSize("secret", secret.size());
-tracker->TrackFieldWithSize("ad", ad.size());
-}
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(pass, "pass");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(secret, "secret");
+tracker->TraitTrackInline(ad, "ad");
 }
 
 MaybeLocal<Value> Argon2Traits::EncodeOutput(Environment* env,
@@ -62,8 +61,6 @@ Maybe<void> Argon2Traits::AdditionalConfig(
  Argon2Config* config) {
  Environment* env = Environment::GetCurrent(args);
 
- config->mode = mode;
-
 CHECK(KeyObjectHandle::HasInstance(env, args[offset]) ||
 IsAnyBufferSource(args[offset])); // pass
  ArrayBufferOrViewContents<char> salt(args[offset + 1]);

src/crypto/crypto_argon2.h

@@ -22,7 +22,6 @@ namespace node::crypto {
 // at least 16 bytes in length.
 
 structArgon2Configfinal : public MemoryRetainer {
- CryptoJobMode mode;
  KeyObjectData key;
  ByteSource pass;
  ByteSource salt;

src/crypto/crypto_chacha20_poly1305.cc

@@ -81,8 +81,7 @@ bool ValidateAdditionalData(Environment* env,
 
 ChaCha20Poly1305CipherConfig::ChaCha20Poly1305CipherConfig(
  ChaCha20Poly1305CipherConfig&& other) noexcept
- : mode(other.mode),
-cipher(other.cipher),
+ : cipher(other.cipher),
 iv(std::move(other.iv)),
  additional_data(std::move(other.additional_data)) {}
 
@@ -94,12 +93,8 @@ ChaCha20Poly1305CipherConfig& ChaCha20Poly1305CipherConfig::operator=(
 }
 
 voidChaCha20Poly1305CipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the ChaCha20Poly1305CipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
@@ -110,7 +105,6 @@ Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
  ChaCha20Poly1305CipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
  params->cipher = ncrypto::Cipher::CHACHA20_POLY1305;
 
 #ifndef OPENSSL_IS_BORINGSSL

src/crypto/crypto_chacha20_poly1305.h

@@ -13,7 +13,6 @@ namespace node::crypto {
 constexprunsignedkChaCha20Poly1305AuthTagLength = 16;
 
 structChaCha20Poly1305CipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ncrypto::Cipher cipher;
  ByteSource iv;
  ByteSource additional_data;

src/crypto/crypto_cipher.h

@@ -268,9 +268,8 @@ class CipherJob final : public CryptoJob<CipherTraits> {
 
 SET_SELF_SIZE(CipherJob)
  void MemoryInfo(MemoryTracker* tracker) constoverride {
-if (IsCryptoJobAsync(CryptoJob<CipherTraits>::mode()))
- tracker->TrackFieldWithSize("in", in_.size());
- tracker->TrackFieldWithSize("out", out_.size());
+ tracker->TraitTrackInline(in_, "in");
+ tracker->TraitTrackInline(out_, "out");
  CryptoJob<CipherTraits>::MemoryInfo(tracker);
  }
 

src/crypto/crypto_hash.cc

@@ -58,7 +58,7 @@ Hash::Hash(Environment* env, Local<Object> wrap) : BaseObject(env, wrap) {
 
 voidHash::MemoryInfo(MemoryTracker* tracker) const {
  tracker->TrackFieldWithSize("mdctx", mdctx_ ? kSizeOf_EVP_MD_CTX : 0);
- tracker->TrackFieldWithSize("md", digest_ ? md_len_ : 0);
+ tracker->TraitTrackInline(digest_, "md");
 }
 
 #if NCRYPTO_USE_BORINGSSL_EVP_DO_ALL_FALLBACK
@@ -524,10 +524,7 @@ void Hash::HashDigest(const FunctionCallbackInfo<Value>& args) {
 }
 
 HashConfig::HashConfig(HashConfig&& other) noexcept
- : mode(other.mode),
-in(std::move(other.in)),
- digest(other.digest),
- length(other.length) {}
+ : in(std::move(other.in)), digest(other.digest), length(other.length) {}
 
 HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 if (&other == this) return *this;
@@ -536,8 +533,7 @@ HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 }
 
 voidHashConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the HashConfig does not own the data.
-if (IsCryptoJobAsync(mode)) tracker->TrackFieldWithSize("in", in.size());
+ tracker->TraitTrackInline(in, "in");
 }
 
 MaybeLocal<Value> HashTraits::EncodeOutput(Environment* env,
@@ -553,8 +549,6 @@ Maybe<void> HashTraits::AdditionalConfig(
  HashConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash algorithm
  Utf8Value digest(env->isolate(), args[offset]);
  params->digest = ncrypto::getDigestByName(*digest);
@@ -782,8 +776,7 @@ bool DigestUpdateBytepad(ncrypto::EVPMDCtxPointer* ctx,
 } // namespace
 
 CShakeConfig::CShakeConfig(CShakeConfig&& other) noexcept
- : mode(other.mode),
- in(std::move(other.in)),
+ : in(std::move(other.in)),
  function_name(std::move(other.function_name)),
  customization(std::move(other.customization)),
  variant(other.variant),
@@ -796,12 +789,9 @@ CShakeConfig& CShakeConfig::operator=(CShakeConfig&& other) noexcept {
 }
 
 voidCShakeConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the CShakeConfig does not own the data.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("in", in.size());
- tracker->TrackFieldWithSize("function_name", function_name.size());
- tracker->TrackFieldWithSize("customization", customization.size());
- }
+ tracker->TraitTrackInline(in, "in");
+ tracker->TraitTrackInline(function_name, "function_name");
+ tracker->TraitTrackInline(customization, "customization");
 }
 
 MaybeLocal<Value> CShakeTraits::EncodeOutput(Environment* env,
@@ -817,8 +807,6 @@ Maybe<void> CShakeTraits::AdditionalConfig(
  CShakeConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Algorithm name
  Utf8Value algorithm_name(env->isolate(), args[offset]);
  std::string_view algorithm_str = algorithm_name.ToStringView();

src/crypto/crypto_hash.h

@@ -42,7 +42,6 @@ class Hash final : public BaseObject {
 };
 
 structHashConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
 constEVP_MD* digest;
 unsignedint length;
@@ -107,7 +106,6 @@ struct CShakeParams final {
 boolDeriveCShakeBits(const CShakeParams& params, ByteSource* out);
 
 structCShakeConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
  ByteSource function_name;
  ByteSource customization;

src/crypto/crypto_hkdf.cc

@@ -20,8 +20,7 @@ using v8::Value;
 
 namespacecrypto {
 HKDFConfig::HKDFConfig(HKDFConfig&& other) noexcept
- : mode(other.mode),
-length(other.length),
+ : length(other.length),
 digest(other.digest),
  key(std::move(other.key)),
  key_data(std::move(other.key_data)),
@@ -47,8 +46,6 @@ Maybe<void> HKDFTraits::AdditionalConfig(
  HKDFConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash
 CHECK(KeyObjectHandle::HasInstance(env, args[offset + 1]) ||
 IsAnyBufferSource(args[offset + 1])); // Key
@@ -136,13 +133,12 @@ bool HKDFTraits::DeriveBits(Environment* env,
 }
 
 voidHKDFConfig::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-// If the job is sync, then the HKDFConfig does not own the data
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("key", key_data.size());
- tracker->TrackFieldWithSize("salt", salt.size());
- tracker->TrackFieldWithSize("info", info.size());
- }
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(key_data, "key");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(info, "info");
 }
 
 } // namespace crypto

src/crypto/crypto_aes.cc

@@ -491,8 +491,7 @@ void UseDefaultIV(AESCipherConfig* params) {
 } // namespace
 
 AESCipherConfig::AESCipherConfig(AESCipherConfig&& other) noexcept
- : mode(other.mode),
-variant(other.variant),
+ : variant(other.variant),
 cipher(other.cipher),
  length(other.length),
  iv(std::move(other.iv)),
@@ -505,12 +504,8 @@ AESCipherConfig& AESCipherConfig::operator=(AESCipherConfig&& other) noexcept {
 }
 
 voidAESCipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the AESCipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> AESCipherTraits::AdditionalConfig(
@@ -521,8 +516,6 @@ Maybe<void> AESCipherTraits::AdditionalConfig(
  AESCipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsUint32()); // Key Variant
  params->variant =
 static_cast<AESKeyVariant>(args[offset].As<Uint32>()->Value());

src/crypto/crypto_aes.h

@@ -58,7 +58,6 @@ enum class AESKeyVariant {
 };
 
 structAESCipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  AESKeyVariant variant;
  ncrypto::Cipher cipher;
 size_t length;

src/crypto/crypto_argon2.cc

@@ -21,8 +21,7 @@ using v8::Uint32;
 using v8::Value;
 
 Argon2Config::Argon2Config(Argon2Config&& other) noexcept
- : mode{other.mode},
- key{std::move(other.key)},
+ : key{std::move(other.key)},
  pass{std::move(other.pass)},
  salt{std::move(other.salt)},
  secret{std::move(other.secret)},
@@ -40,13 +39,13 @@ Argon2Config& Argon2Config::operator=(Argon2Config&& other) noexcept {
 }
 
 voidArgon2Config::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("pass", pass.size());
- tracker->TrackFieldWithSize("salt", salt.size());
-tracker->TrackFieldWithSize("secret", secret.size());
-tracker->TrackFieldWithSize("ad", ad.size());
-}
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(pass, "pass");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(secret, "secret");
+tracker->TraitTrackInline(ad, "ad");
 }
 
 MaybeLocal<Value> Argon2Traits::EncodeOutput(Environment* env,
@@ -62,8 +61,6 @@ Maybe<void> Argon2Traits::AdditionalConfig(
  Argon2Config* config) {
  Environment* env = Environment::GetCurrent(args);
 
- config->mode = mode;
-
 CHECK(KeyObjectHandle::HasInstance(env, args[offset]) ||
 IsAnyBufferSource(args[offset])); // pass
  ArrayBufferOrViewContents<char> salt(args[offset + 1]);

src/crypto/crypto_argon2.h

@@ -22,7 +22,6 @@ namespace node::crypto {
 // at least 16 bytes in length.
 
 structArgon2Configfinal : public MemoryRetainer {
- CryptoJobMode mode;
  KeyObjectData key;
  ByteSource pass;
  ByteSource salt;

src/crypto/crypto_chacha20_poly1305.cc

@@ -81,8 +81,7 @@ bool ValidateAdditionalData(Environment* env,
 
 ChaCha20Poly1305CipherConfig::ChaCha20Poly1305CipherConfig(
  ChaCha20Poly1305CipherConfig&& other) noexcept
- : mode(other.mode),
-cipher(other.cipher),
+ : cipher(other.cipher),
 iv(std::move(other.iv)),
  additional_data(std::move(other.additional_data)) {}
 
@@ -94,12 +93,8 @@ ChaCha20Poly1305CipherConfig& ChaCha20Poly1305CipherConfig::operator=(
 }
 
 voidChaCha20Poly1305CipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the ChaCha20Poly1305CipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
@@ -110,7 +105,6 @@ Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
  ChaCha20Poly1305CipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
  params->cipher = ncrypto::Cipher::CHACHA20_POLY1305;
 
 #ifndef OPENSSL_IS_BORINGSSL

src/crypto/crypto_chacha20_poly1305.h

@@ -13,7 +13,6 @@ namespace node::crypto {
 constexprunsignedkChaCha20Poly1305AuthTagLength = 16;
 
 structChaCha20Poly1305CipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ncrypto::Cipher cipher;
  ByteSource iv;
  ByteSource additional_data;

src/crypto/crypto_cipher.h

@@ -268,9 +268,8 @@ class CipherJob final : public CryptoJob<CipherTraits> {
 
 SET_SELF_SIZE(CipherJob)
  void MemoryInfo(MemoryTracker* tracker) constoverride {
-if (IsCryptoJobAsync(CryptoJob<CipherTraits>::mode()))
- tracker->TrackFieldWithSize("in", in_.size());
- tracker->TrackFieldWithSize("out", out_.size());
+ tracker->TraitTrackInline(in_, "in");
+ tracker->TraitTrackInline(out_, "out");
  CryptoJob<CipherTraits>::MemoryInfo(tracker);
  }
 

src/crypto/crypto_hash.cc

@@ -58,7 +58,7 @@ Hash::Hash(Environment* env, Local<Object> wrap) : BaseObject(env, wrap) {
 
 voidHash::MemoryInfo(MemoryTracker* tracker) const {
  tracker->TrackFieldWithSize("mdctx", mdctx_ ? kSizeOf_EVP_MD_CTX : 0);
- tracker->TrackFieldWithSize("md", digest_ ? md_len_ : 0);
+ tracker->TraitTrackInline(digest_, "md");
 }
 
 #if NCRYPTO_USE_BORINGSSL_EVP_DO_ALL_FALLBACK
@@ -524,10 +524,7 @@ void Hash::HashDigest(const FunctionCallbackInfo<Value>& args) {
 }
 
 HashConfig::HashConfig(HashConfig&& other) noexcept
- : mode(other.mode),
-in(std::move(other.in)),
- digest(other.digest),
- length(other.length) {}
+ : in(std::move(other.in)), digest(other.digest), length(other.length) {}
 
 HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 if (&other == this) return *this;
@@ -536,8 +533,7 @@ HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 }
 
 voidHashConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the HashConfig does not own the data.
-if (IsCryptoJobAsync(mode)) tracker->TrackFieldWithSize("in", in.size());
+ tracker->TraitTrackInline(in, "in");
 }
 
 MaybeLocal<Value> HashTraits::EncodeOutput(Environment* env,
@@ -553,8 +549,6 @@ Maybe<void> HashTraits::AdditionalConfig(
  HashConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash algorithm
  Utf8Value digest(env->isolate(), args[offset]);
  params->digest = ncrypto::getDigestByName(*digest);
@@ -782,8 +776,7 @@ bool DigestUpdateBytepad(ncrypto::EVPMDCtxPointer* ctx,
 } // namespace
 
 CShakeConfig::CShakeConfig(CShakeConfig&& other) noexcept
- : mode(other.mode),
- in(std::move(other.in)),
+ : in(std::move(other.in)),
  function_name(std::move(other.function_name)),
  customization(std::move(other.customization)),
  variant(other.variant),
@@ -796,12 +789,9 @@ CShakeConfig& CShakeConfig::operator=(CShakeConfig&& other) noexcept {
 }
 
 voidCShakeConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the CShakeConfig does not own the data.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("in", in.size());
- tracker->TrackFieldWithSize("function_name", function_name.size());
- tracker->TrackFieldWithSize("customization", customization.size());
- }
+ tracker->TraitTrackInline(in, "in");
+ tracker->TraitTrackInline(function_name, "function_name");
+ tracker->TraitTrackInline(customization, "customization");
 }
 
 MaybeLocal<Value> CShakeTraits::EncodeOutput(Environment* env,
@@ -817,8 +807,6 @@ Maybe<void> CShakeTraits::AdditionalConfig(
  CShakeConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Algorithm name
  Utf8Value algorithm_name(env->isolate(), args[offset]);
  std::string_view algorithm_str = algorithm_name.ToStringView();

src/crypto/crypto_hash.h

@@ -42,7 +42,6 @@ class Hash final : public BaseObject {
 };
 
 structHashConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
 constEVP_MD* digest;
 unsignedint length;
@@ -107,7 +106,6 @@ struct CShakeParams final {
 boolDeriveCShakeBits(const CShakeParams& params, ByteSource* out);
 
 structCShakeConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
  ByteSource function_name;
  ByteSource customization;

src/crypto/crypto_hkdf.cc

@@ -20,8 +20,7 @@ using v8::Value;
 
 namespacecrypto {
 HKDFConfig::HKDFConfig(HKDFConfig&& other) noexcept
- : mode(other.mode),
-length(other.length),
+ : length(other.length),
 digest(other.digest),
  key(std::move(other.key)),
  key_data(std::move(other.key_data)),
@@ -47,8 +46,6 @@ Maybe<void> HKDFTraits::AdditionalConfig(
  HKDFConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash
 CHECK(KeyObjectHandle::HasInstance(env, args[offset + 1]) ||
 IsAnyBufferSource(args[offset + 1])); // Key
@@ -136,13 +133,12 @@ bool HKDFTraits::DeriveBits(Environment* env,
 }
 
 voidHKDFConfig::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-// If the job is sync, then the HKDFConfig does not own the data
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("key", key_data.size());
- tracker->TrackFieldWithSize("salt", salt.size());
- tracker->TrackFieldWithSize("info", info.size());
- }
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(key_data, "key");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(info, "info");
 }
 
 } // namespace crypto

src/crypto/crypto_aes.cc

@@ -491,8 +491,7 @@ void UseDefaultIV(AESCipherConfig* params) {
 } // namespace
 
 AESCipherConfig::AESCipherConfig(AESCipherConfig&& other) noexcept
- : mode(other.mode),
-variant(other.variant),
+ : variant(other.variant),
 cipher(other.cipher),
  length(other.length),
  iv(std::move(other.iv)),
@@ -505,12 +504,8 @@ AESCipherConfig& AESCipherConfig::operator=(AESCipherConfig&& other) noexcept {
 }
 
 voidAESCipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the AESCipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> AESCipherTraits::AdditionalConfig(
@@ -521,8 +516,6 @@ Maybe<void> AESCipherTraits::AdditionalConfig(
  AESCipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsUint32()); // Key Variant
  params->variant =
 static_cast<AESKeyVariant>(args[offset].As<Uint32>()->Value());

src/crypto/crypto_aes.h

@@ -58,7 +58,6 @@ enum class AESKeyVariant {
 };
 
 structAESCipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  AESKeyVariant variant;
  ncrypto::Cipher cipher;
 size_t length;

src/crypto/crypto_argon2.cc

@@ -21,8 +21,7 @@ using v8::Uint32;
 using v8::Value;
 
 Argon2Config::Argon2Config(Argon2Config&& other) noexcept
- : mode{other.mode},
- key{std::move(other.key)},
+ : key{std::move(other.key)},
  pass{std::move(other.pass)},
  salt{std::move(other.salt)},
  secret{std::move(other.secret)},
@@ -40,13 +39,13 @@ Argon2Config& Argon2Config::operator=(Argon2Config&& other) noexcept {
 }
 
 voidArgon2Config::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("pass", pass.size());
- tracker->TrackFieldWithSize("salt", salt.size());
-tracker->TrackFieldWithSize("secret", secret.size());
-tracker->TrackFieldWithSize("ad", ad.size());
-}
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(pass, "pass");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(secret, "secret");
+tracker->TraitTrackInline(ad, "ad");
 }
 
 MaybeLocal<Value> Argon2Traits::EncodeOutput(Environment* env,
@@ -62,8 +61,6 @@ Maybe<void> Argon2Traits::AdditionalConfig(
  Argon2Config* config) {
  Environment* env = Environment::GetCurrent(args);
 
- config->mode = mode;
-
 CHECK(KeyObjectHandle::HasInstance(env, args[offset]) ||
 IsAnyBufferSource(args[offset])); // pass
  ArrayBufferOrViewContents<char> salt(args[offset + 1]);

src/crypto/crypto_argon2.h

@@ -22,7 +22,6 @@ namespace node::crypto {
 // at least 16 bytes in length.
 
 structArgon2Configfinal : public MemoryRetainer {
- CryptoJobMode mode;
  KeyObjectData key;
  ByteSource pass;
  ByteSource salt;

src/crypto/crypto_chacha20_poly1305.cc

@@ -81,8 +81,7 @@ bool ValidateAdditionalData(Environment* env,
 
 ChaCha20Poly1305CipherConfig::ChaCha20Poly1305CipherConfig(
  ChaCha20Poly1305CipherConfig&& other) noexcept
- : mode(other.mode),
-cipher(other.cipher),
+ : cipher(other.cipher),
 iv(std::move(other.iv)),
  additional_data(std::move(other.additional_data)) {}
 
@@ -94,12 +93,8 @@ ChaCha20Poly1305CipherConfig& ChaCha20Poly1305CipherConfig::operator=(
 }
 
 voidChaCha20Poly1305CipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the ChaCha20Poly1305CipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
@@ -110,7 +105,6 @@ Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
  ChaCha20Poly1305CipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
  params->cipher = ncrypto::Cipher::CHACHA20_POLY1305;
 
 #ifndef OPENSSL_IS_BORINGSSL

src/crypto/crypto_chacha20_poly1305.h

@@ -13,7 +13,6 @@ namespace node::crypto {
 constexprunsignedkChaCha20Poly1305AuthTagLength = 16;
 
 structChaCha20Poly1305CipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ncrypto::Cipher cipher;
  ByteSource iv;
  ByteSource additional_data;

src/crypto/crypto_cipher.h

@@ -268,9 +268,8 @@ class CipherJob final : public CryptoJob<CipherTraits> {
 
 SET_SELF_SIZE(CipherJob)
  void MemoryInfo(MemoryTracker* tracker) constoverride {
-if (IsCryptoJobAsync(CryptoJob<CipherTraits>::mode()))
- tracker->TrackFieldWithSize("in", in_.size());
- tracker->TrackFieldWithSize("out", out_.size());
+ tracker->TraitTrackInline(in_, "in");
+ tracker->TraitTrackInline(out_, "out");
  CryptoJob<CipherTraits>::MemoryInfo(tracker);
  }
 

src/crypto/crypto_hash.cc

@@ -58,7 +58,7 @@ Hash::Hash(Environment* env, Local<Object> wrap) : BaseObject(env, wrap) {
 
 voidHash::MemoryInfo(MemoryTracker* tracker) const {
  tracker->TrackFieldWithSize("mdctx", mdctx_ ? kSizeOf_EVP_MD_CTX : 0);
- tracker->TrackFieldWithSize("md", digest_ ? md_len_ : 0);
+ tracker->TraitTrackInline(digest_, "md");
 }
 
 #if NCRYPTO_USE_BORINGSSL_EVP_DO_ALL_FALLBACK
@@ -524,10 +524,7 @@ void Hash::HashDigest(const FunctionCallbackInfo<Value>& args) {
 }
 
 HashConfig::HashConfig(HashConfig&& other) noexcept
- : mode(other.mode),
-in(std::move(other.in)),
- digest(other.digest),
- length(other.length) {}
+ : in(std::move(other.in)), digest(other.digest), length(other.length) {}
 
 HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 if (&other == this) return *this;
@@ -536,8 +533,7 @@ HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 }
 
 voidHashConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the HashConfig does not own the data.
-if (IsCryptoJobAsync(mode)) tracker->TrackFieldWithSize("in", in.size());
+ tracker->TraitTrackInline(in, "in");
 }
 
 MaybeLocal<Value> HashTraits::EncodeOutput(Environment* env,
@@ -553,8 +549,6 @@ Maybe<void> HashTraits::AdditionalConfig(
  HashConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash algorithm
  Utf8Value digest(env->isolate(), args[offset]);
  params->digest = ncrypto::getDigestByName(*digest);
@@ -782,8 +776,7 @@ bool DigestUpdateBytepad(ncrypto::EVPMDCtxPointer* ctx,
 } // namespace
 
 CShakeConfig::CShakeConfig(CShakeConfig&& other) noexcept
- : mode(other.mode),
- in(std::move(other.in)),
+ : in(std::move(other.in)),
  function_name(std::move(other.function_name)),
  customization(std::move(other.customization)),
  variant(other.variant),
@@ -796,12 +789,9 @@ CShakeConfig& CShakeConfig::operator=(CShakeConfig&& other) noexcept {
 }
 
 voidCShakeConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the CShakeConfig does not own the data.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("in", in.size());
- tracker->TrackFieldWithSize("function_name", function_name.size());
- tracker->TrackFieldWithSize("customization", customization.size());
- }
+ tracker->TraitTrackInline(in, "in");
+ tracker->TraitTrackInline(function_name, "function_name");
+ tracker->TraitTrackInline(customization, "customization");
 }
 
 MaybeLocal<Value> CShakeTraits::EncodeOutput(Environment* env,
@@ -817,8 +807,6 @@ Maybe<void> CShakeTraits::AdditionalConfig(
  CShakeConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Algorithm name
  Utf8Value algorithm_name(env->isolate(), args[offset]);
  std::string_view algorithm_str = algorithm_name.ToStringView();

src/crypto/crypto_hash.h

@@ -42,7 +42,6 @@ class Hash final : public BaseObject {
 };
 
 structHashConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
 constEVP_MD* digest;
 unsignedint length;
@@ -107,7 +106,6 @@ struct CShakeParams final {
 boolDeriveCShakeBits(const CShakeParams& params, ByteSource* out);
 
 structCShakeConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
  ByteSource function_name;
  ByteSource customization;

src/crypto/crypto_hkdf.cc

@@ -20,8 +20,7 @@ using v8::Value;
 
 namespacecrypto {
 HKDFConfig::HKDFConfig(HKDFConfig&& other) noexcept
- : mode(other.mode),
-length(other.length),
+ : length(other.length),
 digest(other.digest),
  key(std::move(other.key)),
  key_data(std::move(other.key_data)),
@@ -47,8 +46,6 @@ Maybe<void> HKDFTraits::AdditionalConfig(
  HKDFConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash
 CHECK(KeyObjectHandle::HasInstance(env, args[offset + 1]) ||
 IsAnyBufferSource(args[offset + 1])); // Key
@@ -136,13 +133,12 @@ bool HKDFTraits::DeriveBits(Environment* env,
 }
 
 voidHKDFConfig::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-// If the job is sync, then the HKDFConfig does not own the data
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("key", key_data.size());
- tracker->TrackFieldWithSize("salt", salt.size());
- tracker->TrackFieldWithSize("info", info.size());
- }
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(key_data, "key");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(info, "info");
 }
 
 } // namespace crypto

src/crypto/crypto_aes.cc

@@ -491,8 +491,7 @@ void UseDefaultIV(AESCipherConfig* params) {
 } // namespace
 
 AESCipherConfig::AESCipherConfig(AESCipherConfig&& other) noexcept
- : mode(other.mode),
-variant(other.variant),
+ : variant(other.variant),
 cipher(other.cipher),
  length(other.length),
  iv(std::move(other.iv)),
@@ -505,12 +504,8 @@ AESCipherConfig& AESCipherConfig::operator=(AESCipherConfig&& other) noexcept {
 }
 
 voidAESCipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the AESCipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> AESCipherTraits::AdditionalConfig(
@@ -521,8 +516,6 @@ Maybe<void> AESCipherTraits::AdditionalConfig(
  AESCipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsUint32()); // Key Variant
  params->variant =
 static_cast<AESKeyVariant>(args[offset].As<Uint32>()->Value());

src/crypto/crypto_aes.h

@@ -58,7 +58,6 @@ enum class AESKeyVariant {
 };
 
 structAESCipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  AESKeyVariant variant;
  ncrypto::Cipher cipher;
 size_t length;

src/crypto/crypto_argon2.cc

@@ -21,8 +21,7 @@ using v8::Uint32;
 using v8::Value;
 
 Argon2Config::Argon2Config(Argon2Config&& other) noexcept
- : mode{other.mode},
- key{std::move(other.key)},
+ : key{std::move(other.key)},
  pass{std::move(other.pass)},
  salt{std::move(other.salt)},
  secret{std::move(other.secret)},
@@ -40,13 +39,13 @@ Argon2Config& Argon2Config::operator=(Argon2Config&& other) noexcept {
 }
 
 voidArgon2Config::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("pass", pass.size());
- tracker->TrackFieldWithSize("salt", salt.size());
-tracker->TrackFieldWithSize("secret", secret.size());
-tracker->TrackFieldWithSize("ad", ad.size());
-}
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(pass, "pass");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(secret, "secret");
+tracker->TraitTrackInline(ad, "ad");
 }
 
 MaybeLocal<Value> Argon2Traits::EncodeOutput(Environment* env,
@@ -62,8 +61,6 @@ Maybe<void> Argon2Traits::AdditionalConfig(
  Argon2Config* config) {
  Environment* env = Environment::GetCurrent(args);
 
- config->mode = mode;
-
 CHECK(KeyObjectHandle::HasInstance(env, args[offset]) ||
 IsAnyBufferSource(args[offset])); // pass
  ArrayBufferOrViewContents<char> salt(args[offset + 1]);

src/crypto/crypto_argon2.h

@@ -22,7 +22,6 @@ namespace node::crypto {
 // at least 16 bytes in length.
 
 structArgon2Configfinal : public MemoryRetainer {
- CryptoJobMode mode;
  KeyObjectData key;
  ByteSource pass;
  ByteSource salt;

src/crypto/crypto_chacha20_poly1305.cc

@@ -81,8 +81,7 @@ bool ValidateAdditionalData(Environment* env,
 
 ChaCha20Poly1305CipherConfig::ChaCha20Poly1305CipherConfig(
  ChaCha20Poly1305CipherConfig&& other) noexcept
- : mode(other.mode),
-cipher(other.cipher),
+ : cipher(other.cipher),
 iv(std::move(other.iv)),
  additional_data(std::move(other.additional_data)) {}
 
@@ -94,12 +93,8 @@ ChaCha20Poly1305CipherConfig& ChaCha20Poly1305CipherConfig::operator=(
 }
 
 voidChaCha20Poly1305CipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the ChaCha20Poly1305CipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
@@ -110,7 +105,6 @@ Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
  ChaCha20Poly1305CipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
  params->cipher = ncrypto::Cipher::CHACHA20_POLY1305;
 
 #ifndef OPENSSL_IS_BORINGSSL

src/crypto/crypto_chacha20_poly1305.h

@@ -13,7 +13,6 @@ namespace node::crypto {
 constexprunsignedkChaCha20Poly1305AuthTagLength = 16;
 
 structChaCha20Poly1305CipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ncrypto::Cipher cipher;
  ByteSource iv;
  ByteSource additional_data;

src/crypto/crypto_cipher.h

@@ -268,9 +268,8 @@ class CipherJob final : public CryptoJob<CipherTraits> {
 
 SET_SELF_SIZE(CipherJob)
  void MemoryInfo(MemoryTracker* tracker) constoverride {
-if (IsCryptoJobAsync(CryptoJob<CipherTraits>::mode()))
- tracker->TrackFieldWithSize("in", in_.size());
- tracker->TrackFieldWithSize("out", out_.size());
+ tracker->TraitTrackInline(in_, "in");
+ tracker->TraitTrackInline(out_, "out");
  CryptoJob<CipherTraits>::MemoryInfo(tracker);
  }
 

src/crypto/crypto_hash.cc

@@ -58,7 +58,7 @@ Hash::Hash(Environment* env, Local<Object> wrap) : BaseObject(env, wrap) {
 
 voidHash::MemoryInfo(MemoryTracker* tracker) const {
  tracker->TrackFieldWithSize("mdctx", mdctx_ ? kSizeOf_EVP_MD_CTX : 0);
- tracker->TrackFieldWithSize("md", digest_ ? md_len_ : 0);
+ tracker->TraitTrackInline(digest_, "md");
 }
 
 #if NCRYPTO_USE_BORINGSSL_EVP_DO_ALL_FALLBACK
@@ -524,10 +524,7 @@ void Hash::HashDigest(const FunctionCallbackInfo<Value>& args) {
 }
 
 HashConfig::HashConfig(HashConfig&& other) noexcept
- : mode(other.mode),
-in(std::move(other.in)),
- digest(other.digest),
- length(other.length) {}
+ : in(std::move(other.in)), digest(other.digest), length(other.length) {}
 
 HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 if (&other == this) return *this;
@@ -536,8 +533,7 @@ HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 }
 
 voidHashConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the HashConfig does not own the data.
-if (IsCryptoJobAsync(mode)) tracker->TrackFieldWithSize("in", in.size());
+ tracker->TraitTrackInline(in, "in");
 }
 
 MaybeLocal<Value> HashTraits::EncodeOutput(Environment* env,
@@ -553,8 +549,6 @@ Maybe<void> HashTraits::AdditionalConfig(
  HashConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash algorithm
  Utf8Value digest(env->isolate(), args[offset]);
  params->digest = ncrypto::getDigestByName(*digest);
@@ -782,8 +776,7 @@ bool DigestUpdateBytepad(ncrypto::EVPMDCtxPointer* ctx,
 } // namespace
 
 CShakeConfig::CShakeConfig(CShakeConfig&& other) noexcept
- : mode(other.mode),
- in(std::move(other.in)),
+ : in(std::move(other.in)),
  function_name(std::move(other.function_name)),
  customization(std::move(other.customization)),
  variant(other.variant),
@@ -796,12 +789,9 @@ CShakeConfig& CShakeConfig::operator=(CShakeConfig&& other) noexcept {
 }
 
 voidCShakeConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the CShakeConfig does not own the data.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("in", in.size());
- tracker->TrackFieldWithSize("function_name", function_name.size());
- tracker->TrackFieldWithSize("customization", customization.size());
- }
+ tracker->TraitTrackInline(in, "in");
+ tracker->TraitTrackInline(function_name, "function_name");
+ tracker->TraitTrackInline(customization, "customization");
 }
 
 MaybeLocal<Value> CShakeTraits::EncodeOutput(Environment* env,
@@ -817,8 +807,6 @@ Maybe<void> CShakeTraits::AdditionalConfig(
  CShakeConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Algorithm name
  Utf8Value algorithm_name(env->isolate(), args[offset]);
  std::string_view algorithm_str = algorithm_name.ToStringView();

src/crypto/crypto_hash.h

@@ -42,7 +42,6 @@ class Hash final : public BaseObject {
 };
 
 structHashConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
 constEVP_MD* digest;
 unsignedint length;
@@ -107,7 +106,6 @@ struct CShakeParams final {
 boolDeriveCShakeBits(const CShakeParams& params, ByteSource* out);
 
 structCShakeConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
  ByteSource function_name;
  ByteSource customization;

src/crypto/crypto_hkdf.cc

@@ -20,8 +20,7 @@ using v8::Value;
 
 namespacecrypto {
 HKDFConfig::HKDFConfig(HKDFConfig&& other) noexcept
- : mode(other.mode),
-length(other.length),
+ : length(other.length),
 digest(other.digest),
  key(std::move(other.key)),
  key_data(std::move(other.key_data)),
@@ -47,8 +46,6 @@ Maybe<void> HKDFTraits::AdditionalConfig(
  HKDFConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash
 CHECK(KeyObjectHandle::HasInstance(env, args[offset + 1]) ||
 IsAnyBufferSource(args[offset + 1])); // Key
@@ -136,13 +133,12 @@ bool HKDFTraits::DeriveBits(Environment* env,
 }
 
 voidHKDFConfig::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-// If the job is sync, then the HKDFConfig does not own the data
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("key", key_data.size());
- tracker->TrackFieldWithSize("salt", salt.size());
- tracker->TrackFieldWithSize("info", info.size());
- }
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(key_data, "key");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(info, "info");
 }
 
 } // namespace crypto

src/crypto/crypto_aes.cc

@@ -491,8 +491,7 @@ void UseDefaultIV(AESCipherConfig* params) {
 } // namespace
 
 AESCipherConfig::AESCipherConfig(AESCipherConfig&& other) noexcept
- : mode(other.mode),
-variant(other.variant),
+ : variant(other.variant),
 cipher(other.cipher),
  length(other.length),
  iv(std::move(other.iv)),
@@ -505,12 +504,8 @@ AESCipherConfig& AESCipherConfig::operator=(AESCipherConfig&& other) noexcept {
 }
 
 voidAESCipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the AESCipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> AESCipherTraits::AdditionalConfig(
@@ -521,8 +516,6 @@ Maybe<void> AESCipherTraits::AdditionalConfig(
  AESCipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsUint32()); // Key Variant
  params->variant =
 static_cast<AESKeyVariant>(args[offset].As<Uint32>()->Value());

src/crypto/crypto_aes.h

@@ -58,7 +58,6 @@ enum class AESKeyVariant {
 };
 
 structAESCipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  AESKeyVariant variant;
  ncrypto::Cipher cipher;
 size_t length;

src/crypto/crypto_argon2.cc

@@ -21,8 +21,7 @@ using v8::Uint32;
 using v8::Value;
 
 Argon2Config::Argon2Config(Argon2Config&& other) noexcept
- : mode{other.mode},
- key{std::move(other.key)},
+ : key{std::move(other.key)},
  pass{std::move(other.pass)},
  salt{std::move(other.salt)},
  secret{std::move(other.secret)},
@@ -40,13 +39,13 @@ Argon2Config& Argon2Config::operator=(Argon2Config&& other) noexcept {
 }
 
 voidArgon2Config::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("pass", pass.size());
- tracker->TrackFieldWithSize("salt", salt.size());
-tracker->TrackFieldWithSize("secret", secret.size());
-tracker->TrackFieldWithSize("ad", ad.size());
-}
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(pass, "pass");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(secret, "secret");
+tracker->TraitTrackInline(ad, "ad");
 }
 
 MaybeLocal<Value> Argon2Traits::EncodeOutput(Environment* env,
@@ -62,8 +61,6 @@ Maybe<void> Argon2Traits::AdditionalConfig(
  Argon2Config* config) {
  Environment* env = Environment::GetCurrent(args);
 
- config->mode = mode;
-
 CHECK(KeyObjectHandle::HasInstance(env, args[offset]) ||
 IsAnyBufferSource(args[offset])); // pass
  ArrayBufferOrViewContents<char> salt(args[offset + 1]);

src/crypto/crypto_argon2.h

@@ -22,7 +22,6 @@ namespace node::crypto {
 // at least 16 bytes in length.
 
 structArgon2Configfinal : public MemoryRetainer {
- CryptoJobMode mode;
  KeyObjectData key;
  ByteSource pass;
  ByteSource salt;

src/crypto/crypto_chacha20_poly1305.cc

@@ -81,8 +81,7 @@ bool ValidateAdditionalData(Environment* env,
 
 ChaCha20Poly1305CipherConfig::ChaCha20Poly1305CipherConfig(
  ChaCha20Poly1305CipherConfig&& other) noexcept
- : mode(other.mode),
-cipher(other.cipher),
+ : cipher(other.cipher),
 iv(std::move(other.iv)),
  additional_data(std::move(other.additional_data)) {}
 
@@ -94,12 +93,8 @@ ChaCha20Poly1305CipherConfig& ChaCha20Poly1305CipherConfig::operator=(
 }
 
 voidChaCha20Poly1305CipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the ChaCha20Poly1305CipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
@@ -110,7 +105,6 @@ Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
  ChaCha20Poly1305CipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
  params->cipher = ncrypto::Cipher::CHACHA20_POLY1305;
 
 #ifndef OPENSSL_IS_BORINGSSL

src/crypto/crypto_chacha20_poly1305.h

@@ -13,7 +13,6 @@ namespace node::crypto {
 constexprunsignedkChaCha20Poly1305AuthTagLength = 16;
 
 structChaCha20Poly1305CipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ncrypto::Cipher cipher;
  ByteSource iv;
  ByteSource additional_data;

src/crypto/crypto_cipher.h

@@ -268,9 +268,8 @@ class CipherJob final : public CryptoJob<CipherTraits> {
 
 SET_SELF_SIZE(CipherJob)
  void MemoryInfo(MemoryTracker* tracker) constoverride {
-if (IsCryptoJobAsync(CryptoJob<CipherTraits>::mode()))
- tracker->TrackFieldWithSize("in", in_.size());
- tracker->TrackFieldWithSize("out", out_.size());
+ tracker->TraitTrackInline(in_, "in");
+ tracker->TraitTrackInline(out_, "out");
  CryptoJob<CipherTraits>::MemoryInfo(tracker);
  }
 

src/crypto/crypto_hash.cc

@@ -58,7 +58,7 @@ Hash::Hash(Environment* env, Local<Object> wrap) : BaseObject(env, wrap) {
 
 voidHash::MemoryInfo(MemoryTracker* tracker) const {
  tracker->TrackFieldWithSize("mdctx", mdctx_ ? kSizeOf_EVP_MD_CTX : 0);
- tracker->TrackFieldWithSize("md", digest_ ? md_len_ : 0);
+ tracker->TraitTrackInline(digest_, "md");
 }
 
 #if NCRYPTO_USE_BORINGSSL_EVP_DO_ALL_FALLBACK
@@ -524,10 +524,7 @@ void Hash::HashDigest(const FunctionCallbackInfo<Value>& args) {
 }
 
 HashConfig::HashConfig(HashConfig&& other) noexcept
- : mode(other.mode),
-in(std::move(other.in)),
- digest(other.digest),
- length(other.length) {}
+ : in(std::move(other.in)), digest(other.digest), length(other.length) {}
 
 HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 if (&other == this) return *this;
@@ -536,8 +533,7 @@ HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 }
 
 voidHashConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the HashConfig does not own the data.
-if (IsCryptoJobAsync(mode)) tracker->TrackFieldWithSize("in", in.size());
+ tracker->TraitTrackInline(in, "in");
 }
 
 MaybeLocal<Value> HashTraits::EncodeOutput(Environment* env,
@@ -553,8 +549,6 @@ Maybe<void> HashTraits::AdditionalConfig(
  HashConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash algorithm
  Utf8Value digest(env->isolate(), args[offset]);
  params->digest = ncrypto::getDigestByName(*digest);
@@ -782,8 +776,7 @@ bool DigestUpdateBytepad(ncrypto::EVPMDCtxPointer* ctx,
 } // namespace
 
 CShakeConfig::CShakeConfig(CShakeConfig&& other) noexcept
- : mode(other.mode),
- in(std::move(other.in)),
+ : in(std::move(other.in)),
  function_name(std::move(other.function_name)),
  customization(std::move(other.customization)),
  variant(other.variant),
@@ -796,12 +789,9 @@ CShakeConfig& CShakeConfig::operator=(CShakeConfig&& other) noexcept {
 }
 
 voidCShakeConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the CShakeConfig does not own the data.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("in", in.size());
- tracker->TrackFieldWithSize("function_name", function_name.size());
- tracker->TrackFieldWithSize("customization", customization.size());
- }
+ tracker->TraitTrackInline(in, "in");
+ tracker->TraitTrackInline(function_name, "function_name");
+ tracker->TraitTrackInline(customization, "customization");
 }
 
 MaybeLocal<Value> CShakeTraits::EncodeOutput(Environment* env,
@@ -817,8 +807,6 @@ Maybe<void> CShakeTraits::AdditionalConfig(
  CShakeConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Algorithm name
  Utf8Value algorithm_name(env->isolate(), args[offset]);
  std::string_view algorithm_str = algorithm_name.ToStringView();

src/crypto/crypto_hash.h

@@ -42,7 +42,6 @@ class Hash final : public BaseObject {
 };
 
 structHashConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
 constEVP_MD* digest;
 unsignedint length;
@@ -107,7 +106,6 @@ struct CShakeParams final {
 boolDeriveCShakeBits(const CShakeParams& params, ByteSource* out);
 
 structCShakeConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
  ByteSource function_name;
  ByteSource customization;

src/crypto/crypto_hkdf.cc

@@ -20,8 +20,7 @@ using v8::Value;
 
 namespacecrypto {
 HKDFConfig::HKDFConfig(HKDFConfig&& other) noexcept
- : mode(other.mode),
-length(other.length),
+ : length(other.length),
 digest(other.digest),
  key(std::move(other.key)),
  key_data(std::move(other.key_data)),
@@ -47,8 +46,6 @@ Maybe<void> HKDFTraits::AdditionalConfig(
  HKDFConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash
 CHECK(KeyObjectHandle::HasInstance(env, args[offset + 1]) ||
 IsAnyBufferSource(args[offset + 1])); // Key
@@ -136,13 +133,12 @@ bool HKDFTraits::DeriveBits(Environment* env,
 }
 
 voidHKDFConfig::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-// If the job is sync, then the HKDFConfig does not own the data
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("key", key_data.size());
- tracker->TrackFieldWithSize("salt", salt.size());
- tracker->TrackFieldWithSize("info", info.size());
- }
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(key_data, "key");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(info, "info");
 }
 
 } // namespace crypto

src/crypto/crypto_aes.cc

@@ -491,8 +491,7 @@ void UseDefaultIV(AESCipherConfig* params) {
 } // namespace
 
 AESCipherConfig::AESCipherConfig(AESCipherConfig&& other) noexcept
- : mode(other.mode),
-variant(other.variant),
+ : variant(other.variant),
 cipher(other.cipher),
  length(other.length),
  iv(std::move(other.iv)),
@@ -505,12 +504,8 @@ AESCipherConfig& AESCipherConfig::operator=(AESCipherConfig&& other) noexcept {
 }
 
 voidAESCipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the AESCipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> AESCipherTraits::AdditionalConfig(
@@ -521,8 +516,6 @@ Maybe<void> AESCipherTraits::AdditionalConfig(
  AESCipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsUint32()); // Key Variant
  params->variant =
 static_cast<AESKeyVariant>(args[offset].As<Uint32>()->Value());

src/crypto/crypto_aes.h

@@ -58,7 +58,6 @@ enum class AESKeyVariant {
 };
 
 structAESCipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  AESKeyVariant variant;
  ncrypto::Cipher cipher;
 size_t length;

src/crypto/crypto_argon2.cc

@@ -21,8 +21,7 @@ using v8::Uint32;
 using v8::Value;
 
 Argon2Config::Argon2Config(Argon2Config&& other) noexcept
- : mode{other.mode},
- key{std::move(other.key)},
+ : key{std::move(other.key)},
  pass{std::move(other.pass)},
  salt{std::move(other.salt)},
  secret{std::move(other.secret)},
@@ -40,13 +39,13 @@ Argon2Config& Argon2Config::operator=(Argon2Config&& other) noexcept {
 }
 
 voidArgon2Config::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("pass", pass.size());
- tracker->TrackFieldWithSize("salt", salt.size());
-tracker->TrackFieldWithSize("secret", secret.size());
-tracker->TrackFieldWithSize("ad", ad.size());
-}
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(pass, "pass");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(secret, "secret");
+tracker->TraitTrackInline(ad, "ad");
 }
 
 MaybeLocal<Value> Argon2Traits::EncodeOutput(Environment* env,
@@ -62,8 +61,6 @@ Maybe<void> Argon2Traits::AdditionalConfig(
  Argon2Config* config) {
  Environment* env = Environment::GetCurrent(args);
 
- config->mode = mode;
-
 CHECK(KeyObjectHandle::HasInstance(env, args[offset]) ||
 IsAnyBufferSource(args[offset])); // pass
  ArrayBufferOrViewContents<char> salt(args[offset + 1]);

src/crypto/crypto_argon2.h

@@ -22,7 +22,6 @@ namespace node::crypto {
 // at least 16 bytes in length.
 
 structArgon2Configfinal : public MemoryRetainer {
- CryptoJobMode mode;
  KeyObjectData key;
  ByteSource pass;
  ByteSource salt;

src/crypto/crypto_chacha20_poly1305.cc

@@ -81,8 +81,7 @@ bool ValidateAdditionalData(Environment* env,
 
 ChaCha20Poly1305CipherConfig::ChaCha20Poly1305CipherConfig(
  ChaCha20Poly1305CipherConfig&& other) noexcept
- : mode(other.mode),
-cipher(other.cipher),
+ : cipher(other.cipher),
 iv(std::move(other.iv)),
  additional_data(std::move(other.additional_data)) {}
 
@@ -94,12 +93,8 @@ ChaCha20Poly1305CipherConfig& ChaCha20Poly1305CipherConfig::operator=(
 }
 
 voidChaCha20Poly1305CipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the ChaCha20Poly1305CipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
@@ -110,7 +105,6 @@ Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
  ChaCha20Poly1305CipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
  params->cipher = ncrypto::Cipher::CHACHA20_POLY1305;
 
 #ifndef OPENSSL_IS_BORINGSSL

src/crypto/crypto_chacha20_poly1305.h

@@ -13,7 +13,6 @@ namespace node::crypto {
 constexprunsignedkChaCha20Poly1305AuthTagLength = 16;
 
 structChaCha20Poly1305CipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ncrypto::Cipher cipher;
  ByteSource iv;
  ByteSource additional_data;

src/crypto/crypto_cipher.h

@@ -268,9 +268,8 @@ class CipherJob final : public CryptoJob<CipherTraits> {
 
 SET_SELF_SIZE(CipherJob)
  void MemoryInfo(MemoryTracker* tracker) constoverride {
-if (IsCryptoJobAsync(CryptoJob<CipherTraits>::mode()))
- tracker->TrackFieldWithSize("in", in_.size());
- tracker->TrackFieldWithSize("out", out_.size());
+ tracker->TraitTrackInline(in_, "in");
+ tracker->TraitTrackInline(out_, "out");
  CryptoJob<CipherTraits>::MemoryInfo(tracker);
  }
 

src/crypto/crypto_hash.cc

@@ -58,7 +58,7 @@ Hash::Hash(Environment* env, Local<Object> wrap) : BaseObject(env, wrap) {
 
 voidHash::MemoryInfo(MemoryTracker* tracker) const {
  tracker->TrackFieldWithSize("mdctx", mdctx_ ? kSizeOf_EVP_MD_CTX : 0);
- tracker->TrackFieldWithSize("md", digest_ ? md_len_ : 0);
+ tracker->TraitTrackInline(digest_, "md");
 }
 
 #if NCRYPTO_USE_BORINGSSL_EVP_DO_ALL_FALLBACK
@@ -524,10 +524,7 @@ void Hash::HashDigest(const FunctionCallbackInfo<Value>& args) {
 }
 
 HashConfig::HashConfig(HashConfig&& other) noexcept
- : mode(other.mode),
-in(std::move(other.in)),
- digest(other.digest),
- length(other.length) {}
+ : in(std::move(other.in)), digest(other.digest), length(other.length) {}
 
 HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 if (&other == this) return *this;
@@ -536,8 +533,7 @@ HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 }
 
 voidHashConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the HashConfig does not own the data.
-if (IsCryptoJobAsync(mode)) tracker->TrackFieldWithSize("in", in.size());
+ tracker->TraitTrackInline(in, "in");
 }
 
 MaybeLocal<Value> HashTraits::EncodeOutput(Environment* env,
@@ -553,8 +549,6 @@ Maybe<void> HashTraits::AdditionalConfig(
  HashConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash algorithm
  Utf8Value digest(env->isolate(), args[offset]);
  params->digest = ncrypto::getDigestByName(*digest);
@@ -782,8 +776,7 @@ bool DigestUpdateBytepad(ncrypto::EVPMDCtxPointer* ctx,
 } // namespace
 
 CShakeConfig::CShakeConfig(CShakeConfig&& other) noexcept
- : mode(other.mode),
- in(std::move(other.in)),
+ : in(std::move(other.in)),
  function_name(std::move(other.function_name)),
  customization(std::move(other.customization)),
  variant(other.variant),
@@ -796,12 +789,9 @@ CShakeConfig& CShakeConfig::operator=(CShakeConfig&& other) noexcept {
 }
 
 voidCShakeConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the CShakeConfig does not own the data.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("in", in.size());
- tracker->TrackFieldWithSize("function_name", function_name.size());
- tracker->TrackFieldWithSize("customization", customization.size());
- }
+ tracker->TraitTrackInline(in, "in");
+ tracker->TraitTrackInline(function_name, "function_name");
+ tracker->TraitTrackInline(customization, "customization");
 }
 
 MaybeLocal<Value> CShakeTraits::EncodeOutput(Environment* env,
@@ -817,8 +807,6 @@ Maybe<void> CShakeTraits::AdditionalConfig(
  CShakeConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Algorithm name
  Utf8Value algorithm_name(env->isolate(), args[offset]);
  std::string_view algorithm_str = algorithm_name.ToStringView();

src/crypto/crypto_hash.h

@@ -42,7 +42,6 @@ class Hash final : public BaseObject {
 };
 
 structHashConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
 constEVP_MD* digest;
 unsignedint length;
@@ -107,7 +106,6 @@ struct CShakeParams final {
 boolDeriveCShakeBits(const CShakeParams& params, ByteSource* out);
 
 structCShakeConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
  ByteSource function_name;
  ByteSource customization;

src/crypto/crypto_hkdf.cc

@@ -20,8 +20,7 @@ using v8::Value;
 
 namespacecrypto {
 HKDFConfig::HKDFConfig(HKDFConfig&& other) noexcept
- : mode(other.mode),
-length(other.length),
+ : length(other.length),
 digest(other.digest),
  key(std::move(other.key)),
  key_data(std::move(other.key_data)),
@@ -47,8 +46,6 @@ Maybe<void> HKDFTraits::AdditionalConfig(
  HKDFConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash
 CHECK(KeyObjectHandle::HasInstance(env, args[offset + 1]) ||
 IsAnyBufferSource(args[offset + 1])); // Key
@@ -136,13 +133,12 @@ bool HKDFTraits::DeriveBits(Environment* env,
 }
 
 voidHKDFConfig::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-// If the job is sync, then the HKDFConfig does not own the data
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("key", key_data.size());
- tracker->TrackFieldWithSize("salt", salt.size());
- tracker->TrackFieldWithSize("info", info.size());
- }
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(key_data, "key");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(info, "info");
 }
 
 } // namespace crypto

src/crypto/crypto_aes.cc

@@ -491,8 +491,7 @@ void UseDefaultIV(AESCipherConfig* params) {
 } // namespace
 
 AESCipherConfig::AESCipherConfig(AESCipherConfig&& other) noexcept
- : mode(other.mode),
-variant(other.variant),
+ : variant(other.variant),
 cipher(other.cipher),
  length(other.length),
  iv(std::move(other.iv)),
@@ -505,12 +504,8 @@ AESCipherConfig& AESCipherConfig::operator=(AESCipherConfig&& other) noexcept {
 }
 
 voidAESCipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the AESCipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> AESCipherTraits::AdditionalConfig(
@@ -521,8 +516,6 @@ Maybe<void> AESCipherTraits::AdditionalConfig(
  AESCipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsUint32()); // Key Variant
  params->variant =
 static_cast<AESKeyVariant>(args[offset].As<Uint32>()->Value());

src/crypto/crypto_aes.h

@@ -58,7 +58,6 @@ enum class AESKeyVariant {
 };
 
 structAESCipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  AESKeyVariant variant;
  ncrypto::Cipher cipher;
 size_t length;

src/crypto/crypto_argon2.cc

@@ -21,8 +21,7 @@ using v8::Uint32;
 using v8::Value;
 
 Argon2Config::Argon2Config(Argon2Config&& other) noexcept
- : mode{other.mode},
- key{std::move(other.key)},
+ : key{std::move(other.key)},
  pass{std::move(other.pass)},
  salt{std::move(other.salt)},
  secret{std::move(other.secret)},
@@ -40,13 +39,13 @@ Argon2Config& Argon2Config::operator=(Argon2Config&& other) noexcept {
 }
 
 voidArgon2Config::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("pass", pass.size());
- tracker->TrackFieldWithSize("salt", salt.size());
-tracker->TrackFieldWithSize("secret", secret.size());
-tracker->TrackFieldWithSize("ad", ad.size());
-}
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(pass, "pass");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(secret, "secret");
+tracker->TraitTrackInline(ad, "ad");
 }
 
 MaybeLocal<Value> Argon2Traits::EncodeOutput(Environment* env,
@@ -62,8 +61,6 @@ Maybe<void> Argon2Traits::AdditionalConfig(
  Argon2Config* config) {
  Environment* env = Environment::GetCurrent(args);
 
- config->mode = mode;
-
 CHECK(KeyObjectHandle::HasInstance(env, args[offset]) ||
 IsAnyBufferSource(args[offset])); // pass
  ArrayBufferOrViewContents<char> salt(args[offset + 1]);

src/crypto/crypto_argon2.h

@@ -22,7 +22,6 @@ namespace node::crypto {
 // at least 16 bytes in length.
 
 structArgon2Configfinal : public MemoryRetainer {
- CryptoJobMode mode;
  KeyObjectData key;
  ByteSource pass;
  ByteSource salt;

src/crypto/crypto_chacha20_poly1305.cc

@@ -81,8 +81,7 @@ bool ValidateAdditionalData(Environment* env,
 
 ChaCha20Poly1305CipherConfig::ChaCha20Poly1305CipherConfig(
  ChaCha20Poly1305CipherConfig&& other) noexcept
- : mode(other.mode),
-cipher(other.cipher),
+ : cipher(other.cipher),
 iv(std::move(other.iv)),
  additional_data(std::move(other.additional_data)) {}
 
@@ -94,12 +93,8 @@ ChaCha20Poly1305CipherConfig& ChaCha20Poly1305CipherConfig::operator=(
 }
 
 voidChaCha20Poly1305CipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the ChaCha20Poly1305CipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
@@ -110,7 +105,6 @@ Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
  ChaCha20Poly1305CipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
  params->cipher = ncrypto::Cipher::CHACHA20_POLY1305;
 
 #ifndef OPENSSL_IS_BORINGSSL

src/crypto/crypto_chacha20_poly1305.h

@@ -13,7 +13,6 @@ namespace node::crypto {
 constexprunsignedkChaCha20Poly1305AuthTagLength = 16;
 
 structChaCha20Poly1305CipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ncrypto::Cipher cipher;
  ByteSource iv;
  ByteSource additional_data;

src/crypto/crypto_cipher.h

@@ -268,9 +268,8 @@ class CipherJob final : public CryptoJob<CipherTraits> {
 
 SET_SELF_SIZE(CipherJob)
  void MemoryInfo(MemoryTracker* tracker) constoverride {
-if (IsCryptoJobAsync(CryptoJob<CipherTraits>::mode()))
- tracker->TrackFieldWithSize("in", in_.size());
- tracker->TrackFieldWithSize("out", out_.size());
+ tracker->TraitTrackInline(in_, "in");
+ tracker->TraitTrackInline(out_, "out");
  CryptoJob<CipherTraits>::MemoryInfo(tracker);
  }
 

src/crypto/crypto_hash.cc

@@ -58,7 +58,7 @@ Hash::Hash(Environment* env, Local<Object> wrap) : BaseObject(env, wrap) {
 
 voidHash::MemoryInfo(MemoryTracker* tracker) const {
  tracker->TrackFieldWithSize("mdctx", mdctx_ ? kSizeOf_EVP_MD_CTX : 0);
- tracker->TrackFieldWithSize("md", digest_ ? md_len_ : 0);
+ tracker->TraitTrackInline(digest_, "md");
 }
 
 #if NCRYPTO_USE_BORINGSSL_EVP_DO_ALL_FALLBACK
@@ -524,10 +524,7 @@ void Hash::HashDigest(const FunctionCallbackInfo<Value>& args) {
 }
 
 HashConfig::HashConfig(HashConfig&& other) noexcept
- : mode(other.mode),
-in(std::move(other.in)),
- digest(other.digest),
- length(other.length) {}
+ : in(std::move(other.in)), digest(other.digest), length(other.length) {}
 
 HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 if (&other == this) return *this;
@@ -536,8 +533,7 @@ HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 }
 
 voidHashConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the HashConfig does not own the data.
-if (IsCryptoJobAsync(mode)) tracker->TrackFieldWithSize("in", in.size());
+ tracker->TraitTrackInline(in, "in");
 }
 
 MaybeLocal<Value> HashTraits::EncodeOutput(Environment* env,
@@ -553,8 +549,6 @@ Maybe<void> HashTraits::AdditionalConfig(
  HashConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash algorithm
  Utf8Value digest(env->isolate(), args[offset]);
  params->digest = ncrypto::getDigestByName(*digest);
@@ -782,8 +776,7 @@ bool DigestUpdateBytepad(ncrypto::EVPMDCtxPointer* ctx,
 } // namespace
 
 CShakeConfig::CShakeConfig(CShakeConfig&& other) noexcept
- : mode(other.mode),
- in(std::move(other.in)),
+ : in(std::move(other.in)),
  function_name(std::move(other.function_name)),
  customization(std::move(other.customization)),
  variant(other.variant),
@@ -796,12 +789,9 @@ CShakeConfig& CShakeConfig::operator=(CShakeConfig&& other) noexcept {
 }
 
 voidCShakeConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the CShakeConfig does not own the data.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("in", in.size());
- tracker->TrackFieldWithSize("function_name", function_name.size());
- tracker->TrackFieldWithSize("customization", customization.size());
- }
+ tracker->TraitTrackInline(in, "in");
+ tracker->TraitTrackInline(function_name, "function_name");
+ tracker->TraitTrackInline(customization, "customization");
 }
 
 MaybeLocal<Value> CShakeTraits::EncodeOutput(Environment* env,
@@ -817,8 +807,6 @@ Maybe<void> CShakeTraits::AdditionalConfig(
  CShakeConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Algorithm name
  Utf8Value algorithm_name(env->isolate(), args[offset]);
  std::string_view algorithm_str = algorithm_name.ToStringView();

src/crypto/crypto_hash.h

@@ -42,7 +42,6 @@ class Hash final : public BaseObject {
 };
 
 structHashConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
 constEVP_MD* digest;
 unsignedint length;
@@ -107,7 +106,6 @@ struct CShakeParams final {
 boolDeriveCShakeBits(const CShakeParams& params, ByteSource* out);
 
 structCShakeConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
  ByteSource function_name;
  ByteSource customization;

src/crypto/crypto_hkdf.cc

@@ -20,8 +20,7 @@ using v8::Value;
 
 namespacecrypto {
 HKDFConfig::HKDFConfig(HKDFConfig&& other) noexcept
- : mode(other.mode),
-length(other.length),
+ : length(other.length),
 digest(other.digest),
  key(std::move(other.key)),
  key_data(std::move(other.key_data)),
@@ -47,8 +46,6 @@ Maybe<void> HKDFTraits::AdditionalConfig(
  HKDFConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash
 CHECK(KeyObjectHandle::HasInstance(env, args[offset + 1]) ||
 IsAnyBufferSource(args[offset + 1])); // Key
@@ -136,13 +133,12 @@ bool HKDFTraits::DeriveBits(Environment* env,
 }
 
 voidHKDFConfig::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-// If the job is sync, then the HKDFConfig does not own the data
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("key", key_data.size());
- tracker->TrackFieldWithSize("salt", salt.size());
- tracker->TrackFieldWithSize("info", info.size());
- }
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(key_data, "key");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(info, "info");
 }
 
 } // namespace crypto

src/crypto/crypto_aes.cc

@@ -491,8 +491,7 @@ void UseDefaultIV(AESCipherConfig* params) {
 } // namespace
 
 AESCipherConfig::AESCipherConfig(AESCipherConfig&& other) noexcept
- : mode(other.mode),
-variant(other.variant),
+ : variant(other.variant),
 cipher(other.cipher),
  length(other.length),
  iv(std::move(other.iv)),
@@ -505,12 +504,8 @@ AESCipherConfig& AESCipherConfig::operator=(AESCipherConfig&& other) noexcept {
 }
 
 voidAESCipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the AESCipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> AESCipherTraits::AdditionalConfig(
@@ -521,8 +516,6 @@ Maybe<void> AESCipherTraits::AdditionalConfig(
  AESCipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsUint32()); // Key Variant
  params->variant =
 static_cast<AESKeyVariant>(args[offset].As<Uint32>()->Value());

src/crypto/crypto_aes.h

@@ -58,7 +58,6 @@ enum class AESKeyVariant {
 };
 
 structAESCipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  AESKeyVariant variant;
  ncrypto::Cipher cipher;
 size_t length;

src/crypto/crypto_argon2.cc

@@ -21,8 +21,7 @@ using v8::Uint32;
 using v8::Value;
 
 Argon2Config::Argon2Config(Argon2Config&& other) noexcept
- : mode{other.mode},
- key{std::move(other.key)},
+ : key{std::move(other.key)},
  pass{std::move(other.pass)},
  salt{std::move(other.salt)},
  secret{std::move(other.secret)},
@@ -40,13 +39,13 @@ Argon2Config& Argon2Config::operator=(Argon2Config&& other) noexcept {
 }
 
 voidArgon2Config::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("pass", pass.size());
- tracker->TrackFieldWithSize("salt", salt.size());
-tracker->TrackFieldWithSize("secret", secret.size());
-tracker->TrackFieldWithSize("ad", ad.size());
-}
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(pass, "pass");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(secret, "secret");
+tracker->TraitTrackInline(ad, "ad");
 }
 
 MaybeLocal<Value> Argon2Traits::EncodeOutput(Environment* env,
@@ -62,8 +61,6 @@ Maybe<void> Argon2Traits::AdditionalConfig(
  Argon2Config* config) {
  Environment* env = Environment::GetCurrent(args);
 
- config->mode = mode;
-
 CHECK(KeyObjectHandle::HasInstance(env, args[offset]) ||
 IsAnyBufferSource(args[offset])); // pass
  ArrayBufferOrViewContents<char> salt(args[offset + 1]);

src/crypto/crypto_argon2.h

@@ -22,7 +22,6 @@ namespace node::crypto {
 // at least 16 bytes in length.
 
 structArgon2Configfinal : public MemoryRetainer {
- CryptoJobMode mode;
  KeyObjectData key;
  ByteSource pass;
  ByteSource salt;

src/crypto/crypto_chacha20_poly1305.cc

@@ -81,8 +81,7 @@ bool ValidateAdditionalData(Environment* env,
 
 ChaCha20Poly1305CipherConfig::ChaCha20Poly1305CipherConfig(
  ChaCha20Poly1305CipherConfig&& other) noexcept
- : mode(other.mode),
-cipher(other.cipher),
+ : cipher(other.cipher),
 iv(std::move(other.iv)),
  additional_data(std::move(other.additional_data)) {}
 
@@ -94,12 +93,8 @@ ChaCha20Poly1305CipherConfig& ChaCha20Poly1305CipherConfig::operator=(
 }
 
 voidChaCha20Poly1305CipherConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If mode is sync, then the data in each of these properties
-// is not owned by the ChaCha20Poly1305CipherConfig, so we ignore it.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("iv", iv.size());
- tracker->TrackFieldWithSize("additional_data", additional_data.size());
- }
+ tracker->TraitTrackInline(iv, "iv");
+ tracker->TraitTrackInline(additional_data, "additional_data");
 }
 
 Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
@@ -110,7 +105,6 @@ Maybe<void> ChaCha20Poly1305CipherTraits::AdditionalConfig(
  ChaCha20Poly1305CipherConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
  params->cipher = ncrypto::Cipher::CHACHA20_POLY1305;
 
 #ifndef OPENSSL_IS_BORINGSSL

src/crypto/crypto_chacha20_poly1305.h

@@ -13,7 +13,6 @@ namespace node::crypto {
 constexprunsignedkChaCha20Poly1305AuthTagLength = 16;
 
 structChaCha20Poly1305CipherConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ncrypto::Cipher cipher;
  ByteSource iv;
  ByteSource additional_data;

src/crypto/crypto_cipher.h

@@ -268,9 +268,8 @@ class CipherJob final : public CryptoJob<CipherTraits> {
 
 SET_SELF_SIZE(CipherJob)
  void MemoryInfo(MemoryTracker* tracker) constoverride {
-if (IsCryptoJobAsync(CryptoJob<CipherTraits>::mode()))
- tracker->TrackFieldWithSize("in", in_.size());
- tracker->TrackFieldWithSize("out", out_.size());
+ tracker->TraitTrackInline(in_, "in");
+ tracker->TraitTrackInline(out_, "out");
  CryptoJob<CipherTraits>::MemoryInfo(tracker);
  }
 

src/crypto/crypto_hash.cc

@@ -58,7 +58,7 @@ Hash::Hash(Environment* env, Local<Object> wrap) : BaseObject(env, wrap) {
 
 voidHash::MemoryInfo(MemoryTracker* tracker) const {
  tracker->TrackFieldWithSize("mdctx", mdctx_ ? kSizeOf_EVP_MD_CTX : 0);
- tracker->TrackFieldWithSize("md", digest_ ? md_len_ : 0);
+ tracker->TraitTrackInline(digest_, "md");
 }
 
 #if NCRYPTO_USE_BORINGSSL_EVP_DO_ALL_FALLBACK
@@ -524,10 +524,7 @@ void Hash::HashDigest(const FunctionCallbackInfo<Value>& args) {
 }
 
 HashConfig::HashConfig(HashConfig&& other) noexcept
- : mode(other.mode),
-in(std::move(other.in)),
- digest(other.digest),
- length(other.length) {}
+ : in(std::move(other.in)), digest(other.digest), length(other.length) {}
 
 HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 if (&other == this) return *this;
@@ -536,8 +533,7 @@ HashConfig& HashConfig::operator=(HashConfig&& other) noexcept {
 }
 
 voidHashConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the HashConfig does not own the data.
-if (IsCryptoJobAsync(mode)) tracker->TrackFieldWithSize("in", in.size());
+ tracker->TraitTrackInline(in, "in");
 }
 
 MaybeLocal<Value> HashTraits::EncodeOutput(Environment* env,
@@ -553,8 +549,6 @@ Maybe<void> HashTraits::AdditionalConfig(
  HashConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash algorithm
  Utf8Value digest(env->isolate(), args[offset]);
  params->digest = ncrypto::getDigestByName(*digest);
@@ -782,8 +776,7 @@ bool DigestUpdateBytepad(ncrypto::EVPMDCtxPointer* ctx,
 } // namespace
 
 CShakeConfig::CShakeConfig(CShakeConfig&& other) noexcept
- : mode(other.mode),
- in(std::move(other.in)),
+ : in(std::move(other.in)),
  function_name(std::move(other.function_name)),
  customization(std::move(other.customization)),
  variant(other.variant),
@@ -796,12 +789,9 @@ CShakeConfig& CShakeConfig::operator=(CShakeConfig&& other) noexcept {
 }
 
 voidCShakeConfig::MemoryInfo(MemoryTracker* tracker) const {
-// If the Job is sync, then the CShakeConfig does not own the data.
-if (IsCryptoJobAsync(mode)) {
- tracker->TrackFieldWithSize("in", in.size());
- tracker->TrackFieldWithSize("function_name", function_name.size());
- tracker->TrackFieldWithSize("customization", customization.size());
- }
+ tracker->TraitTrackInline(in, "in");
+ tracker->TraitTrackInline(function_name, "function_name");
+ tracker->TraitTrackInline(customization, "customization");
 }
 
 MaybeLocal<Value> CShakeTraits::EncodeOutput(Environment* env,
@@ -817,8 +807,6 @@ Maybe<void> CShakeTraits::AdditionalConfig(
  CShakeConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Algorithm name
  Utf8Value algorithm_name(env->isolate(), args[offset]);
  std::string_view algorithm_str = algorithm_name.ToStringView();

src/crypto/crypto_hash.h

@@ -42,7 +42,6 @@ class Hash final : public BaseObject {
 };
 
 structHashConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
 constEVP_MD* digest;
 unsignedint length;
@@ -107,7 +106,6 @@ struct CShakeParams final {
 boolDeriveCShakeBits(const CShakeParams& params, ByteSource* out);
 
 structCShakeConfigfinal : public MemoryRetainer {
- CryptoJobMode mode;
  ByteSource in;
  ByteSource function_name;
  ByteSource customization;

src/crypto/crypto_hkdf.cc

@@ -20,8 +20,7 @@ using v8::Value;
 
 namespacecrypto {
 HKDFConfig::HKDFConfig(HKDFConfig&& other) noexcept
- : mode(other.mode),
-length(other.length),
+ : length(other.length),
 digest(other.digest),
  key(std::move(other.key)),
  key_data(std::move(other.key_data)),
@@ -47,8 +46,6 @@ Maybe<void> HKDFTraits::AdditionalConfig(
  HKDFConfig* params) {
  Environment* env = Environment::GetCurrent(args);
 
- params->mode = mode;
-
 CHECK(args[offset]->IsString()); // Hash
 CHECK(KeyObjectHandle::HasInstance(env, args[offset + 1]) ||
 IsAnyBufferSource(args[offset + 1])); // Key
@@ -136,13 +133,12 @@ bool HKDFTraits::DeriveBits(Environment* env,
 }
 
 voidHKDFConfig::MemoryInfo(MemoryTracker* tracker) const {
-if (key) tracker->TrackField("key", key);
-// If the job is sync, then the HKDFConfig does not own the data
-if (IsCryptoJobAsync(mode)) {
-if (!key) tracker->TrackFieldWithSize("key", key_data.size());
- tracker->TrackFieldWithSize("salt", salt.size());
- tracker->TrackFieldWithSize("info", info.size());
- }
+if (key)
+ tracker->TrackField("key", key);
+else
+ tracker->TraitTrackInline(key_data, "key");
+ tracker->TraitTrackInline(salt, "salt");
+ tracker->TraitTrackInline(info, "info");
 }
 
 } // namespace crypto