[ICD] Fix wrong MaxICDClientInfoSize (project-chip#32500)

yunhanw-google · restyled-commits · web-flow · commit 1404f807cc47 · 2024-03-12T20:28:14.000Z
* fix wrong MaxICDClientInfoSize

* Restyled by clang-format

---------

Co-authored-by: Restyled.io &lt;commits@restyled.io&gt;
diff --git a/src/app/icd/client/DefaultICDClientStorage.h b/src/app/icd/client/DefaultICDClientStorage.h
@@ -155,8 +155,10 @@ class DefaultICDClientStorage : public ICDClientStorage
     static constexpr size_t MaxICDClientInfoSize()
     {
         // All the fields added together
-        return TLV::EstimateStructOverhead(sizeof(NodeId), sizeof(FabricIndex), sizeof(uint32_t), sizeof(uint32_t),
-                                           sizeof(uint64_t), sizeof(Crypto::Symmetric128BitsKeyByteArray));
+        return TLV::EstimateStructOverhead(sizeof(NodeId), sizeof(FabricIndex), sizeof(uint32_t) /*start_icd_counter*/,
+                                           sizeof(uint32_t) /*offset*/, sizeof(uint64_t) /*monitored_subject*/,
+                                           sizeof(Crypto::Symmetric128BitsKeyByteArray) /*aes_key_handle*/,
+                                           sizeof(Crypto::Symmetric128BitsKeyByteArray) /*hmac_key_handle*/);
     }
 
     static constexpr size_t MaxICDCounterSize()

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,10 @@ class DefaultICDClientStorage : public ICDClientStorage`
`155`	`155`	`static constexpr size_t MaxICDClientInfoSize()`
`156`	`156`	`{`
`157`	`157`	`// All the fields added together`
`158`		`- return TLV::EstimateStructOverhead(sizeof(NodeId), sizeof(FabricIndex), sizeof(uint32_t), sizeof(uint32_t),`
`159`		`- sizeof(uint64_t), sizeof(Crypto::Symmetric128BitsKeyByteArray));`
	`158`	`+ return TLV::EstimateStructOverhead(sizeof(NodeId), sizeof(FabricIndex), sizeof(uint32_t) /start_icd_counter/,`
	`159`	`+ sizeof(uint32_t) /offset/, sizeof(uint64_t) /monitored_subject/,`
	`160`	`+ sizeof(Crypto::Symmetric128BitsKeyByteArray) /aes_key_handle/,`
	`161`	`+ sizeof(Crypto::Symmetric128BitsKeyByteArray) /hmac_key_handle/);`
`160`	`162`	`}`
`161`	`163`
`162`	`164`	`static constexpr size_t MaxICDCounterSize()`