fixup! update xml

mkardous-silabs · Jul 19, 2023 · fed4c3f · fed4c3f
1 parent fca074a
commit fed4c3f
Show file tree

Hide file tree

Showing 4 changed files with 261 additions and 265 deletions.
diff --git a/src/app/clusters/icd-management-server/icd-management-server.cpp b/src/app/clusters/icd-management-server/icd-management-server.cpp
@@ -228,7 +228,7 @@ bool emberAfIcdManagementClusterUnregisterClientCallback(chip::app::CommandHandl
     {
         PersistentStorageDelegate & storage = chip::Server::GetInstance().GetPersistentStorage();
         FabricIndex fabric                  = commandObj->GetAccessingFabricIndex();
-        status = IcdManagementServer::GetInstance().UnregisterClient(storage, fabric, commandData.checkInNodeID, commandData.key,
+        status = IcdManagementServer::GetInstance().UnregisterClient(storage, fabric, commandData.checkInNodeID, commandData.verificationKey,
                                                                      is_admin);
     }
 

diff --git a/src/app/icd/IcdManagementServer.cpp b/src/app/icd/IcdManagementServer.cpp
@@ -49,7 +49,7 @@ Status IcdManagementServer::RegisterClient(PersistentStorageDelegate & storage,
 }
 
 Status IcdManagementServer::UnregisterClient(PersistentStorageDelegate & storage, FabricIndex fabric_index, chip::NodeId node_id,
-                                             Optional<chip::ByteSpan> key, bool is_admin)
+                                             Optional<chip::ByteSpan> verificationKey, bool is_admin)
 {
     IcdMonitoringTable table(storage, fabric_index, GetClientsSupportedPerFabric());
 
@@ -62,8 +62,8 @@ Status IcdManagementServer::UnregisterClient(PersistentStorageDelegate & storage
     // Existing entry: Validate Key if, and only if, the ISD has NOT administrator permissions
     if (!is_admin)
     {
-        VerifyOrReturnError(key.HasValue(), InteractionModel::Status::Failure);
-        VerifyOrReturnError(key.Value().data_equal(entry.key), InteractionModel::Status::Failure);
+        VerifyOrReturnError(verificationKey.HasValue(), InteractionModel::Status::Failure);
+        VerifyOrReturnError(verificationKey.Value().data_equal(entry.key), InteractionModel::Status::Failure);
     }
 
     err = table.Remove(entry.index);

diff --git a/src/app/icd/IcdManagementServer.h b/src/app/icd/IcdManagementServer.h
@@ -56,7 +56,7 @@ class IcdManagementServer
                           uint64_t monitored_subject, chip::ByteSpan key, Optional<chip::ByteSpan> verification_key, bool is_admin);
 
     Status UnregisterClient(PersistentStorageDelegate & storage, FabricIndex fabric_index, chip::NodeId node_id,
-                            Optional<chip::ByteSpan> key, bool is_admin);
+                            Optional<chip::ByteSpan> verificationKey, bool is_admin);
 
     Status StayActiveRequest(FabricIndex fabric_index);