Added a copy constructor for SensitiveDataBuffer (#32426)

* Added a copy constructor for SensitiveDataBuffer * Removed commented code.
project-chip · May 10, 2024 · 3381165 · 3381165
1 parent bcb4cc8
commit 3381165
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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