Skip to content

Commit 8cba7e0

Browse files
committed
Update per review comments
1 parent 8bbdfc3 commit 8cba7e0

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

examples/fabric-admin/device_manager/DeviceManager.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ void DeviceManager::RemoveSyncedDevice(NodeId nodeId)
115115
ChipLogValueX64(device->GetNodeId()), device->GetEndpointId());
116116
}
117117

118-
void DeviceManager::OpenDeviceCommissioningWindow(NodeId nodeId, uint32_t commissioningTimeout, uint32_t iterations,
118+
void DeviceManager::OpenDeviceCommissioningWindow(NodeId nodeId, uint32_t commissioningTimeoutSec, uint32_t iterations,
119119
uint16_t discriminator, const ByteSpan & salt, const ByteSpan & verifier)
120120
{
121121
ChipLogProgress(NotSpecified, "Opening commissioning window for Node ID: " ChipLogFormatX64, ChipLogValueX64(nodeId));
122122

123123
// Open the commissioning window of a device within its own fabric.
124-
CHIP_ERROR err = PairingManager::Instance().OpenCommissioningWindow(nodeId, kRootEndpointId, commissioningTimeout, iterations,
125-
discriminator, salt, verifier);
124+
CHIP_ERROR err = PairingManager::Instance().OpenCommissioningWindow(nodeId, kRootEndpointId, commissioningTimeoutSec,
125+
iterations, discriminator, salt, verifier);
126126
if (err != CHIP_NO_ERROR)
127127
{
128128
ChipLogError(NotSpecified, "Failed to open commissioning window: %s", ErrorStr(err));

examples/fabric-admin/device_manager/DeviceManager.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class DeviceManager : public PairingDelegate
9494
* This function initiates the process to open the commissioning window for a device identified by the given node ID.
9595
*
9696
* @param nodeId The ID of the node that should open the commissioning window.
97-
* @param commissioningTimeout The time in seconds before the commissioning window closes. This value determines
97+
* @param commissioningTimeoutSec The time in seconds before the commissioning window closes. This value determines
9898
* how long the commissioning window remains open for incoming connections.
9999
* @param iterations The number of PBKDF (Password-Based Key Derivation Function) iterations to use
100100
* for deriving the PAKE (Password Authenticated Key Exchange) verifier.
@@ -104,7 +104,7 @@ class DeviceManager : public PairingDelegate
104104
* @param verifier The PAKE verifier used to authenticate the commissioning process.
105105
*
106106
*/
107-
void OpenDeviceCommissioningWindow(chip::NodeId nodeId, uint32_t commissioningTimeout, uint32_t iterations,
107+
void OpenDeviceCommissioningWindow(chip::NodeId nodeId, uint32_t commissioningTimeoutSec, uint32_t iterations,
108108
uint16_t discriminator, const chip::ByteSpan & salt, const chip::ByteSpan & verifier);
109109

110110
/**

examples/fabric-admin/device_manager/PairingManager.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void PairingManager::Init(Controller::DeviceCommissioner * commissioner)
3535
mCommissioner = commissioner;
3636
}
3737

38-
CHIP_ERROR PairingManager::OpenCommissioningWindow(NodeId nodeId, EndpointId endpointId, uint16_t commissioningTimeout,
38+
CHIP_ERROR PairingManager::OpenCommissioningWindow(NodeId nodeId, EndpointId endpointId, uint16_t commissioningTimeoutSec,
3939
uint32_t iterations, uint16_t discriminator, const ByteSpan & salt,
4040
const ByteSpan & verifier)
4141
{
@@ -55,13 +55,13 @@ CHIP_ERROR PairingManager::OpenCommissioningWindow(NodeId nodeId, EndpointId end
5555
auto params = Platform::MakeUnique<CommissioningWindowParams>();
5656
params->nodeId = nodeId;
5757
params->endpointId = endpointId;
58-
params->commissioningWindowTimeout = commissioningTimeout;
58+
params->commissioningWindowTimeout = commissioningTimeoutSec;
5959
params->iteration = iterations;
6060
params->discriminator = discriminator;
6161

6262
if (!salt.empty())
6363
{
64-
if (salt.size() > Crypto::kSpake2p_Max_PBKDF_Salt_Length)
64+
if (salt.size() > sizeof(params->saltBuffer))
6565
{
6666
ChipLogError(NotSpecified, "Salt size exceeds buffer capacity");
6767
return CHIP_ERROR_BUFFER_TOO_SMALL;
@@ -73,7 +73,7 @@ CHIP_ERROR PairingManager::OpenCommissioningWindow(NodeId nodeId, EndpointId end
7373

7474
if (!verifier.empty())
7575
{
76-
if (verifier.size() > Crypto::kSpake2p_VerifierSerialized_Length)
76+
if (verifier.size() > sizeof(params->verifierBuffer))
7777
{
7878
ChipLogError(NotSpecified, "Verifier size exceeds buffer capacity");
7979
return CHIP_ERROR_BUFFER_TOO_SMALL;

examples/fabric-admin/device_manager/PairingManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class PairingManager
6767
*
6868
* @param nodeId The target node ID for commissioning.
6969
* @param endpointId The target endpoint ID for commissioning.
70-
* @param commissioningTimeout Timeout for the commissioning window in seconds.
70+
* @param commissioningTimeoutSec Timeout for the commissioning window in seconds.
7171
* @param iterations Iterations for PBKDF calculations.
7272
* @param discriminator Discriminator for commissioning.
7373
* @param salt Optional salt for verifier-based commissioning.

0 commit comments

Comments
 (0)