From 4fd7136787bdcd4db4c82185d190daebf346e5fb Mon Sep 17 00:00:00 2001 From: thivya-amazon <99231372+thivya-amazon@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:36:44 -0800 Subject: [PATCH] Added a copy constructor for SensitiveDataBuffer (#32426) * Added a copy constructor for SensitiveDataBuffer * Removed commented code. --- src/app/icd/client/RefreshKeySender.cpp | 7 ++----- src/crypto/CHIPCryptoPAL.h | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/app/icd/client/RefreshKeySender.cpp b/src/app/icd/client/RefreshKeySender.cpp index f0fbdbae7721d8..36456b0b5ddc8c 100644 --- a/src/app/icd/client/RefreshKeySender.cpp +++ b/src/app/icd/client/RefreshKeySender.cpp @@ -32,12 +32,9 @@ RefreshKeySender::RefreshKeySender(CheckInDelegate * checkInDelegate, const ICDC ICDClientStorage * icdClientStorage, InteractionModelEngine * engine, const RefreshKeyBuffer & refreshKeyBuffer) : mpCheckInDelegate(checkInDelegate), - mICDClientInfo(icdClientInfo), mpICDClientStorage(icdClientStorage), mpImEngine(engine), + mICDClientInfo(icdClientInfo), mpICDClientStorage(icdClientStorage), mpImEngine(engine), mNewKey(refreshKeyBuffer), mOnConnectedCallback(HandleDeviceConnected, this), mOnConnectionFailureCallback(HandleDeviceConnectionFailure, this) - -{ - mNewKey = refreshKeyBuffer; -} +{} CHIP_ERROR RefreshKeySender::RegisterClientWithNewKey(Messaging::ExchangeManager & exchangeMgr, const SessionHandle & sessionHandle) { diff --git a/src/crypto/CHIPCryptoPAL.h b/src/crypto/CHIPCryptoPAL.h index 2d02079a1c796f..74b7f363d4fb7e 100644 --- a/src/crypto/CHIPCryptoPAL.h +++ b/src/crypto/CHIPCryptoPAL.h @@ -266,7 +266,8 @@ class SensitiveDataBuffer // Sanitize after use ClearSecretData(mBytes); } - + SensitiveDataBuffer() {} + SensitiveDataBuffer(const SensitiveDataBuffer & other) { *this = other; } SensitiveDataBuffer & operator=(const SensitiveDataBuffer & other) { // Guard self assignment