address review comments

project-chip · Jul 29, 2021 · 16d3672 · 16d3672
1 parent 0867177
commit 16d3672
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp b/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp
@@ -28,18 +28,19 @@
 
 using namespace chip;
 
-bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(app::CommandHandler * commandObj,
-                                                                             uint16_t CommissioningTimeout, ByteSpan PAKEVerifier,
-                                                                             uint16_t Discriminator, uint32_t Iterations,
-                                                                             ByteSpan Salt, uint16_t PasscodeID)
+bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(chip::EndpointId endpoint,
+                                                                             app::CommandHandler * commandObj,
+                                                                             uint16_t commissioningTimeout, ByteSpan pakeVerifier,
+                                                                             uint16_t discriminator, uint32_t iterations,
+                                                                             ByteSpan salt, uint16_t passcodeID)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
     PASEVerifier verifier;
     ChipLogProgress(Zcl, "Received command to open commissioning window");
     VerifyOrExit(!IsPairingWindowOpen(), status = EMBER_ZCL_STATUS_FAILURE);
-    VerifyOrExit(sizeof(verifier) == PAKEVerifier.size(), status = EMBER_ZCL_STATUS_FAILURE);
-    memcpy(&verifier[0][0], PAKEVerifier.data(), PAKEVerifier.size());
-    VerifyOrExit(OpenPairingWindowUsingVerifier(CommissioningTimeout, Discriminator, verifier, Iterations, Salt, PasscodeID) ==
+    VerifyOrExit(sizeof(verifier) == pakeVerifier.size(), status = EMBER_ZCL_STATUS_FAILURE);
+    memcpy(&verifier[0][0], pakeVerifier.data(), pakeVerifier.size());
+    VerifyOrExit(OpenPairingWindowUsingVerifier(commissioningTimeout, discriminator, verifier, iterations, salt, passcodeID) ==
                      CHIP_NO_ERROR,
                  status = EMBER_ZCL_STATUS_FAILURE);
     ChipLogProgress(Zcl, "Commissioning window is now open");
@@ -53,13 +54,14 @@ bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(app
     return true;
 }
 
-bool emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback(app::CommandHandler * commandObj,
-                                                                                  uint16_t CommissioningTimeout)
+bool emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback(chip::EndpointId endpoint,
+                                                                                  app::CommandHandler * commandObj,
+                                                                                  uint16_t commissioningTimeout)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
     ChipLogProgress(Zcl, "Received command to open basic commissioning window");
     VerifyOrExit(!IsPairingWindowOpen(), status = EMBER_ZCL_STATUS_FAILURE);
-    VerifyOrExit(OpenDefaultPairingWindow(ResetFabrics::kNo, CommissioningTimeout) == CHIP_NO_ERROR,
+    VerifyOrExit(OpenDefaultPairingWindow(ResetFabrics::kNo, commissioningTimeout) == CHIP_NO_ERROR,
                  status = EMBER_ZCL_STATUS_FAILURE);
     ChipLogProgress(Zcl, "Commissioning window is now open");
 
@@ -72,7 +74,8 @@ bool emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallbac
     return true;
 }
 
-bool emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(app::CommandHandler * commandObj)
+bool emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(chip::EndpointId endpoint,
+                                                                         app::CommandHandler * commandObj)
 {
     ChipLogProgress(Zcl, "Received command to close commissioning window");
     ClosePairingWindow();

diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -404,8 +404,8 @@ CHIP_ERROR OpenDefaultPairingWindow(ResetFabrics resetFabrics, uint16_t commissi
 
     ReturnErrorOnFailure(gRendezvousServer.WaitForPairing(
         std::move(params), kSpake2p_Iteration_Count,
-        ByteSpan(reinterpret_cast<const unsigned char *>(kSpake2pKeyExchangeSalt), strlen(kSpake2pKeyExchangeSalt)), 0,
-        &gExchangeMgr, &gTransports, &gSessions, fabricInfo));
+        ByteSpan(reinterpret_cast<const uint8_t *>(kSpake2pKeyExchangeSalt), strlen(kSpake2pKeyExchangeSalt)), 0, &gExchangeMgr,
+        &gTransports, &gSessions, fabricInfo));
 
     if (commissioningTimeoutSeconds != kNoCommissioningTimeout)
     {

diff --git a/src/controller/CHIPDevice.cpp b/src/controller/CHIPDevice.cpp
@@ -368,7 +368,7 @@ CHIP_ERROR Device::OpenPairingWindow(uint16_t timeout, PairingWindowOption optio
     {
         bool randomSetupPIN = (option == PairingWindowOption::kTokenWithRandomPIN);
         PASEVerifier verifier;
-        ByteSpan salt(reinterpret_cast<const unsigned char *>(kSpake2pKeyExchangeSalt), strlen(kSpake2pKeyExchangeSalt));
+        ByteSpan salt(reinterpret_cast<const uint8_t *>(kSpake2pKeyExchangeSalt), strlen(kSpake2pKeyExchangeSalt));
         ReturnErrorOnFailure(
             PASESession::GeneratePASEVerifier(verifier, kSpake2p_Iteration_Count, salt, randomSetupPIN, setupPayload.setUpPINCode));