diff --git a/examples/android/CHIPTool/app/src/main/cpp/native-lib.cpp b/examples/android/CHIPTool/app/src/main/cpp/native-lib.cpp
index 4cf34c5..4a0235a 100644
--- a/examples/android/CHIPTool/app/src/main/cpp/native-lib.cpp
+++ b/examples/android/CHIPTool/app/src/main/cpp/native-lib.cpp
@@ -24,13 +24,14 @@
 #include <Base38.h>
 #include <SetupPayload.h>
 #include <jni.h>
+#include <lib/support/CodeUtils.h>
 
 // This is just a sample function to demonstrate end-to-end calling in/out of CHIP stack
 // is working.
 std::string base38Encode(void)
 {
-    const uint8_t buf[6] = { 0, 1, 2, 3, 4, 5 };
-    size_t size          = 6;
+    const uint8_t buf[] = { 0, 1, 2, 3, 4, 5 };
+    size_t size         = ArraySize(buf);
     return chip::base38Encode(&buf[0], size);
 }
 
diff --git a/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample.cpp b/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample.cpp
index 5df0e38..5c8b513 100644
--- a/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample.cpp
+++ b/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample.cpp
@@ -89,7 +89,7 @@
     //-> certification_type = 0
     //-> dac_origin_vendor_id is not present
     //-> dac_origin_product_id is not present
-    const uint8_t kCdForAllExamples[541] = {
+    const uint8_t kCdForAllExamples[] = {
         0x30, 0x82, 0x02, 0x19, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x0a, 0x30,
         0x82, 0x02, 0x06, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
         0x01, 0x30, 0x82, 0x01, 0x71, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x62,
diff --git a/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample_v2.cpp b/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample_v2.cpp
index 08cab35..762c74b 100644
--- a/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample_v2.cpp
+++ b/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample_v2.cpp
@@ -123,7 +123,7 @@
     //-> dac_origin_vendor_id is not present
     //-> dac_origin_product_id is not present
 #if 0
-    const uint8_t kCdForAllExamples[541] = {
+    const uint8_t kCdForAllExamples[] = {
         0x30, 0x82, 0x02, 0x19, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x0a, 0x30,
         0x82, 0x02, 0x06, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
         0x01, 0x30, 0x82, 0x01, 0x71, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x62,
diff --git a/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp b/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
index 50243e4..dd53e81 100644
--- a/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
+++ b/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
@@ -48,7 +48,7 @@
 //-> dac_origin_vendor_id is not present
 //-> dac_origin_product_id is not present
 #if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2
-constexpr const uint8_t kCdForAllExamples[541] = {
+constexpr const uint8_t kCdForAllExamples[] = {
     0x30, 0x82, 0x02, 0x19, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x0a, 0x30, 0x82,
     0x02, 0x06, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30,
     0x82, 0x01, 0x70, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x61, 0x04, 0x82, 0x01,
@@ -77,7 +77,7 @@
     0x96, 0x6c, 0x79, 0x4f, 0x1c, 0x4d, 0xd7, 0x5d, 0x15, 0x03, 0x24, 0xd8, 0xa5, 0xca, 0x82, 0x3d
 };
 #elif CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3
-constexpr const uint8_t kCdForAllExamples[539] = {
+constexpr const uint8_t kCdForAllExamples[] = {
     0x30, 0x82, 0x02, 0x17, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x08, 0x30, 0x82,
     0x02, 0x04, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30,
     0x82, 0x01, 0x70, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x61, 0x04, 0x82, 0x01,
@@ -106,7 +106,7 @@
     0x98, 0x96, 0xc7, 0xc9, 0xc8, 0x2d, 0x4b, 0xf5, 0x76, 0xd3, 0x8f, 0xbd, 0x36, 0x5b
 };
 #else  /* Fall back to the VID=0xFFF1 CD */
-constexpr const uint8_t kCdForAllExamples[540] = {
+constexpr const uint8_t kCdForAllExamples[] = {
     0x30, 0x82, 0x02, 0x17, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x08, 0x30, 0x82,
     0x02, 0x04, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30,
     0x82, 0x01, 0x70, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x61, 0x04, 0x82, 0x01,
diff --git a/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp b/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
index a57a45c..475fedd 100644
--- a/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
+++ b/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
@@ -72,14 +72,16 @@
 // 58u5L/VMiw==
 // -----END CERTIFICATE-----
 //
-constexpr uint8_t gTestCdPubkeyBytes[65] = { 0x04, 0x3c, 0x39, 0x89, 0x22, 0x45, 0x2b, 0x55, 0xca, 0xf3, 0x89, 0xc2, 0x5b,
-                                             0xd1, 0xbc, 0xa4, 0x65, 0x69, 0x52, 0xcc, 0xb9, 0x0e, 0x88, 0x69, 0x24, 0x9a,
-                                             0xd8, 0x47, 0x46, 0x53, 0x01, 0x4c, 0xbf, 0x95, 0xd6, 0x87, 0x96, 0x5e, 0x03,
-                                             0x6b, 0x52, 0x1c, 0x51, 0x03, 0x7e, 0x6b, 0x8c, 0xed, 0xef, 0xca, 0x1e, 0xb4,
-                                             0x40, 0x46, 0x69, 0x4f, 0xa0, 0x88, 0x82, 0xee, 0xd6, 0x51, 0x9d, 0xec, 0xba };
+constexpr uint8_t gTestCdPubkeyBytes[] = {
+    0x04, 0x3c, 0x39, 0x89, 0x22, 0x45, 0x2b, 0x55, 0xca, 0xf3, 0x89, 0xc2, 0x5b, 0xd1, 0xbc, 0xa4, 0x65,
+    0x69, 0x52, 0xcc, 0xb9, 0x0e, 0x88, 0x69, 0x24, 0x9a, 0xd8, 0x47, 0x46, 0x53, 0x01, 0x4c, 0xbf, 0x95,
+    0xd6, 0x87, 0x96, 0x5e, 0x03, 0x6b, 0x52, 0x1c, 0x51, 0x03, 0x7e, 0x6b, 0x8c, 0xed, 0xef, 0xca, 0x1e,
+    0xb4, 0x40, 0x46, 0x69, 0x4f, 0xa0, 0x88, 0x82, 0xee, 0xd6, 0x51, 0x9d, 0xec, 0xba,
+};
 
-constexpr uint8_t gTestCdPubkeyKid[20] = { 0x62, 0xfa, 0x82, 0x33, 0x59, 0xac, 0xfa, 0xa9, 0x96, 0x3e,
-                                           0x1c, 0xfa, 0x14, 0x0a, 0xdd, 0xf5, 0x04, 0xf3, 0x71, 0x60 };
+constexpr uint8_t gTestCdPubkeyKid[] = {
+    0x62, 0xfa, 0x82, 0x33, 0x59, 0xac, 0xfa, 0xa9, 0x96, 0x3e, 0x1c, 0xfa, 0x14, 0x0a, 0xdd, 0xf5, 0x04, 0xf3, 0x71, 0x60,
+};
 
 // Official CSA "Matter Certification and Testing CA"
 //
@@ -97,7 +99,7 @@
 // +mQCIQDvvDCKi7kvj4R4BoFS4BVZGCk4zJ84W4tfTTfu89lRbQ==
 // -----END CERTIFICATE-----
 //
-constexpr uint8_t gCdRootCert[517] = {
+constexpr uint8_t gCdRootCert[] = {
     0x30, 0x82, 0x02, 0x01, 0x30, 0x82, 0x01, 0xa7, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x07, 0x63, 0x73, 0x61, 0x72, 0x6f, 0x6f,
     0x74, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x52, 0x31, 0x0c, 0x30, 0x0a, 0x06, 0x03,
     0x55, 0x04, 0x0a, 0x0c, 0x03, 0x43, 0x53, 0x41, 0x31, 0x2c, 0x30, 0x2a, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x23, 0x4d, 0x61,
@@ -141,15 +143,16 @@
 // 6GrOQ3/zXBsCIQDxorh2RXSaI8m2RCcoWaiWa0nLzQepNm3C2jrQVJmC2Q==
 // -----END CERTIFICATE-----
 //
-constexpr uint8_t gCdSigningKey001PubkeyBytes[65] = {
+constexpr uint8_t gCdSigningKey001PubkeyBytes[] = {
     0x04, 0xcd, 0xee, 0xe9, 0x3e, 0x44, 0xf8, 0xb7, 0x2b, 0xe3, 0xd1, 0xa9, 0xc0, 0x7e, 0x21, 0x96, 0x8b,
     0x9a, 0xff, 0xf3, 0xb4, 0x03, 0xf0, 0x5e, 0x16, 0x69, 0xd7, 0xb1, 0xe5, 0xca, 0xee, 0x6f, 0xc7, 0x71,
     0x4b, 0x42, 0xe7, 0xe2, 0x36, 0x95, 0xe9, 0x2c, 0xd7, 0x63, 0x54, 0x73, 0xa2, 0x80, 0xae, 0x68, 0x8f,
-    0x37, 0xbb, 0x94, 0x89, 0xe1, 0x16, 0x29, 0xb9, 0xb9, 0x4f, 0xf7, 0xb0, 0x99, 0x29
+    0x37, 0xbb, 0x94, 0x89, 0xe1, 0x16, 0x29, 0xb9, 0xb9, 0x4f, 0xf7, 0xb0, 0x99, 0x29,
 };
 
-constexpr uint8_t gCdSigningKey001Kid[20] = { 0xFE, 0x34, 0x3F, 0x95, 0x99, 0x47, 0x76, 0x3B, 0x61, 0xEE,
-                                              0x45, 0x39, 0x13, 0x13, 0x38, 0x49, 0x4F, 0xE6, 0x7D, 0x8E };
+constexpr uint8_t gCdSigningKey001Kid[] = {
+    0xFE, 0x34, 0x3F, 0x95, 0x99, 0x47, 0x76, 0x3B, 0x61, 0xEE, 0x45, 0x39, 0x13, 0x13, 0x38, 0x49, 0x4F, 0xE6, 0x7D, 0x8E,
+};
 
 // Official CD "Signing Key 002"
 //
@@ -167,15 +170,16 @@
 // h0Qfx304Tb92AiEAk+jnf2qtyfKyTEHpT3Xf3bfekqUOA+8ikB1yjL5oTsI=
 // -----END CERTIFICATE-----
 //
-constexpr uint8_t gCdSigningKey002PubkeyBytes[65] = {
+constexpr uint8_t gCdSigningKey002PubkeyBytes[] = {
     0x04, 0x03, 0x19, 0x37, 0xe8, 0xf9, 0x42, 0x51, 0x04, 0x5d, 0xf2, 0x74, 0x57, 0xbb, 0x46, 0x25, 0x3e,
     0xe3, 0x75, 0x4e, 0x8c, 0x12, 0xae, 0x28, 0x55, 0x7d, 0x80, 0x27, 0xb9, 0xd4, 0xc3, 0x56, 0xd9, 0x1b,
     0x40, 0x8c, 0xff, 0x32, 0x27, 0x50, 0x17, 0xb2, 0x5f, 0x8c, 0x8b, 0xa2, 0x05, 0x16, 0xd5, 0xc8, 0x3a,
-    0xf2, 0xb7, 0x24, 0x12, 0x80, 0x13, 0xdf, 0xcc, 0x8f, 0x95, 0xd2, 0x00, 0xa9, 0x0b
+    0xf2, 0xb7, 0x24, 0x12, 0x80, 0x13, 0xdf, 0xcc, 0x8f, 0x95, 0xd2, 0x00, 0xa9, 0x0b,
 };
 
-constexpr uint8_t gCdSigningKey002Kid[20] = { 0xDD, 0x04, 0xDB, 0x58, 0x5B, 0x21, 0x4C, 0x1C, 0x58, 0x15,
-                                              0x87, 0xE6, 0x56, 0x8D, 0xF4, 0x87, 0xB6, 0xDD, 0xC7, 0x01 };
+constexpr uint8_t gCdSigningKey002Kid[] = {
+    0xDD, 0x04, 0xDB, 0x58, 0x5B, 0x21, 0x4C, 0x1C, 0x58, 0x15, 0x87, 0xE6, 0x56, 0x8D, 0xF4, 0x87, 0xB6, 0xDD, 0xC7, 0x01,
+};
 
 // Official CD "Signing Key 003"
 //
@@ -193,15 +197,16 @@
 // AqqtZ/w7AkQCIHiVlYTaCnJsnW5/cvj9GfIv7Eb0cjdmcAkrYGbnPQzX
 // -----END CERTIFICATE-----
 //
-constexpr uint8_t gCdSigningKey003PubkeyBytes[65] = {
+constexpr uint8_t gCdSigningKey003PubkeyBytes[] = {
     0x04, 0x9f, 0x57, 0x5c, 0xd5, 0xfd, 0xb7, 0x52, 0x1f, 0x10, 0xa4, 0xdf, 0x31, 0xf0, 0x73, 0x91, 0x2b,
     0x61, 0x47, 0x28, 0xf2, 0xd3, 0x7f, 0x5b, 0x6b, 0x96, 0xbc, 0x2c, 0xbf, 0x7c, 0x0b, 0x11, 0x96, 0x90,
     0x57, 0x7d, 0x55, 0x5d, 0x21, 0xa0, 0x96, 0x60, 0xa8, 0xb0, 0x82, 0xa3, 0x39, 0xea, 0x53, 0x0f, 0x7a,
-    0x81, 0x2d, 0x86, 0x93, 0xb5, 0x6f, 0xd7, 0x64, 0x18, 0x5f, 0xab, 0xcd, 0x32, 0xf5
+    0x81, 0x2d, 0x86, 0x93, 0xb5, 0x6f, 0xd7, 0x64, 0x18, 0x5f, 0xab, 0xcd, 0x32, 0xf5,
 };
 
-constexpr uint8_t gCdSigningKey003Kid[20] = { 0x47, 0x10, 0x35, 0xE7, 0xC0, 0x4E, 0xAA, 0xA8, 0xBE, 0x7C,
-                                              0x4D, 0x4C, 0x13, 0xE3, 0xE4, 0xC2, 0x09, 0x95, 0xA8, 0x4B };
+constexpr uint8_t gCdSigningKey003Kid[] = {
+    0x47, 0x10, 0x35, 0xE7, 0xC0, 0x4E, 0xAA, 0xA8, 0xBE, 0x7C, 0x4D, 0x4C, 0x13, 0xE3, 0xE4, 0xC2, 0x09, 0x95, 0xA8, 0x4B,
+};
 
 // Official CD "Signing Key 004"
 //
@@ -219,15 +224,16 @@
 // HbLbW5t6PY4CIE8oyIHsVhNSTPcb3mwRp+Vxhs8tKhbAdwv5BGgDaAHj
 // -----END CERTIFICATE-----
 //
-constexpr uint8_t gCdSigningKey004PubkeyBytes[65] = {
+constexpr uint8_t gCdSigningKey004PubkeyBytes[] = {
     0x04, 0x7c, 0xfc, 0x8d, 0x88, 0x10, 0xa8, 0x9c, 0xf4, 0xfa, 0x19, 0x17, 0x78, 0xf2, 0xaf, 0xec, 0x78,
     0xf8, 0x51, 0x7a, 0x97, 0xa3, 0xe5, 0x7f, 0xc2, 0x13, 0xba, 0xd8, 0x88, 0xe3, 0x61, 0x1e, 0x74, 0xff,
     0xb6, 0x84, 0xbd, 0xeb, 0xa8, 0xa6, 0x8b, 0x25, 0x23, 0x4a, 0x5c, 0x35, 0x8f, 0x37, 0x3b, 0xab, 0x9b,
-    0x6d, 0x30, 0x4e, 0x13, 0x06, 0xdd, 0x76, 0x20, 0xa5, 0x28, 0xd1, 0x16, 0x1c, 0x0b
+    0x6d, 0x30, 0x4e, 0x13, 0x06, 0xdd, 0x76, 0x20, 0xa5, 0x28, 0xd1, 0x16, 0x1c, 0x0b,
 };
 
-constexpr uint8_t gCdSigningKey004Kid[20] = { 0xF6, 0x86, 0x03, 0xA3, 0x69, 0x2E, 0x98, 0x10, 0x72, 0x41,
-                                              0x9E, 0xA1, 0xE1, 0xAB, 0x38, 0x54, 0xBD, 0x77, 0x95, 0xD3 };
+constexpr uint8_t gCdSigningKey004Kid[] = {
+    0xF6, 0x86, 0x03, 0xA3, 0x69, 0x2E, 0x98, 0x10, 0x72, 0x41, 0x9E, 0xA1, 0xE1, 0xAB, 0x38, 0x54, 0xBD, 0x77, 0x95, 0xD3,
+};
 
 // Official CD "Signing Key 005"
 //
@@ -245,15 +251,16 @@
 // AViq7c/mtzEAAiBZO0lVe6Qo9iQPIBWZaVx/S/YSNO9uKNa/pvFu3V+nIg==
 // -----END CERTIFICATE-----
 //
-constexpr uint8_t gCdSigningKey005PubkeyBytes[65] = {
+constexpr uint8_t gCdSigningKey005PubkeyBytes[] = {
     0x04, 0x43, 0x8a, 0x52, 0xc6, 0x62, 0xa2, 0xa6, 0xd7, 0x26, 0x47, 0xf9, 0x5e, 0xb7, 0x53, 0x13, 0x6e,
     0xe4, 0xae, 0x0f, 0xdb, 0x3a, 0xa9, 0xc1, 0x69, 0x31, 0x42, 0x6b, 0x3d, 0x08, 0x67, 0xf9, 0x10, 0x3a,
     0xe7, 0xd7, 0xa1, 0xb8, 0x87, 0xe9, 0xf8, 0x13, 0xa6, 0xf2, 0x6f, 0x76, 0xbb, 0xcd, 0xa9, 0x35, 0x93,
-    0x78, 0x7c, 0x12, 0x77, 0x8c, 0xa8, 0xf2, 0x97, 0x5d, 0xc4, 0x5a, 0x20, 0x42, 0xf9
+    0x78, 0x7c, 0x12, 0x77, 0x8c, 0xa8, 0xf2, 0x97, 0x5d, 0xc4, 0x5a, 0x20, 0x42, 0xf9,
 };
 
-constexpr uint8_t gCdSigningKey005Kid[20] = { 0x63, 0x7F, 0x26, 0x34, 0xAD, 0x62, 0xEA, 0xFE, 0x6A, 0xF6,
-                                              0x62, 0xEF, 0xB9, 0x6F, 0x6F, 0xD2, 0xFC, 0xBF, 0xFC, 0x2F };
+constexpr uint8_t gCdSigningKey005Kid[] = {
+    0x63, 0x7F, 0x26, 0x34, 0xAD, 0x62, 0xEA, 0xFE, 0x6A, 0xF6, 0x62, 0xEF, 0xB9, 0x6F, 0x6F, 0xD2, 0xFC, 0xBF, 0xFC, 0x2F,
+};
 
 struct MatterCDSigningKey
 {
diff --git a/src/credentials/examples/DeviceAttestationCredsExample.cpp b/src/credentials/examples/DeviceAttestationCredsExample.cpp
index f7a8016..a487dce 100644
--- a/src/credentials/examples/DeviceAttestationCredsExample.cpp
+++ b/src/credentials/examples/DeviceAttestationCredsExample.cpp
@@ -81,7 +81,7 @@
     //-> dac_origin_vendor_id is not present
     //-> dac_origin_product_id is not present
 #if CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF2
-    const uint8_t kCdForAllExamples[541] = {
+    const uint8_t kCdForAllExamples[] = {
         0x30, 0x82, 0x02, 0x19, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x0a, 0x30,
         0x82, 0x02, 0x06, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
         0x01, 0x30, 0x82, 0x01, 0x70, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x61,
@@ -112,7 +112,7 @@
         0x3d
     };
 #elif CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID == 0xFFF3
-    const uint8_t kCdForAllExamples[539] = {
+    const uint8_t kCdForAllExamples[] = {
         0x30, 0x82, 0x02, 0x17, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x08, 0x30,
         0x82, 0x02, 0x04, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
         0x01, 0x30, 0x82, 0x01, 0x70, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x61,
@@ -142,7 +142,7 @@
         0xa7, 0x51, 0x79, 0x9c, 0x02, 0x98, 0x96, 0xc7, 0xc9, 0xc8, 0x2d, 0x4b, 0xf5, 0x76, 0xd3, 0x8f, 0xbd, 0x36, 0x5b
     };
 #else  /* Fall back to the VID=0xFFF1 CD */
-    const uint8_t kCdForAllExamples[539] = {
+    const uint8_t kCdForAllExamples[] = {
         0x30, 0x82, 0x02, 0x17, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x08, 0x30,
         0x82, 0x02, 0x04, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
         0x01, 0x30, 0x82, 0x01, 0x70, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x61,
diff --git a/src/credentials/tests/CHIPCert_error_test_vectors.cpp b/src/credentials/tests/CHIPCert_error_test_vectors.cpp
index aed0b27..ca2b752 100644
--- a/src/credentials/tests/CHIPCert_error_test_vectors.cpp
+++ b/src/credentials/tests/CHIPCert_error_test_vectors.cpp
@@ -20,7 +20,7 @@
 namespace chip {
 namespace TestCerts {
 
-const ByteSpan gTestCert_X509ToChip_ErrorCases[50] = {
+const ByteSpan gTestCert_X509ToChip_ErrorCases[] = {
     ByteSpan(sChipTest_NOC_Oversized_Cert_DER),
     ByteSpan(sChipTest_ICAC_Oversized_Cert_DER),
     ByteSpan(sChipTest_RCAC_Oversized_Cert_DER),
@@ -73,7 +73,7 @@
     ByteSpan(sChipTest_RCAC_Ext_SKID_Length_Invalid_Cert_DER),
 };
 
-const ByteSpan gTestCert_ChipToX509_ErrorCases[43] = {
+const ByteSpan gTestCert_ChipToX509_ErrorCases[] = {
     ByteSpan(sChipTest_NOC_Oversized_Cert_CHIP),
     ByteSpan(sChipTest_ICAC_Oversized_Cert_CHIP),
     ByteSpan(sChipTest_RCAC_Oversized_Cert_CHIP),
@@ -119,7 +119,7 @@
     ByteSpan(sChipTest_RCAC_Ext_SKID_Length_Invalid_Cert_CHIP),
 };
 
-const ByteSpan gTestCert_ChipCertLoad_ErrorCases[40] = {
+const ByteSpan gTestCert_ChipCertLoad_ErrorCases[] = {
     ByteSpan(sChipTest_NOC_Serial_Number_Missing_Cert_CHIP),
     ByteSpan(sChipTest_ICAC_Serial_Number_Missing_Cert_CHIP),
     ByteSpan(sChipTest_RCAC_Serial_Number_Missing_Cert_CHIP),
@@ -162,7 +162,7 @@
     ByteSpan(sChipTest_RCAC_Ext_SKID_Length_Invalid_Cert_CHIP),
 };
 
-const ByteSpan gTestCert_ValidateChipRCAC_ErrorCases[84] = {
+const ByteSpan gTestCert_ValidateChipRCAC_ErrorCases[] = {
     ByteSpan(sChipTest_NOC_Oversized_Cert_CHIP),
     ByteSpan(sChipTest_ICAC_Oversized_Cert_CHIP),
     ByteSpan(sChipTest_RCAC_Oversized_Cert_CHIP),
@@ -249,7 +249,7 @@
     ByteSpan(sChipTest_RCAC_Signature_Wrong_Cert_CHIP),
 };
 
-const ByteSpan gTestCert_GetCertType_ErrorCases[12] = {
+const ByteSpan gTestCert_GetCertType_ErrorCases[] = {
     ByteSpan(sChipTest_NOC_Subject_MatterId_Missing_Cert_CHIP),  ByteSpan(sChipTest_ICAC_Subject_MatterId_Missing_Cert_CHIP),
     ByteSpan(sChipTest_RCAC_Subject_MatterId_Missing_Cert_CHIP), ByteSpan(sChipTest_NOC_Subject_MatterId_Twice_Cert_CHIP),
     ByteSpan(sChipTest_ICAC_Subject_MatterId_Twice_Cert_CHIP),   ByteSpan(sChipTest_RCAC_Subject_MatterId_Twice_Cert_CHIP),
@@ -258,7 +258,7 @@
     ByteSpan(sChipTest_ICAC_Subject_CAT_Twice_Cert_CHIP),        ByteSpan(sChipTest_RCAC_Subject_CAT_Twice_Cert_CHIP),
 };
 
-const uint8_t sChipTest_NOC_Oversized_Cert_DER[744] = {
+const uint8_t sChipTest_NOC_Oversized_Cert_DER[] = {
     0x30, 0x82, 0x02, 0xe4, 0x30, 0x82, 0x02, 0x8b, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x03, 0x2b, 0x62, 0x5a, 0x6f, 0x49,
     0x0f, 0xe1, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -296,7 +296,7 @@
     0x62, 0x18, 0x94, 0xfc, 0x47, 0x82, 0xca, 0x18, 0xdf, 0xc2, 0x8d, 0xd8, 0x61, 0xba, 0x6a, 0x4a, 0x2b, 0xa7, 0x9f, 0x66, 0x0d,
     0xb1, 0x00, 0x15, 0x0d, 0xb0, 0xc1, 0xa0, 0xa7, 0x1a,
 };
-const uint8_t sChipTest_ICAC_Oversized_Cert_DER[678] = {
+const uint8_t sChipTest_ICAC_Oversized_Cert_DER[] = {
     0x30, 0x82, 0x02, 0xa2, 0x30, 0x82, 0x02, 0x48, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x29, 0x09, 0x70, 0x4f, 0xea, 0xbd,
     0x5a, 0xfd, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -331,7 +331,7 @@
     0xf1, 0xa2, 0x48, 0xb6, 0xa6, 0x34, 0x7f, 0x6e, 0x07, 0x3d, 0x2a, 0x6d, 0x7f, 0x0d, 0x41, 0xff, 0x9d, 0x08, 0x22, 0x6b, 0x55,
     0xf9, 0x55, 0x19, 0x27, 0x1d, 0x5a,
 };
-const uint8_t sChipTest_RCAC_Oversized_Cert_DER[871] = {
+const uint8_t sChipTest_RCAC_Oversized_Cert_DER[] = {
     0x30, 0x82, 0x03, 0x63, 0x30, 0x82, 0x03, 0x09, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x5c, 0x9f, 0xab, 0x78, 0x4b, 0x2b,
     0x96, 0x98, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x82, 0x01, 0x03, 0x31, 0x20, 0x30,
     0x1e, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -375,7 +375,7 @@
     0x3a, 0x24, 0x86, 0x84, 0x86, 0xeb, 0xd9, 0xe1, 0xf8, 0x30, 0x00, 0x01, 0x7b, 0x4f, 0xe7, 0xac, 0x7b, 0xe0, 0x36, 0x25, 0x5e,
     0xe2, 0xd6, 0x8a, 0xa2, 0x66, 0xa1, 0xe2, 0x0a, 0x16, 0xe6,
 };
-const uint8_t sChipTest_NOC_Cert_Version_V2_Cert_DER[519] = {
+const uint8_t sChipTest_NOC_Cert_Version_V2_Cert_DER[] = {
     0x30, 0x82, 0x02, 0x03, 0x30, 0x82, 0x01, 0xa8, 0xa0, 0x03, 0x02, 0x01, 0x01, 0x02, 0x08, 0x76, 0xe7, 0x4a, 0xc0, 0xd7, 0x71,
     0xa1, 0x53, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -402,7 +402,7 @@
     0x19, 0x02, 0x21, 0x00, 0xea, 0xb6, 0xe7, 0xa5, 0x80, 0x07, 0x00, 0xd5, 0x18, 0x02, 0x8b, 0xa1, 0x4a, 0x6d, 0xcd, 0x90, 0x41,
     0x92, 0xba, 0x2e, 0xa4, 0x1c, 0xc8, 0x51, 0x09, 0x7e, 0x40, 0xc3, 0xd2, 0xe9, 0xe7, 0x89,
 };
-const uint8_t sChipTest_ICAC_Cert_Version_V2_Cert_DER[451] = {
+const uint8_t sChipTest_ICAC_Cert_Version_V2_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbf, 0x30, 0x82, 0x01, 0x65, 0xa0, 0x03, 0x02, 0x01, 0x01, 0x02, 0x08, 0x51, 0x33, 0x8b, 0x3d, 0xbe, 0x61,
     0xe8, 0x79, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -426,7 +426,7 @@
     0x56, 0x0f, 0x04, 0xab, 0xc0, 0x96, 0xcc, 0x30, 0x1b, 0xfe, 0x5f, 0x40, 0xae, 0xdb, 0x03, 0x71, 0x08, 0x34, 0xda, 0xb8, 0xc9,
     0x8f, 0x3a, 0xf2, 0x2b, 0xec, 0x65, 0xc6, 0xf3, 0x33, 0xaa,
 };
-const uint8_t sChipTest_RCAC_Cert_Version_V2_Cert_DER[416] = {
+const uint8_t sChipTest_RCAC_Cert_Version_V2_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9c, 0x30, 0x82, 0x01, 0x43, 0xa0, 0x03, 0x02, 0x01, 0x01, 0x02, 0x08, 0x7f, 0xf0, 0x89, 0x5d, 0x12, 0xf3,
     0xbf, 0x04, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -448,7 +448,7 @@
     0x88, 0x66, 0xf0, 0x82, 0x02, 0x20, 0x44, 0x84, 0x6e, 0x9e, 0x31, 0xc7, 0x32, 0x2f, 0xdf, 0x2e, 0x59, 0xe6, 0x09, 0x41, 0x03,
     0x55, 0x2f, 0x48, 0x46, 0xdb, 0xeb, 0xcd, 0x8f, 0xc6, 0xe1, 0xc1, 0x04, 0xa3, 0x19, 0x5d, 0xf5, 0x0d,
 };
-const uint8_t sChipTest_NOC_Sig_Algo_ECDSA_With_SHA1_Cert_DER[517] = {
+const uint8_t sChipTest_NOC_Sig_Algo_ECDSA_With_SHA1_Cert_DER[] = {
     0x30, 0x82, 0x02, 0x01, 0x30, 0x82, 0x01, 0xa7, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x7a, 0x6d, 0x34, 0xc7, 0xd9, 0x17,
     0xfa, 0x58, 0x30, 0x09, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x01, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06, 0x0a,
     0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x30,
@@ -475,7 +475,7 @@
     0x21, 0x00, 0xef, 0x45, 0xe8, 0xe1, 0xe3, 0x1a, 0x81, 0x67, 0x9a, 0xf3, 0x83, 0x17, 0xd0, 0x1f, 0xd0, 0x66, 0xa7, 0x09, 0x30,
     0x31, 0x96, 0x7c, 0x24, 0x50, 0x6d, 0x14, 0x8c, 0xb0, 0x14, 0x94, 0x09, 0x95,
 };
-const uint8_t sChipTest_ICAC_Sig_Algo_ECDSA_With_SHA1_Cert_DER[448] = {
+const uint8_t sChipTest_ICAC_Sig_Algo_ECDSA_With_SHA1_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbc, 0x30, 0x82, 0x01, 0x64, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x12, 0x9c, 0xc3, 0x5f, 0x07, 0x99,
     0x6e, 0xc8, 0x30, 0x09, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x01, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06, 0x0a,
     0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x30,
@@ -499,7 +499,7 @@
     0x5c, 0xd2, 0x80, 0xf7, 0xea, 0xa1, 0x5f, 0x83, 0x9b, 0x79, 0x77, 0xd0, 0x8b, 0x4d, 0x4e, 0x6e, 0xc3, 0x79, 0xd9, 0x02, 0x7c,
     0xdf, 0xdd, 0xf7, 0xe2, 0xc4, 0x09, 0xbf,
 };
-const uint8_t sChipTest_RCAC_Sig_Algo_ECDSA_With_SHA1_Cert_DER[414] = {
+const uint8_t sChipTest_RCAC_Sig_Algo_ECDSA_With_SHA1_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9a, 0x30, 0x82, 0x01, 0x42, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x03, 0x3c, 0xc8, 0x89, 0xd7, 0xa4,
     0x02, 0x55, 0x30, 0x09, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x01, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06, 0x0a,
     0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x30,
@@ -521,7 +521,7 @@
     0x35, 0x0b, 0x02, 0x20, 0x76, 0xc8, 0xfe, 0x24, 0x6f, 0xc5, 0x1f, 0x27, 0x77, 0x23, 0x00, 0x93, 0x72, 0xb4, 0x2b, 0x46, 0xca,
     0xfa, 0x47, 0x90, 0x0c, 0xdb, 0xd2, 0x23, 0x8a, 0x01, 0x1b, 0xb5, 0xed, 0x61, 0xb7, 0x1d,
 };
-const uint8_t sChipTest_NOC_Validity_Not_Before_Missing_Cert_DER[505] = {
+const uint8_t sChipTest_NOC_Validity_Not_Before_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xf5, 0x30, 0x82, 0x01, 0x9b, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x07, 0x7c, 0x49, 0xae, 0xb5, 0x1d,
     0xd2, 0x9d, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -548,7 +548,7 @@
     0xa6, 0x82, 0x29, 0x67, 0x12, 0xcc, 0xf4, 0xd5, 0x45, 0x6c, 0x45, 0x29, 0x4c, 0xed, 0xc6, 0x9d, 0x7c, 0xa5, 0xa0, 0x7b, 0xa7,
     0x0a,
 };
-const uint8_t sChipTest_ICAC_Validity_Not_Before_Missing_Cert_DER[439] = {
+const uint8_t sChipTest_ICAC_Validity_Not_Before_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xb3, 0x30, 0x82, 0x01, 0x58, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x78, 0x68, 0xde, 0xa3, 0xa2, 0x27,
     0x1a, 0x68, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -571,7 +571,7 @@
     0x2e, 0x5f, 0xc1, 0xd8, 0x87, 0x02, 0x21, 0x00, 0xf9, 0x8f, 0xe5, 0x47, 0xa2, 0x00, 0x9f, 0x98, 0x37, 0x44, 0x57, 0xe6, 0x08,
     0x21, 0x01, 0xa2, 0xf3, 0xc1, 0x41, 0x01, 0xbf, 0x85, 0x02, 0x89, 0x35, 0xee, 0x40, 0xb5, 0x2b, 0x16, 0x2c, 0x8c,
 };
-const uint8_t sChipTest_RCAC_Validity_Not_Before_Missing_Cert_DER[404] = {
+const uint8_t sChipTest_RCAC_Validity_Not_Before_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x90, 0x30, 0x82, 0x01, 0x36, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x73, 0xf6, 0x4b, 0x8f, 0x06, 0x4c,
     0x3c, 0x68, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -593,7 +593,7 @@
     0x11, 0xad, 0x41, 0x17, 0xcb, 0x19, 0xd2, 0xcc, 0x6d, 0xc6, 0x3e, 0xd6, 0x87, 0x4f, 0x2f, 0x7d, 0x53, 0x7d, 0x5c, 0xd7, 0x5e,
     0xa7, 0xf1, 0xe1, 0x74, 0xc2,
 };
-const uint8_t sChipTest_NOC_Validity_Not_After_Missing_Cert_DER[506] = {
+const uint8_t sChipTest_NOC_Validity_Not_After_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xf6, 0x30, 0x82, 0x01, 0x9b, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x1e, 0xb7, 0xb3, 0x65, 0x04, 0x23,
     0x1c, 0x61, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -620,7 +620,7 @@
     0xe5, 0xbc, 0x9b, 0x96, 0xcb, 0xd9, 0xf8, 0x3b, 0xc4, 0x17, 0x81, 0x48, 0xe7, 0x23, 0xf5, 0xe1, 0x8c, 0x27, 0x75, 0x12, 0x57,
     0x49, 0xe5,
 };
-const uint8_t sChipTest_ICAC_Validity_Not_After_Missing_Cert_DER[439] = {
+const uint8_t sChipTest_ICAC_Validity_Not_After_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xb3, 0x30, 0x82, 0x01, 0x58, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x0e, 0x1f, 0x6a, 0x42, 0xe0, 0x60,
     0x2c, 0x89, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -643,7 +643,7 @@
     0xc3, 0xd8, 0x0d, 0x2c, 0xaa, 0x02, 0x21, 0x00, 0x98, 0x7b, 0xa6, 0x83, 0xe1, 0xdf, 0x2e, 0x4d, 0x5e, 0x86, 0x9d, 0x57, 0x17,
     0xdd, 0xb2, 0x27, 0x78, 0xd8, 0x42, 0x02, 0x17, 0x1d, 0xe3, 0x2a, 0x36, 0xa0, 0xbf, 0x9a, 0xf7, 0x75, 0xcf, 0xa1,
 };
-const uint8_t sChipTest_RCAC_Validity_Not_After_Missing_Cert_DER[403] = {
+const uint8_t sChipTest_RCAC_Validity_Not_After_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x8f, 0x30, 0x82, 0x01, 0x36, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x4f, 0xb4, 0x4b, 0x3b, 0x80, 0xb4,
     0x1d, 0x43, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -665,7 +665,7 @@
     0xd6, 0x12, 0x9b, 0x4f, 0xe0, 0xf5, 0x98, 0x39, 0xa2, 0xb2, 0x9a, 0x15, 0xd6, 0x2e, 0x30, 0x7d, 0xdd, 0x81, 0x96, 0x40, 0x82,
     0xdd, 0x2d, 0x57, 0xea,
 };
-const uint8_t sChipTest_NOC_Validity_Wrong_Cert_DER[519] = {
+const uint8_t sChipTest_NOC_Validity_Wrong_Cert_DER[] = {
     0x30, 0x82, 0x02, 0x03, 0x30, 0x82, 0x01, 0xa8, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x07, 0x1a, 0x0d, 0x2e, 0x3a, 0xe6,
     0xdd, 0xad, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -692,7 +692,7 @@
     0xb9, 0x02, 0x21, 0x00, 0xf1, 0x4b, 0xe8, 0xc0, 0x8b, 0x8c, 0xea, 0x25, 0x37, 0x61, 0x76, 0x00, 0x17, 0x67, 0x01, 0x90, 0x15,
     0x5e, 0xbd, 0x31, 0xe9, 0xde, 0x2f, 0x15, 0x8c, 0x52, 0xea, 0x42, 0x31, 0x9d, 0x51, 0x67,
 };
-const uint8_t sChipTest_ICAC_Validity_Wrong_Cert_DER[451] = {
+const uint8_t sChipTest_ICAC_Validity_Wrong_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbf, 0x30, 0x82, 0x01, 0x65, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x11, 0xab, 0xf1, 0x4a, 0x5e, 0xea,
     0xe0, 0x9f, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -716,7 +716,7 @@
     0x10, 0xda, 0x6d, 0xd5, 0x00, 0x9f, 0x37, 0x7a, 0xb5, 0x04, 0x2c, 0xec, 0xea, 0x83, 0xae, 0xa0, 0xc8, 0x58, 0xf3, 0x7a, 0xa8,
     0x6f, 0xab, 0xae, 0xf9, 0x81, 0x9b, 0x44, 0x9e, 0x1c, 0x42,
 };
-const uint8_t sChipTest_RCAC_Validity_Wrong_Cert_DER[417] = {
+const uint8_t sChipTest_RCAC_Validity_Wrong_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9d, 0x30, 0x82, 0x01, 0x43, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x15, 0x1e, 0x66, 0x2c, 0x5a, 0xe3,
     0x26, 0x41, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -738,7 +738,7 @@
     0x10, 0xe8, 0x14, 0xee, 0x02, 0x21, 0x00, 0xab, 0x6c, 0x21, 0xe1, 0x23, 0xe4, 0x97, 0xb6, 0x22, 0x08, 0x03, 0x47, 0xc6, 0x38,
     0xa6, 0x92, 0xdd, 0x82, 0x16, 0xdd, 0x1b, 0x28, 0xb5, 0xfe, 0xd9, 0x8c, 0x24, 0x01, 0xa6, 0x2a, 0xfb, 0xfa,
 };
-const uint8_t sChipTest_NOC_Subject_NodeId_Invalid_Cert_DER[517] = {
+const uint8_t sChipTest_NOC_Subject_NodeId_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x02, 0x01, 0x30, 0x82, 0x01, 0xa8, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x01, 0x99, 0x58, 0x3f, 0x2d, 0xf3,
     0x3a, 0xd9, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -765,7 +765,7 @@
     0x02, 0x20, 0x32, 0x56, 0x57, 0x69, 0x7c, 0xd2, 0xfe, 0x21, 0xf6, 0xd1, 0xef, 0xfc, 0x78, 0x13, 0x84, 0xf8, 0xf3, 0x05, 0x97,
     0x91, 0x85, 0xc0, 0x83, 0x71, 0xe8, 0x7f, 0xf7, 0xc4, 0xf5, 0x87, 0xee, 0x2a,
 };
-const uint8_t sChipTest_NOC_Subject_FabricId_Invalid_Cert_DER[518] = {
+const uint8_t sChipTest_NOC_Subject_FabricId_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x02, 0x02, 0x30, 0x82, 0x01, 0xa8, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x19, 0x34, 0xc8, 0x20, 0x88, 0x8c,
     0x65, 0xec, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -792,7 +792,7 @@
     0xbf, 0x02, 0x20, 0x1b, 0x7a, 0x97, 0x4b, 0x37, 0x69, 0x88, 0x56, 0xb9, 0x62, 0x34, 0xd6, 0x3e, 0xf7, 0x56, 0x50, 0x1c, 0x29,
     0x47, 0x6e, 0x27, 0xe8, 0xd9, 0x71, 0x34, 0xfd, 0xcb, 0xc8, 0xdb, 0x52, 0xef, 0xd6,
 };
-const uint8_t sChipTest_ICAC_Subject_FabricId_Invalid_Cert_DER[451] = {
+const uint8_t sChipTest_ICAC_Subject_FabricId_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbf, 0x30, 0x82, 0x01, 0x65, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x57, 0x10, 0x4f, 0x1a, 0x7a, 0xf2,
     0x77, 0x1a, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -816,7 +816,7 @@
     0xc1, 0xae, 0x9a, 0xf5, 0x95, 0xcf, 0x16, 0x87, 0x23, 0x6a, 0x68, 0x52, 0xa2, 0x82, 0x87, 0xc5, 0xac, 0x5b, 0x30, 0xae, 0x02,
     0x81, 0x33, 0x63, 0xf8, 0xb2, 0x31, 0x97, 0xba, 0xab, 0xe3,
 };
-const uint8_t sChipTest_RCAC_Subject_FabricId_Invalid_Cert_DER[416] = {
+const uint8_t sChipTest_RCAC_Subject_FabricId_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9c, 0x30, 0x82, 0x01, 0x43, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x4b, 0x65, 0xa7, 0x63, 0x84, 0x79,
     0xb3, 0xeb, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x05, 0x0c, 0x10, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
@@ -838,7 +838,7 @@
     0x91, 0xcf, 0x95, 0xef, 0x02, 0x20, 0x11, 0xf4, 0xee, 0x61, 0x89, 0xf3, 0x93, 0xf6, 0xbc, 0x5c, 0x0f, 0x94, 0xdd, 0x78, 0x0e,
     0xec, 0x52, 0x5c, 0xda, 0x5f, 0x8a, 0xb1, 0x1e, 0x49, 0x9d, 0x1b, 0x3e, 0x2f, 0xa9, 0xe6, 0xef, 0xbe,
 };
-const uint8_t sChipTest_NOC_Subject_CAT_Invalid_Cert_DER[544] = {
+const uint8_t sChipTest_NOC_Subject_CAT_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x02, 0x1c, 0x30, 0x82, 0x01, 0xc2, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x69, 0xfa, 0xd2, 0x0d, 0x14, 0xc9,
     0xb7, 0xd7, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -866,7 +866,7 @@
     0x41, 0xf4, 0x1c, 0xec, 0x73, 0x1d, 0x02, 0x20, 0x15, 0xac, 0x3c, 0xcb, 0x9b, 0x74, 0xf2, 0x2b, 0x49, 0x94, 0x4e, 0xe5, 0xe2,
     0x0f, 0xdd, 0x1e, 0x02, 0x6c, 0x55, 0xa5, 0x96, 0x9f, 0x4c, 0xe1, 0x1d, 0x6f, 0x15, 0x31, 0x5e, 0x68, 0x0b, 0x9f,
 };
-const uint8_t sChipTest_ICAC_Subject_CAT_Invalid_Cert_DER[477] = {
+const uint8_t sChipTest_ICAC_Subject_CAT_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xd9, 0x30, 0x82, 0x01, 0x7f, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x44, 0x39, 0x2b, 0xf7, 0x87, 0x95,
     0x38, 0xd0, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -891,7 +891,7 @@
     0x06, 0xcb, 0x02, 0x20, 0x64, 0x8e, 0xfb, 0xba, 0x8d, 0x7a, 0xf6, 0xa0, 0x9d, 0xa7, 0xfb, 0x4e, 0x79, 0xc8, 0x3f, 0xab, 0xb9,
     0xf9, 0x64, 0x2c, 0x92, 0x90, 0x60, 0x0e, 0x1d, 0x58, 0x70, 0x3b, 0xfa, 0x36, 0x7e, 0xf3,
 };
-const uint8_t sChipTest_RCAC_Subject_CAT_Invalid_Cert_DER[470] = {
+const uint8_t sChipTest_RCAC_Subject_CAT_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xd2, 0x30, 0x82, 0x01, 0x77, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x34, 0x5b, 0x91, 0xac, 0x69, 0x31,
     0x40, 0xc6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3c, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -916,7 +916,7 @@
     0xf4, 0x11, 0xda, 0xfb, 0xe0, 0xfb, 0x89, 0xa1, 0xf8, 0x5a, 0x06, 0x2d, 0xe1, 0x8d, 0x0c, 0x86, 0x7a, 0x72, 0x3f, 0x45, 0x87,
     0x3f, 0xc3, 0x52, 0xae, 0xc9, 0x9b, 0x4f, 0xf8,
 };
-const uint8_t sChipTest_NOC_Sig_Curve_Secp256k1_Cert_DER[515] = {
+const uint8_t sChipTest_NOC_Sig_Curve_Secp256k1_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xff, 0x30, 0x82, 0x01, 0xa5, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x25, 0x3c, 0xfb, 0x97, 0x16, 0xbe,
     0x97, 0x3b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -943,7 +943,7 @@
     0xdc, 0x89, 0xb1, 0x8d, 0x97, 0xc2, 0x35, 0xec, 0x06, 0xb5, 0x32, 0x26, 0x18, 0x80, 0x22, 0xa2, 0x8a, 0x66, 0x98, 0xfd, 0x2d,
     0xbf, 0x6b, 0xee, 0x10, 0x93, 0x65, 0xc9, 0xac, 0xeb, 0x55, 0xfc,
 };
-const uint8_t sChipTest_ICAC_Sig_Curve_Secp256k1_Cert_DER[448] = {
+const uint8_t sChipTest_ICAC_Sig_Curve_Secp256k1_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbc, 0x30, 0x82, 0x01, 0x62, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x3e, 0xd0, 0xa1, 0x09, 0x92, 0x43,
     0x48, 0x6a, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -967,7 +967,7 @@
     0xb0, 0x31, 0xa1, 0xab, 0x63, 0x6c, 0x5f, 0x83, 0x0c, 0xec, 0x93, 0x35, 0xa4, 0x5e, 0x2e, 0x0e, 0xa7, 0xdc, 0x31, 0x46, 0xca,
     0xb6, 0xa5, 0x15, 0x3a, 0x8e, 0xb3, 0x5f,
 };
-const uint8_t sChipTest_RCAC_Sig_Curve_Secp256k1_Cert_DER[414] = {
+const uint8_t sChipTest_RCAC_Sig_Curve_Secp256k1_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9a, 0x30, 0x82, 0x01, 0x40, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x05, 0xbb, 0x7b, 0x1b, 0xa7, 0x86,
     0xfb, 0xeb, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -989,7 +989,7 @@
     0x59, 0x02, 0x21, 0x00, 0xc1, 0x22, 0x16, 0x57, 0xc5, 0x96, 0x2a, 0x82, 0x03, 0x07, 0x25, 0x9b, 0x3d, 0x43, 0x3b, 0x04, 0x4d,
     0xda, 0x3c, 0x74, 0xf9, 0x23, 0xdd, 0xfe, 0x5c, 0x42, 0x63, 0xef, 0xb7, 0xdb, 0x30, 0x5b,
 };
-const uint8_t sChipTest_NOC_Ext_Basic_Critical_Missing_Cert_DER[513] = {
+const uint8_t sChipTest_NOC_Ext_Basic_Critical_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xfd, 0x30, 0x82, 0x01, 0xa3, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x6c, 0x14, 0x54, 0xea, 0x6d, 0xf7,
     0x2f, 0xd4, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1016,7 +1016,7 @@
     0xf8, 0x40, 0x00, 0xee, 0x16, 0x06, 0x28, 0x3f, 0xb3, 0x71, 0x40, 0xb8, 0x97, 0x45, 0x8d, 0x20, 0x5b, 0xb3, 0xe8, 0x3c, 0x56,
     0x88, 0x32, 0xe7, 0xc5, 0xd4, 0x41, 0x1c, 0x9f, 0x1d,
 };
-const uint8_t sChipTest_ICAC_Ext_Basic_Critical_Missing_Cert_DER[447] = {
+const uint8_t sChipTest_ICAC_Ext_Basic_Critical_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbb, 0x30, 0x82, 0x01, 0x62, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x1c, 0xc8, 0xe0, 0xad, 0x3d, 0x17,
     0xd7, 0xff, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1040,7 +1040,7 @@
     0xa6, 0x21, 0xd3, 0xe2, 0xf2, 0x7b, 0xf3, 0x69, 0xc7, 0xc1, 0x0e, 0x04, 0xb4, 0x9d, 0x43, 0xed, 0x83, 0x4d, 0x00, 0x68, 0xb6,
     0x5c, 0x28, 0x3e, 0x01, 0xc3, 0xb2,
 };
-const uint8_t sChipTest_RCAC_Ext_Basic_Critical_Missing_Cert_DER[414] = {
+const uint8_t sChipTest_RCAC_Ext_Basic_Critical_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9a, 0x30, 0x82, 0x01, 0x40, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x4d, 0xd0, 0x17, 0x45, 0x40, 0xcc,
     0x73, 0x04, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1062,7 +1062,7 @@
     0x6c, 0x02, 0x21, 0x00, 0xb1, 0x40, 0xfb, 0xd1, 0xde, 0x24, 0x27, 0x9d, 0x76, 0x23, 0x38, 0x7f, 0xd9, 0xb8, 0x5d, 0xaa, 0x5e,
     0x5f, 0xe9, 0x1d, 0xac, 0x58, 0x43, 0x1c, 0x56, 0x5a, 0x83, 0x33, 0x16, 0x0b, 0x77, 0x3e,
 };
-const uint8_t sChipTest_NOC_Ext_Basic_Critical_Wrong_Cert_DER[513] = {
+const uint8_t sChipTest_NOC_Ext_Basic_Critical_Wrong_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xfd, 0x30, 0x82, 0x01, 0xa3, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x2b, 0x80, 0xde, 0x0d, 0x2d, 0x96,
     0x99, 0x67, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1089,7 +1089,7 @@
     0x98, 0xa5, 0x76, 0x3f, 0x2e, 0x28, 0xca, 0xfd, 0xfc, 0x54, 0x04, 0x67, 0x58, 0x81, 0xd2, 0x68, 0x9e, 0x61, 0xf7, 0x93, 0xd5,
     0xdd, 0x3b, 0x41, 0x88, 0xdc, 0xa2, 0x49, 0xe8, 0x4b,
 };
-const uint8_t sChipTest_ICAC_Ext_Basic_Critical_Wrong_Cert_DER[448] = {
+const uint8_t sChipTest_ICAC_Ext_Basic_Critical_Wrong_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbc, 0x30, 0x82, 0x01, 0x62, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x74, 0xaa, 0x1a, 0xc6, 0x1f, 0x0c,
     0xab, 0xfb, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1113,7 +1113,7 @@
     0xc8, 0x05, 0xe5, 0xb1, 0x50, 0xbd, 0x91, 0x67, 0x89, 0x82, 0x6d, 0xe9, 0x33, 0x99, 0x2b, 0x88, 0x42, 0x5b, 0x9c, 0x21, 0x80,
     0xfb, 0xba, 0xdb, 0x56, 0xba, 0x46, 0xf1,
 };
-const uint8_t sChipTest_RCAC_Ext_Basic_Critical_Wrong_Cert_DER[414] = {
+const uint8_t sChipTest_RCAC_Ext_Basic_Critical_Wrong_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9a, 0x30, 0x82, 0x01, 0x40, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x18, 0x80, 0x55, 0x61, 0x79, 0x66,
     0xfd, 0x6c, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1135,7 +1135,7 @@
     0x33, 0xa0, 0x02, 0x20, 0x0a, 0x2a, 0xfc, 0x09, 0x01, 0xbe, 0x30, 0x5a, 0xa7, 0x6b, 0x9f, 0xf9, 0x88, 0xee, 0xae, 0x55, 0x30,
     0x4d, 0xed, 0x7f, 0x03, 0xe3, 0xf1, 0x23, 0x5a, 0x2c, 0x75, 0xd0, 0x65, 0xaf, 0x0d, 0xa0,
 };
-const uint8_t sChipTest_NOC_Ext_Basic_CA_Missing_Cert_DER[522] = {
+const uint8_t sChipTest_NOC_Ext_Basic_CA_Missing_Cert_DER[] = {
     0x30, 0x82, 0x02, 0x06, 0x30, 0x82, 0x01, 0xab, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x14, 0xba, 0x9f, 0x2c, 0xa2, 0x99,
     0xec, 0xc8, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1162,7 +1162,7 @@
     0x8c, 0xd4, 0xdc, 0x99, 0x02, 0x21, 0x00, 0xdf, 0xae, 0xc5, 0x48, 0xe9, 0xfa, 0xd2, 0xb3, 0x35, 0x81, 0x9c, 0x6b, 0x8a, 0xfd,
     0xd9, 0x9f, 0x6b, 0x71, 0xe6, 0xfc, 0xe1, 0x73, 0x30, 0x8c, 0x21, 0xf4, 0xc1, 0x54, 0x08, 0x2a, 0x87, 0xa9,
 };
-const uint8_t sChipTest_ICAC_Ext_Basic_CA_Missing_Cert_DER[450] = {
+const uint8_t sChipTest_ICAC_Ext_Basic_CA_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbe, 0x30, 0x82, 0x01, 0x65, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x06, 0x6a, 0x7b, 0xc2, 0x19, 0x51,
     0xdb, 0x6d, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1186,7 +1186,7 @@
     0x15, 0x24, 0x03, 0xbb, 0xdf, 0x95, 0xa4, 0x09, 0xc6, 0x56, 0x0c, 0x42, 0x86, 0xa2, 0x06, 0x12, 0x14, 0xae, 0xe0, 0x70, 0x2c,
     0x99, 0x91, 0xa5, 0x8b, 0xcd, 0xad, 0x86, 0x83, 0x5e,
 };
-const uint8_t sChipTest_RCAC_Ext_Basic_CA_Missing_Cert_DER[417] = {
+const uint8_t sChipTest_RCAC_Ext_Basic_CA_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9d, 0x30, 0x82, 0x01, 0x43, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x0c, 0xcc, 0x80, 0x73, 0x53, 0xf9,
     0xd3, 0x18, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1208,7 +1208,7 @@
     0xf0, 0xb0, 0x0f, 0x93, 0x02, 0x21, 0x00, 0x9c, 0xfc, 0x09, 0xb9, 0xca, 0xf9, 0x7c, 0x81, 0xbd, 0x39, 0x83, 0x5f, 0x71, 0x95,
     0xf4, 0x27, 0xb7, 0x21, 0x3c, 0x51, 0xa5, 0xcd, 0x00, 0x3a, 0x88, 0x09, 0x78, 0xab, 0x81, 0x3f, 0x37, 0x65,
 };
-const uint8_t sChipTest_NOC_Ext_Basic_PathLen_Presence_Wrong_Cert_DER[520] = {
+const uint8_t sChipTest_NOC_Ext_Basic_PathLen_Presence_Wrong_Cert_DER[] = {
     0x30, 0x82, 0x02, 0x04, 0x30, 0x82, 0x01, 0xab, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x69, 0xab, 0x24, 0x03, 0xde, 0x19,
     0x09, 0x8e, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1235,7 +1235,7 @@
     0x4e, 0x79, 0x0e, 0x02, 0x20, 0x3d, 0x95, 0xae, 0xd9, 0x56, 0x3a, 0x3a, 0x70, 0x29, 0xfc, 0xd7, 0x85, 0xc9, 0x96, 0x93, 0x3f,
     0xe6, 0x08, 0x7b, 0x0c, 0xd6, 0xf4, 0x14, 0x76, 0x9d, 0xe6, 0xcb, 0xf3, 0xce, 0x10, 0x5d, 0x28,
 };
-const uint8_t sChipTest_NOC_Ext_KeyUsage_Critical_Missing_Cert_DER[512] = {
+const uint8_t sChipTest_NOC_Ext_KeyUsage_Critical_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xfc, 0x30, 0x82, 0x01, 0xa3, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x08, 0x8c, 0x52, 0x9c, 0xd4, 0xc4,
     0x91, 0x9a, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1262,7 +1262,7 @@
     0x54, 0x4b, 0xbd, 0xcf, 0x7d, 0x25, 0x62, 0x0c, 0xe0, 0xe4, 0x9c, 0x5b, 0x1e, 0xa5, 0xd9, 0x69, 0xca, 0xb6, 0xd5, 0xd9, 0x20,
     0x12, 0xe1, 0x87, 0x72, 0xdb, 0xef, 0x46, 0x9a,
 };
-const uint8_t sChipTest_ICAC_Ext_KeyUsage_Critical_Missing_Cert_DER[448] = {
+const uint8_t sChipTest_ICAC_Ext_KeyUsage_Critical_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbc, 0x30, 0x82, 0x01, 0x62, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x54, 0xb5, 0xdf, 0x2f, 0x8d, 0x1d,
     0xf4, 0x99, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1286,7 +1286,7 @@
     0x14, 0x10, 0x47, 0x57, 0xca, 0x95, 0x3e, 0x04, 0x5a, 0xcc, 0x51, 0x8b, 0x28, 0xf1, 0x97, 0xb0, 0xcd, 0xa4, 0xa7, 0x97, 0xc8,
     0xdb, 0xdc, 0x4d, 0x55, 0xed, 0xd4, 0x05,
 };
-const uint8_t sChipTest_RCAC_Ext_KeyUsage_Critical_Missing_Cert_DER[414] = {
+const uint8_t sChipTest_RCAC_Ext_KeyUsage_Critical_Missing_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9a, 0x30, 0x82, 0x01, 0x40, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x37, 0x51, 0x68, 0xe8, 0x9c, 0x10,
     0x12, 0xd3, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1308,7 +1308,7 @@
     0x6f, 0x02, 0x21, 0x00, 0xcf, 0x3f, 0xf5, 0xc5, 0x36, 0x40, 0x01, 0xa3, 0xe5, 0x99, 0x18, 0xd6, 0xf0, 0x77, 0x6f, 0x39, 0xfc,
     0xb3, 0xe7, 0x41, 0xa0, 0x55, 0xe3, 0x96, 0x02, 0xb6, 0x6a, 0x51, 0x42, 0x0d, 0xfd, 0xf4,
 };
-const uint8_t sChipTest_NOC_Ext_KeyUsage_Critical_Wrong_Cert_DER[513] = {
+const uint8_t sChipTest_NOC_Ext_KeyUsage_Critical_Wrong_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xfd, 0x30, 0x82, 0x01, 0xa3, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x25, 0x52, 0xa3, 0x12, 0xec, 0x0b,
     0x40, 0x77, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1335,7 +1335,7 @@
     0x80, 0x6d, 0x4d, 0x2d, 0x73, 0x1a, 0x54, 0x2f, 0xb3, 0x44, 0xcc, 0xff, 0x44, 0xf8, 0xdb, 0x19, 0x98, 0x5f, 0xbb, 0x3b, 0x87,
     0x33, 0xd5, 0x50, 0xcf, 0x87, 0x97, 0xd2, 0xe2, 0x1c,
 };
-const uint8_t sChipTest_ICAC_Ext_KeyUsage_Critical_Wrong_Cert_DER[448] = {
+const uint8_t sChipTest_ICAC_Ext_KeyUsage_Critical_Wrong_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbc, 0x30, 0x82, 0x01, 0x62, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x76, 0x2d, 0xc2, 0xb1, 0x53, 0xd9,
     0xe3, 0xa6, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1359,7 +1359,7 @@
     0x4f, 0xa1, 0x63, 0x49, 0xfc, 0xc9, 0x47, 0xf3, 0x84, 0xc3, 0x14, 0x76, 0x81, 0xfc, 0x9d, 0xb0, 0xf2, 0x59, 0xf0, 0xb9, 0xd2,
     0x97, 0x14, 0x9d, 0x25, 0xdb, 0x56, 0xdd,
 };
-const uint8_t sChipTest_RCAC_Ext_KeyUsage_Critical_Wrong_Cert_DER[414] = {
+const uint8_t sChipTest_RCAC_Ext_KeyUsage_Critical_Wrong_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9a, 0x30, 0x82, 0x01, 0x40, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x65, 0x54, 0x0b, 0x4c, 0xb7, 0x69,
     0x44, 0xcf, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1381,7 +1381,7 @@
     0x50, 0x89, 0x02, 0x20, 0x32, 0x4b, 0x4f, 0x9d, 0x9c, 0x59, 0xdf, 0x8c, 0xe2, 0xcc, 0x23, 0x88, 0x5a, 0x9a, 0x08, 0x3c, 0x9e,
     0xfc, 0xbe, 0x00, 0xa6, 0x38, 0x0e, 0xc1, 0x22, 0xe7, 0x3d, 0xb9, 0x75, 0xa0, 0x3c, 0xfe,
 };
-const uint8_t sChipTest_NOC_Ext_AKID_Length_Invalid_Cert_DER[516] = {
+const uint8_t sChipTest_NOC_Ext_AKID_Length_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x02, 0x00, 0x30, 0x82, 0x01, 0xa6, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x07, 0x4b, 0xd3, 0x4d, 0x62, 0xa5,
     0x87, 0x1c, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1408,7 +1408,7 @@
     0x00, 0x82, 0xed, 0x33, 0x9f, 0xdc, 0x12, 0xad, 0xdc, 0x39, 0x5d, 0x8e, 0x98, 0xe6, 0xbc, 0x80, 0x83, 0xfc, 0xd4, 0x3f, 0xc6,
     0xe2, 0xf6, 0x00, 0x07, 0x0d, 0x32, 0x9f, 0x81, 0x5f, 0xf0, 0x07, 0x16,
 };
-const uint8_t sChipTest_ICAC_Ext_AKID_Length_Invalid_Cert_DER[450] = {
+const uint8_t sChipTest_ICAC_Ext_AKID_Length_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbe, 0x30, 0x82, 0x01, 0x64, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x0c, 0x83, 0x10, 0xc0, 0x05, 0x2d,
     0x01, 0xeb, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1432,7 +1432,7 @@
     0x39, 0xb7, 0x2a, 0x50, 0xe1, 0x33, 0x85, 0x76, 0xb5, 0xd3, 0x6a, 0xbe, 0x4f, 0x2a, 0x69, 0x5b, 0xb1, 0x96, 0xda, 0x69, 0x2e,
     0x69, 0xe5, 0x5c, 0x85, 0x35, 0xe3, 0xb2, 0x2e, 0x8f,
 };
-const uint8_t sChipTest_RCAC_Ext_AKID_Length_Invalid_Cert_DER[415] = {
+const uint8_t sChipTest_RCAC_Ext_AKID_Length_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9b, 0x30, 0x82, 0x01, 0x42, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x56, 0xbe, 0xff, 0x1c, 0x7e, 0x2e,
     0x7c, 0x91, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1454,7 +1454,7 @@
     0x7a, 0x81, 0x16, 0x02, 0x20, 0x39, 0x5d, 0xa7, 0x59, 0x05, 0x9f, 0xc9, 0x2c, 0x40, 0x37, 0x95, 0xf8, 0xe9, 0xae, 0x2e, 0x13,
     0xe6, 0x32, 0xea, 0xcf, 0x08, 0x1d, 0x25, 0x85, 0x29, 0xa3, 0xf6, 0x0a, 0x2e, 0xf1, 0x04, 0xcb,
 };
-const uint8_t sChipTest_NOC_Ext_SKID_Length_Invalid_Cert_DER[515] = {
+const uint8_t sChipTest_NOC_Ext_SKID_Length_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xff, 0x30, 0x82, 0x01, 0xa6, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x06, 0xa8, 0xdc, 0x62, 0xb1, 0x6d,
     0x74, 0xc8, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x03, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1481,7 +1481,7 @@
     0x15, 0x08, 0xdf, 0x21, 0x51, 0x42, 0xec, 0x23, 0xdf, 0x7b, 0x65, 0x7f, 0x08, 0xc8, 0x69, 0x53, 0x23, 0x0c, 0xe1, 0xc7, 0x8f,
     0xe0, 0x90, 0x22, 0x24, 0xfc, 0x38, 0x85, 0x7c, 0x1c, 0x82, 0x98,
 };
-const uint8_t sChipTest_ICAC_Ext_SKID_Length_Invalid_Cert_DER[449] = {
+const uint8_t sChipTest_ICAC_Ext_SKID_Length_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x01, 0xbd, 0x30, 0x82, 0x01, 0x64, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x01, 0xb2, 0xdd, 0x2b, 0x8e, 0x2d,
     0xd5, 0x8b, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1505,7 +1505,7 @@
     0xaa, 0x82, 0x6e, 0x09, 0x7e, 0x31, 0xf6, 0x81, 0xc2, 0x99, 0x18, 0x70, 0xd6, 0x56, 0x57, 0x34, 0x81, 0x04, 0x14, 0xe7, 0x49,
     0xca, 0xda, 0x83, 0x51, 0xb2, 0x32, 0x5e, 0x94,
 };
-const uint8_t sChipTest_RCAC_Ext_SKID_Length_Invalid_Cert_DER[414] = {
+const uint8_t sChipTest_RCAC_Ext_SKID_Length_Invalid_Cert_DER[] = {
     0x30, 0x82, 0x01, 0x9a, 0x30, 0x82, 0x01, 0x41, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x1e, 0xe8, 0xa2, 0xdc, 0xaa, 0x55,
     0xad, 0x1d, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x22, 0x31, 0x20, 0x30, 0x1e, 0x06,
     0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x01, 0x04, 0x0c, 0x10, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41, 0x43, 0x41,
@@ -1527,7 +1527,7 @@
     0x25, 0x19, 0x02, 0x20, 0x3c, 0x30, 0x30, 0xff, 0xe9, 0xff, 0x30, 0x6c, 0x0c, 0x95, 0xbe, 0xd2, 0xe8, 0xb8, 0x9b, 0x94, 0xe8,
     0x22, 0xe1, 0xab, 0xf2, 0x61, 0x5e, 0xd0, 0xf5, 0xa9, 0x3b, 0xef, 0x8b, 0xd7, 0xa1, 0x9e,
 };
-const uint8_t sChipTest_NOC_Oversized_Cert_CHIP[480] = {
+const uint8_t sChipTest_NOC_Oversized_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x29, 0x65, 0x8b, 0xa1, 0xd4, 0x75, 0xa1, 0xf4, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde, 0xde, 0xde, 0x27,
@@ -1552,7 +1552,7 @@
     0xff, 0xa8, 0xc6, 0xc5, 0xa3, 0x7d, 0x66, 0xf1, 0x0b, 0x57, 0x93, 0xa7, 0xfd, 0x85, 0xb2, 0xc0, 0xf8, 0xa3, 0x3b, 0xbb, 0xcf,
     0xae, 0xdb, 0x7f, 0xb0, 0x97, 0x87, 0x3a, 0xf2, 0xb5, 0x38, 0x1c, 0xd0, 0x97, 0xa0, 0x1d, 0xea, 0x88, 0x18,
 };
-const uint8_t sChipTest_ICAC_Oversized_Cert_CHIP[463] = {
+const uint8_t sChipTest_ICAC_Oversized_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x06, 0xc9, 0x11, 0x82, 0x34, 0xf9, 0xd2, 0x06, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x2c,
@@ -1577,7 +1577,7 @@
     0xbb, 0x02, 0x3f, 0x4d, 0x9b, 0x87, 0x8d, 0x2c, 0xce, 0xe0, 0x84, 0x4a, 0xd5, 0xbd, 0xc7, 0x6b, 0xc9, 0x59, 0x96, 0x1a, 0x9e,
     0x18,
 };
-const uint8_t sChipTest_RCAC_Oversized_Cert_CHIP[654] = {
+const uint8_t sChipTest_RCAC_Oversized_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x35, 0x8f, 0x90, 0xcc, 0x64, 0x3c, 0x01, 0xb6, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x2c, 0x01, 0x40, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x20, 0x4e, 0x61, 0x6d, 0x65, 0x20,
     0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x44, 0x4e, 0x20, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20,
@@ -1611,7 +1611,7 @@
     0x63, 0xea, 0x8a, 0x98, 0xc4, 0xcd, 0x62, 0xe5, 0x10, 0xb7, 0x14, 0x92, 0x51, 0x2e, 0xcd, 0x6f, 0x2d, 0x57, 0xe5, 0x6a, 0x8e,
     0x69, 0x2a, 0x18,
 };
-const uint8_t sChipTest_NOC_Serial_Number_Missing_Cert_CHIP[268] = {
+const uint8_t sChipTest_NOC_Serial_Number_Missing_Cert_CHIP[] = {
     0x15, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00,
     0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27,
     0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde, 0xde, 0xde, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x24,
@@ -1626,7 +1626,7 @@
     0x6d, 0x06, 0xba, 0x33, 0xcf, 0xbb, 0x16, 0xe5, 0xa2, 0x63, 0x35, 0x3a, 0xdb, 0x8f, 0xd4, 0xe6, 0x8b, 0x56, 0x35, 0x4b, 0x8f,
     0x6d, 0xa9, 0xc5, 0x5b, 0x23, 0x6e, 0x2a, 0x5f, 0xa7, 0xe8, 0x99, 0x43, 0xa6, 0xc7, 0x37, 0x18,
 };
-const uint8_t sChipTest_ICAC_Serial_Number_Missing_Cert_CHIP[251] = {
+const uint8_t sChipTest_ICAC_Serial_Number_Missing_Cert_CHIP[] = {
     0x15, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27,
     0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04, 0x8d,
@@ -1640,7 +1640,7 @@
     0x08, 0xbf, 0xce, 0x42, 0x05, 0xae, 0x0f, 0x5c, 0x6c, 0x92, 0xcf, 0x43, 0x11, 0x29, 0xe4, 0xbb, 0x2f, 0xe3, 0xcc, 0xeb, 0xeb,
     0xdd, 0x8f, 0xba, 0xf1, 0x90, 0x70, 0xa6, 0x1e, 0x06, 0xa1, 0x4f, 0xe5, 0x6a, 0x9b, 0x91, 0x0a, 0xdf, 0xe1, 0xb8, 0x18,
 };
-const uint8_t sChipTest_RCAC_Serial_Number_Missing_Cert_CHIP[241] = {
+const uint8_t sChipTest_RCAC_Serial_Number_Missing_Cert_CHIP[] = {
     0x15, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18,
     0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04, 0xeb, 0x10, 0x5a, 0xf4, 0x65, 0x0d, 0x82, 0x80, 0x0b, 0x5d, 0x05,
@@ -1654,7 +1654,7 @@
     0xde, 0xa1, 0x69, 0x83, 0x2d, 0xca, 0x8e, 0xf0, 0x8b, 0x83, 0x91, 0x16, 0x6d, 0x46, 0x08, 0xfb, 0x09, 0x1d, 0x54, 0x33, 0xf2,
     0x82, 0xf6, 0x6c, 0x60, 0xc3, 0xb2, 0x3e, 0x14, 0xa0, 0x18,
 };
-const uint8_t sChipTest_NOC_Sig_Algo_ECDSA_With_SHA1_Cert_CHIP[279] = {
+const uint8_t sChipTest_NOC_Sig_Algo_ECDSA_With_SHA1_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x54, 0xfb, 0x8c, 0x93, 0x33, 0x31, 0x5d, 0x67, 0x24, 0x02, 0x02, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -1670,7 +1670,7 @@
     0xa5, 0x3d, 0xa3, 0x18, 0x08, 0xfd, 0xb4, 0x73, 0x2f, 0x73, 0x41, 0x3f, 0x35, 0x32, 0xb6, 0xf7, 0x20, 0x00, 0x0c, 0x40,
     0xcf, 0xc9, 0xed, 0x22, 0x6c, 0x66, 0x34, 0x21, 0x8c, 0x22, 0x59, 0xf0, 0x40, 0x30, 0xef, 0x2e, 0xc6, 0x90, 0x18,
 };
-const uint8_t sChipTest_ICAC_Sig_Algo_ECDSA_With_SHA1_Cert_CHIP[262] = {
+const uint8_t sChipTest_ICAC_Sig_Algo_ECDSA_With_SHA1_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x2c, 0x8b, 0x70, 0xc4, 0x95, 0xa8, 0x7c, 0x31, 0x24, 0x02, 0x02, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -1685,7 +1685,7 @@
     0x6e, 0x6f, 0x67, 0x8a, 0x53, 0x17, 0xcb, 0x7d, 0xab, 0x91, 0x6a, 0x26, 0x78, 0xb1, 0x52, 0x29, 0x63, 0x04, 0xb7, 0x7a, 0x62,
     0x7b, 0x31, 0x2c, 0xf5, 0x41, 0x9e, 0xdc, 0x7f, 0xfb, 0x18,
 };
-const uint8_t sChipTest_RCAC_Sig_Algo_ECDSA_With_SHA1_Cert_CHIP[252] = {
+const uint8_t sChipTest_RCAC_Sig_Algo_ECDSA_With_SHA1_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x2a, 0xff, 0xfa, 0x1a, 0x7c, 0xfd, 0x93, 0x1b, 0x24, 0x02, 0x02, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -1699,7 +1699,7 @@
     0xf2, 0x9d, 0x76, 0xa1, 0x07, 0xb4, 0xeb, 0x6f, 0xaf, 0x75, 0x00, 0x44, 0xb8, 0x90, 0xd9, 0x85, 0x4e, 0x36, 0x46, 0x91, 0x97,
     0x83, 0xd4, 0x44, 0xc7, 0x75, 0xbe, 0xfb, 0x73, 0x83, 0x79, 0x61, 0x66, 0xff, 0xe6, 0x7b, 0xd5, 0x3e, 0x71, 0x9d, 0x15, 0x18,
 };
-const uint8_t sChipTest_NOC_Issuer_Missing_Cert_CHIP[256] = {
+const uint8_t sChipTest_NOC_Issuer_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x6f, 0x80, 0x7c, 0xe8, 0xac, 0x7b, 0xe7, 0x3b, 0x24, 0x02, 0x01, 0x26, 0x04, 0xef, 0x17, 0x1b,
     0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde, 0xde, 0xde, 0x27,
     0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -1714,7 +1714,7 @@
     0x22, 0xeb, 0x82, 0x73, 0x9c, 0xfc, 0x56, 0x21, 0x73, 0x40, 0x4f, 0xc1, 0x22, 0x91, 0x48, 0xb6, 0x03, 0x41, 0x97, 0x6f,
     0x1e, 0x5c, 0xeb, 0x93, 0x27, 0xe9, 0x4c, 0xce, 0x4c, 0x7c, 0x3b, 0xb1, 0x41, 0xff, 0xb6, 0x18,
 };
-const uint8_t sChipTest_ICAC_Issuer_Missing_Cert_CHIP[249] = {
+const uint8_t sChipTest_ICAC_Issuer_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x31, 0x5d, 0xfe, 0xb0, 0x7b, 0xa4, 0x90, 0xc1, 0x24, 0x02, 0x01, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27,
     0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d,
     0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04, 0xc5, 0x85, 0x81,
@@ -1728,7 +1728,7 @@
     0xf4, 0x9a, 0x67, 0x07, 0x77, 0x72, 0xed, 0xed, 0x99, 0xe9, 0x5a, 0x01, 0x7b, 0x2b, 0x13, 0xf4, 0x66, 0x34, 0x06, 0xa3, 0xc0,
     0xf9, 0x32, 0x3d, 0xa2, 0x9c, 0x02, 0x16, 0x18, 0x33, 0x56, 0x65, 0x1b, 0x17, 0x16, 0x1e, 0x32, 0xf6, 0x18,
 };
-const uint8_t sChipTest_RCAC_Issuer_Missing_Cert_CHIP[239] = {
+const uint8_t sChipTest_RCAC_Issuer_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x07, 0x80, 0xca, 0xab, 0x0d, 0xc1, 0x5a, 0xe2, 0x24, 0x02, 0x01, 0x26, 0x04, 0xef, 0x17, 0x1b,
     0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18,
     0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04, 0xb0, 0x87, 0x31, 0x85, 0x54, 0xa0, 0x5b, 0x8b, 0x76, 0xed,
@@ -1742,7 +1742,7 @@
     0x5a, 0xe5, 0x0e, 0x1a, 0xa7, 0xc4, 0xc2, 0x2b, 0x98, 0x6b, 0x3a, 0x27, 0xc9, 0x42, 0x9a, 0x20, 0x7c, 0xdf, 0x77, 0x9e,
     0x72, 0x22, 0x5c, 0xad, 0xa7, 0x5e, 0xbe, 0x59, 0xb2, 0x18, 0xf4, 0x00, 0x38, 0xe4, 0xd2, 0x2c, 0x02, 0xfe, 0x18,
 };
-const uint8_t sChipTest_NOC_Validity_Not_Before_Missing_Cert_CHIP[273] = {
+const uint8_t sChipTest_NOC_Validity_Not_Before_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x6b, 0xcb, 0x27, 0x90, 0x3c, 0x7c, 0xe1, 0x6d, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x05, 0x6e, 0xb5,
     0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde, 0xde, 0xde, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00,
@@ -1757,7 +1757,7 @@
     0x3f, 0xb6, 0x14, 0xf7, 0x77, 0xcc, 0x9f, 0x82, 0x1b, 0x27, 0x11, 0xa9, 0x79, 0x86, 0x32, 0xd2, 0x63, 0x6b, 0xc3, 0xb4, 0x0a,
     0xf7, 0xd4, 0x6e, 0x0a, 0xa9, 0xae, 0x47, 0x58, 0xbc, 0x22, 0xc2, 0xd3, 0x94, 0x50, 0x92, 0x52, 0x36, 0xce, 0x86, 0x2c, 0x18,
 };
-const uint8_t sChipTest_ICAC_Validity_Not_Before_Missing_Cert_CHIP[256] = {
+const uint8_t sChipTest_ICAC_Validity_Not_Before_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x38, 0xa9, 0xb1, 0x2b, 0xc6, 0x57, 0x11, 0x97, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x13, 0x03, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x24, 0x07, 0x01,
@@ -1772,7 +1772,7 @@
     0x0f, 0x46, 0xa1, 0xa4, 0xd0, 0x75, 0x75, 0x1a, 0x88, 0xd3, 0xc1, 0x4c, 0x2e, 0x1c, 0x97, 0xb4, 0x36, 0x9c, 0x6f, 0x7b,
     0xad, 0x7f, 0xaf, 0xfd, 0xd4, 0x82, 0xa3, 0x83, 0x74, 0xe7, 0x15, 0x27, 0x87, 0x8a, 0x7e, 0x18,
 };
-const uint8_t sChipTest_RCAC_Validity_Not_Before_Missing_Cert_CHIP[246] = {
+const uint8_t sChipTest_RCAC_Validity_Not_Before_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x0b, 0x6a, 0xed, 0xea, 0xee, 0x86, 0xde, 0xfd, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00,
     0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04, 0xdb, 0x94, 0xb5, 0x65, 0x07, 0xf8,
@@ -1786,7 +1786,7 @@
     0xc1, 0x41, 0x72, 0x82, 0xca, 0x44, 0xae, 0x79, 0x7c, 0xbc, 0x26, 0x6d, 0x65, 0xa5, 0xbb, 0xce, 0xcd, 0x4a, 0x68, 0x97, 0xd4,
     0xe4, 0xb9, 0x7c, 0xce, 0x9b, 0x94, 0xdf, 0xfa, 0x11, 0x37, 0x25, 0xca, 0xd4, 0x24, 0x18,
 };
-const uint8_t sChipTest_NOC_Validity_Not_After_Missing_Cert_CHIP[273] = {
+const uint8_t sChipTest_NOC_Validity_Not_After_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x0f, 0x87, 0xe6, 0x31, 0x08, 0xee, 0x9e, 0x02, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde, 0xde, 0xde, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00,
@@ -1801,7 +1801,7 @@
     0xee, 0x35, 0x42, 0x83, 0xb0, 0x10, 0x1f, 0x7e, 0x47, 0x1d, 0x97, 0xd5, 0x1f, 0x21, 0x24, 0xdd, 0xae, 0xf1, 0x0f, 0x62, 0x81,
     0xa6, 0x82, 0x79, 0x6a, 0x6b, 0xb1, 0xca, 0xb8, 0x24, 0x1b, 0xc8, 0x3f, 0x34, 0xda, 0x71, 0x05, 0x9a, 0x58, 0xb6, 0x68, 0x18,
 };
-const uint8_t sChipTest_ICAC_Validity_Not_After_Missing_Cert_CHIP[256] = {
+const uint8_t sChipTest_ICAC_Validity_Not_After_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x43, 0x83, 0x0b, 0x92, 0xc9, 0x87, 0xe2, 0xee, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x37, 0x06, 0x27, 0x13, 0x03, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x24, 0x07, 0x01,
@@ -1816,7 +1816,7 @@
     0xd4, 0x2c, 0x0f, 0x03, 0x12, 0xe6, 0xea, 0x75, 0x9b, 0xe9, 0xa1, 0x9e, 0xab, 0x2d, 0xd8, 0xf6, 0x30, 0x96, 0x54, 0x1f,
     0x68, 0xca, 0x37, 0x38, 0x56, 0x2d, 0xe7, 0xc4, 0x4a, 0x93, 0x2b, 0xd7, 0x99, 0x9b, 0xf7, 0x18,
 };
-const uint8_t sChipTest_RCAC_Validity_Not_After_Missing_Cert_CHIP[246] = {
+const uint8_t sChipTest_RCAC_Validity_Not_After_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x41, 0x35, 0xc2, 0x8c, 0x77, 0xdb, 0x75, 0x4a, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x37, 0x06, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00,
     0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04, 0x0d, 0x3b, 0x81, 0x07, 0x3e, 0x18,
@@ -1830,7 +1830,7 @@
     0xf7, 0xaf, 0x4f, 0xcc, 0x2a, 0x2b, 0x47, 0xe4, 0x46, 0x63, 0x8a, 0x7f, 0xc5, 0x89, 0xc3, 0xf8, 0x7b, 0xca, 0x4e, 0xe3, 0x44,
     0xac, 0x68, 0xb7, 0x4f, 0x1b, 0x74, 0x59, 0x49, 0xe9, 0xb3, 0x91, 0xbc, 0xb8, 0x26, 0x18,
 };
-const uint8_t sChipTest_NOC_Validity_Wrong_Cert_CHIP[279] = {
+const uint8_t sChipTest_NOC_Validity_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x4d, 0xed, 0xd4, 0x47, 0xc3, 0x55, 0x32, 0xd9, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0x6e, 0xb5, 0xb9, 0x4c, 0x26, 0x05, 0xef, 0x17, 0x1b, 0x27, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -1846,7 +1846,7 @@
     0x1e, 0x1f, 0xd8, 0xc7, 0x8f, 0xbf, 0x23, 0x26, 0xd8, 0x6a, 0x0f, 0x9e, 0xa3, 0x0c, 0x89, 0x42, 0xe3, 0x7e, 0x1d, 0xe7,
     0xfd, 0xc4, 0x67, 0x86, 0x38, 0x71, 0xb1, 0xf9, 0xed, 0x95, 0x1a, 0xf9, 0xa5, 0xc5, 0x9b, 0xc1, 0x09, 0xc3, 0x18,
 };
-const uint8_t sChipTest_ICAC_Validity_Wrong_Cert_CHIP[262] = {
+const uint8_t sChipTest_ICAC_Validity_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x1e, 0x9a, 0xc4, 0x8a, 0x23, 0x78, 0xcf, 0x0c, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0x6e, 0xb5, 0xb9, 0x4c, 0x26, 0x05, 0xef, 0x17, 0x1b, 0x27, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -1861,7 +1861,7 @@
     0x6a, 0x04, 0x6a, 0x4a, 0xa7, 0x08, 0x92, 0x84, 0x40, 0xeb, 0x13, 0x5c, 0xcc, 0x31, 0x49, 0x24, 0x97, 0x6d, 0x9e, 0xfe, 0x54,
     0xb8, 0xf8, 0x18, 0x29, 0xa3, 0xe0, 0xa7, 0x6c, 0xe4, 0x18,
 };
-const uint8_t sChipTest_RCAC_Validity_Wrong_Cert_CHIP[252] = {
+const uint8_t sChipTest_RCAC_Validity_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x7b, 0x0d, 0x87, 0x15, 0xd2, 0xff, 0x7a, 0xaa, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0x6e, 0xb5, 0xb9, 0x4c, 0x26, 0x05, 0xef, 0x17, 0x1b, 0x27, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -1875,7 +1875,7 @@
     0xb4, 0xd8, 0x7e, 0xe7, 0xb8, 0x1b, 0xba, 0x9c, 0x06, 0x25, 0xc8, 0x1f, 0x41, 0x7f, 0xf4, 0xa8, 0xf3, 0x24, 0x27, 0xc1, 0x1b,
     0xd3, 0xb5, 0x92, 0xf0, 0x4b, 0x22, 0x76, 0x43, 0xaa, 0x4a, 0x39, 0xd0, 0xe1, 0x6e, 0x4b, 0x1a, 0x16, 0xbe, 0xdb, 0xc5, 0x18,
 };
-const uint8_t sChipTest_NOC_Subject_Missing_Cert_CHIP[256] = {
+const uint8_t sChipTest_NOC_Subject_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x6c, 0x48, 0x44, 0x56, 0x76, 0x58, 0x7d, 0x3a, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -1890,7 +1890,7 @@
     0x53, 0x4f, 0xad, 0xef, 0x9d, 0x40, 0xa7, 0x98, 0xd9, 0x90, 0xb0, 0xc5, 0xa2, 0xf9, 0xec, 0xd3, 0x1b, 0xdf, 0xb0, 0xff,
     0xd9, 0x8b, 0x5b, 0xb4, 0x56, 0x56, 0x33, 0x6c, 0xcf, 0x8a, 0x73, 0x1e, 0xa5, 0xa4, 0x31, 0x18,
 };
-const uint8_t sChipTest_ICAC_Subject_Missing_Cert_CHIP[239] = {
+const uint8_t sChipTest_ICAC_Subject_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x4c, 0x80, 0xee, 0xf8, 0x60, 0x56, 0xb5, 0x5d, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c,
     0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04, 0x9c, 0x65, 0x9e, 0x72, 0x11, 0x1a, 0x46, 0xc3, 0x63, 0x2b,
@@ -1904,7 +1904,7 @@
     0x7c, 0x3e, 0x6f, 0xef, 0x43, 0x64, 0x63, 0x8a, 0xd9, 0xb9, 0x75, 0x4b, 0x97, 0x8b, 0x58, 0x18, 0xa5, 0x49, 0x08, 0xf4,
     0xed, 0x81, 0x68, 0x37, 0x5d, 0x80, 0xcb, 0x74, 0x50, 0x0b, 0x35, 0x1d, 0xdb, 0x44, 0x26, 0x11, 0x64, 0x1a, 0x18,
 };
-const uint8_t sChipTest_RCAC_Subject_Missing_Cert_CHIP[239] = {
+const uint8_t sChipTest_RCAC_Subject_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x07, 0x1f, 0xdc, 0xe5, 0x49, 0xe6, 0xe1, 0x8c, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c,
     0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04, 0xd6, 0x52, 0x68, 0xc9, 0xe5, 0x7e, 0x30, 0x19, 0x0d, 0x5a,
@@ -1918,7 +1918,7 @@
     0x50, 0x58, 0x46, 0xbf, 0x2a, 0xc0, 0xe3, 0x78, 0x6f, 0x57, 0x60, 0x2d, 0x4e, 0x28, 0x37, 0xd5, 0x38, 0xd8, 0x9b, 0xe6,
     0x26, 0xf4, 0xa6, 0x32, 0x2c, 0x46, 0x47, 0xa0, 0x43, 0x85, 0x05, 0x9c, 0x11, 0x91, 0x7b, 0x34, 0xf0, 0x0f, 0x18,
 };
-const uint8_t sChipTest_NOC_Subject_MatterId_Missing_Cert_CHIP[269] = {
+const uint8_t sChipTest_NOC_Subject_MatterId_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x41, 0xbb, 0x5a, 0x27, 0xc8, 0x71, 0x48, 0xd1, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -1933,7 +1933,7 @@
     0x8b, 0x7c, 0xae, 0xec, 0x7c, 0xcc, 0x77, 0x11, 0xc1, 0x7a, 0xfb, 0x5c, 0x8f, 0xa4, 0x84, 0x80, 0xdc, 0x80, 0x65, 0x39, 0x38,
     0xdf, 0xcb, 0xdb, 0xad, 0x73, 0x1c, 0xd3, 0x6a, 0xaa, 0xa1, 0x82, 0x05, 0x9e, 0x38, 0x59, 0xeb, 0x18,
 };
-const uint8_t sChipTest_ICAC_Subject_MatterId_Missing_Cert_CHIP[252] = {
+const uint8_t sChipTest_ICAC_Subject_MatterId_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x02, 0x92, 0x32, 0x69, 0x1c, 0x9a, 0xb0, 0x4f, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -1947,7 +1947,7 @@
     0xa1, 0x43, 0x72, 0x82, 0xc5, 0x03, 0x2e, 0x6e, 0xd5, 0x3d, 0x02, 0xb7, 0x64, 0xd7, 0x80, 0xc8, 0xa1, 0xb6, 0x32, 0xeb, 0x89,
     0x34, 0x10, 0x90, 0xd4, 0x67, 0xac, 0x48, 0x33, 0x7d, 0x6b, 0x9d, 0xdc, 0x49, 0x83, 0x10, 0x5b, 0xd0, 0x21, 0x02, 0xb8, 0x18,
 };
-const uint8_t sChipTest_RCAC_Subject_MatterId_Missing_Cert_CHIP[232] = {
+const uint8_t sChipTest_RCAC_Subject_MatterId_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x2c, 0x6a, 0x90, 0x63, 0x29, 0x20, 0x60, 0xdb, 0x24, 0x02, 0x01, 0x37, 0x03, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30,
     0x09, 0x41, 0x04, 0x6d, 0xf1, 0x43, 0x2c, 0x22, 0xf6, 0x58, 0xdc, 0x77, 0x9e, 0x6a, 0x93, 0x23, 0xb3, 0xcc, 0xfe, 0x4f,
@@ -1961,7 +1961,7 @@
     0x69, 0xe3, 0x6e, 0xc7, 0xe4, 0x56, 0xdf, 0x8c, 0x2b, 0x03, 0x52, 0xa0, 0x05, 0xb1, 0x38, 0x46, 0x03, 0x37, 0x48, 0x44,
     0x73, 0x3f, 0x62, 0x8e, 0xdd, 0xba, 0x04, 0x9a, 0x3e, 0xd4, 0x5c, 0x18,
 };
-const uint8_t sChipTest_NOC_Subject_NodeId_Invalid_Cert_CHIP[279] = {
+const uint8_t sChipTest_NOC_Subject_NodeId_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x44, 0xa5, 0x3e, 0x51, 0x07, 0xc9, 0xf8, 0x65, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x09, 0x00, 0x00, 0x00, 0xf0, 0xff,
@@ -1977,7 +1977,7 @@
     0xea, 0x20, 0xf3, 0x77, 0xe4, 0x22, 0x5e, 0xb3, 0xa2, 0x08, 0x7d, 0x75, 0xf2, 0x76, 0x88, 0xa3, 0xa6, 0x03, 0xde, 0x0b,
     0xf8, 0x06, 0xdc, 0x2b, 0x40, 0x77, 0x8c, 0xa0, 0x33, 0x1a, 0xb5, 0xad, 0xbf, 0xe0, 0x9a, 0x4e, 0xf3, 0x67, 0x18,
 };
-const uint8_t sChipTest_NOC_Subject_MatterId_Twice_Cert_CHIP[289] = {
+const uint8_t sChipTest_NOC_Subject_MatterId_Twice_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x19, 0x6f, 0xed, 0x31, 0x86, 0x42, 0x1d, 0x5c, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde, 0xde, 0xde, 0x27,
@@ -1993,7 +1993,7 @@
     0x68, 0x5d, 0xef, 0x9f, 0x11, 0xf2, 0x87, 0x66, 0x6d, 0xa1, 0x80, 0x64, 0x08, 0xc4, 0xb6, 0x2e, 0x92, 0x94, 0xcd, 0x50, 0xa8,
     0x1a, 0x78, 0x28, 0x15, 0x6f, 0xca, 0x06, 0x79, 0xcc, 0xe1, 0xe6, 0xbd, 0x5d, 0x54, 0xd4, 0x18,
 };
-const uint8_t sChipTest_ICAC_Subject_MatterId_Twice_Cert_CHIP[272] = {
+const uint8_t sChipTest_ICAC_Subject_MatterId_Twice_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x4f, 0x53, 0x27, 0xd3, 0x0c, 0x7a, 0x0b, 0xee, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x13, 0x04, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27,
@@ -2008,7 +2008,7 @@
     0xfa, 0xc4, 0xef, 0xf7, 0x4a, 0x75, 0x88, 0x02, 0x78, 0x52, 0x90, 0x95, 0xa9, 0x16, 0x96, 0xaa, 0xbc, 0x15, 0x19, 0x0a, 0x5e,
     0x87, 0x4a, 0x15, 0x5a, 0x37, 0x4c, 0x65, 0xfe, 0x1c, 0x0d, 0xd9, 0x82, 0x16, 0xe7, 0xfe, 0x0f, 0xa0, 0xad, 0xf6, 0x18,
 };
-const uint8_t sChipTest_RCAC_Subject_MatterId_Twice_Cert_CHIP[272] = {
+const uint8_t sChipTest_RCAC_Subject_MatterId_Twice_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x7f, 0x9d, 0x5f, 0xe8, 0x9a, 0xbb, 0x50, 0xcc, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x14, 0x02, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27,
@@ -2023,7 +2023,7 @@
     0x08, 0xfb, 0x0f, 0x24, 0x14, 0xc6, 0x81, 0x81, 0x08, 0xc9, 0xb1, 0x2c, 0x74, 0x84, 0xc0, 0xcf, 0xf1, 0x38, 0xfb, 0x0f, 0x81,
     0xef, 0x68, 0xb8, 0x4d, 0x63, 0xbe, 0x62, 0x01, 0x6c, 0x9b, 0xd5, 0x4d, 0x1d, 0xf6, 0x52, 0xb4, 0xe9, 0x74, 0x4c, 0x18,
 };
-const uint8_t sChipTest_NOC_Subject_FabricId_Missing_Cert_CHIP[269] = {
+const uint8_t sChipTest_NOC_Subject_FabricId_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x6b, 0xf3, 0xa6, 0xf6, 0x6d, 0x62, 0x92, 0xc9, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde, 0xde, 0xde, 0x18,
@@ -2038,7 +2038,7 @@
     0x19, 0x90, 0xaa, 0x54, 0x8f, 0x17, 0x85, 0xcb, 0x3b, 0x1c, 0x60, 0x32, 0x35, 0xd8, 0x46, 0xa8, 0x63, 0xca, 0xf5, 0xdc, 0x1c,
     0xc9, 0x4c, 0x53, 0x09, 0x9c, 0xf4, 0xda, 0xb3, 0xc9, 0x65, 0xaf, 0x42, 0xe6, 0x86, 0x7c, 0x77, 0x18,
 };
-const uint8_t sChipTest_NOC_Subject_FabricId_Invalid_Cert_CHIP[272] = {
+const uint8_t sChipTest_NOC_Subject_FabricId_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x17, 0x7e, 0xe9, 0xbf, 0x7f, 0x75, 0x4f, 0x60, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde, 0xde, 0xde, 0x24,
@@ -2053,7 +2053,7 @@
     0xd5, 0x91, 0x2d, 0xe1, 0x72, 0x0e, 0x7e, 0x84, 0x2a, 0x16, 0x11, 0x73, 0x06, 0x64, 0x7a, 0xb8, 0xad, 0x06, 0xba, 0xf3, 0x71,
     0x75, 0xbd, 0x2a, 0xd8, 0x9e, 0x50, 0x4d, 0xd0, 0x34, 0x71, 0xa6, 0x2a, 0xba, 0x57, 0x73, 0x3a, 0xfc, 0xd9, 0xb2, 0x18,
 };
-const uint8_t sChipTest_ICAC_Subject_FabricId_Invalid_Cert_CHIP[255] = {
+const uint8_t sChipTest_ICAC_Subject_FabricId_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x79, 0x8a, 0x09, 0x98, 0x36, 0x21, 0x95, 0xaa, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c,
     0x37, 0x06, 0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x24, 0x15, 0x00, 0x18, 0x24, 0x07, 0x01, 0x24,
@@ -2068,7 +2068,7 @@
     0x9a, 0x35, 0x47, 0x85, 0xaa, 0xe2, 0xad, 0xea, 0x59, 0xdc, 0x7f, 0x32, 0xcf, 0xe2, 0xef, 0xc8, 0x1d, 0x13, 0x5a, 0xce,
     0x18, 0x6a, 0xea, 0xa8, 0xcf, 0x41, 0xe4, 0x1a, 0x00, 0x4b, 0x7a, 0x9d, 0xe0, 0xac, 0x18,
 };
-const uint8_t sChipTest_RCAC_Subject_FabricId_Invalid_Cert_CHIP[238] = {
+const uint8_t sChipTest_RCAC_Subject_FabricId_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x66, 0x22, 0xe8, 0xf6, 0x23, 0xcc, 0x9e, 0x07, 0x24, 0x02, 0x01, 0x37, 0x03, 0x24, 0x15, 0x00,
     0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x24, 0x15, 0x00, 0x18, 0x24,
     0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04, 0x9d, 0x9c, 0x47, 0x62, 0x98, 0x2d, 0x5d, 0x08, 0x0f, 0x88, 0x6b,
@@ -2082,7 +2082,7 @@
     0xab, 0x78, 0xd7, 0x36, 0xdd, 0xe3, 0xcc, 0x37, 0x5b, 0xb3, 0x86, 0xfe, 0x04, 0x8e, 0x24, 0x33, 0x3f, 0xf2, 0xb6, 0xd9,
     0xe0, 0x8b, 0xc4, 0xfb, 0xd6, 0x1c, 0x7a, 0xc3, 0xcd, 0x07, 0x2e, 0x42, 0xff, 0x57, 0x0e, 0x33, 0x8f, 0x18,
 };
-const uint8_t sChipTest_NOC_Subject_FabricId_Twice_Cert_CHIP[289] = {
+const uint8_t sChipTest_NOC_Subject_FabricId_Twice_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x53, 0x17, 0xb7, 0x28, 0xbe, 0x42, 0x7c, 0xd8, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde, 0xde, 0xde, 0x27,
@@ -2098,7 +2098,7 @@
     0x0c, 0x5f, 0x4d, 0x25, 0xbc, 0xd4, 0x59, 0xda, 0x32, 0x94, 0x6f, 0x59, 0x39, 0xa9, 0xbb, 0x46, 0x8c, 0x4f, 0x84, 0x2d, 0x31,
     0x98, 0x0d, 0xb0, 0x0f, 0x54, 0xcd, 0x04, 0x9d, 0xc1, 0xd0, 0x6d, 0xc5, 0xd6, 0xf9, 0x08, 0x18,
 };
-const uint8_t sChipTest_ICAC_Subject_FabricId_Twice_Cert_CHIP[272] = {
+const uint8_t sChipTest_ICAC_Subject_FabricId_Twice_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x69, 0xd9, 0x64, 0x57, 0x40, 0x86, 0x9b, 0x99, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x27,
@@ -2113,7 +2113,7 @@
     0xed, 0x9e, 0x00, 0x88, 0x8f, 0x16, 0x17, 0xbb, 0x30, 0xfe, 0x1b, 0xbd, 0x4e, 0xb6, 0xa8, 0xeb, 0x7b, 0x7e, 0x6e, 0x55, 0xec,
     0x42, 0xaf, 0x92, 0x9b, 0xfa, 0x18, 0xbd, 0x6a, 0x80, 0xf0, 0x78, 0xa9, 0x93, 0x8a, 0x09, 0x93, 0x7d, 0x94, 0x23, 0x18,
 };
-const uint8_t sChipTest_RCAC_Subject_FabricId_Twice_Cert_CHIP[272] = {
+const uint8_t sChipTest_RCAC_Subject_FabricId_Twice_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x11, 0xaf, 0xf1, 0x5d, 0x5b, 0x2a, 0xb1, 0xd8, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x15, 0x1d, 0x00,
     0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x27, 0x15, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x27,
@@ -2128,7 +2128,7 @@
     0xa4, 0x41, 0x9a, 0xff, 0x38, 0x3b, 0x5e, 0x4b, 0x93, 0x9a, 0x91, 0x2c, 0xe8, 0xb6, 0xb3, 0xab, 0x74, 0xc9, 0xfc, 0xe5, 0x05,
     0x4b, 0x2c, 0xc8, 0xf4, 0xf2, 0xee, 0x11, 0xb2, 0x14, 0x06, 0xb2, 0x06, 0xdb, 0xdf, 0x95, 0x4b, 0xad, 0xbe, 0x0d, 0x18,
 };
-const uint8_t sChipTest_NOC_Subject_CAT_Invalid_Cert_CHIP[285] = {
+const uint8_t sChipTest_NOC_Subject_CAT_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x5a, 0xbc, 0xd8, 0x11, 0xf5, 0xa4, 0x99, 0xb7, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde, 0xde, 0xde, 0x27,
@@ -2144,7 +2144,7 @@
     0xce, 0x7f, 0x79, 0xff, 0xa5, 0x3c, 0x00, 0x41, 0xe4, 0x49, 0x4b, 0x9a, 0x20, 0xba, 0x48, 0x5b, 0x1d, 0xd2, 0x54, 0x25, 0x56,
     0x0a, 0x4c, 0xed, 0xa5, 0x6c, 0x5a, 0x47, 0xc0, 0x31, 0xd6, 0xa0, 0x18,
 };
-const uint8_t sChipTest_ICAC_Subject_CAT_Invalid_Cert_CHIP[268] = {
+const uint8_t sChipTest_ICAC_Subject_CAT_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x2a, 0xef, 0x84, 0xb8, 0x2d, 0x91, 0xfb, 0x38, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x26,
@@ -2159,7 +2159,7 @@
     0xec, 0xc4, 0x51, 0xd9, 0x0f, 0xbe, 0x3e, 0x53, 0x27, 0xf4, 0x4b, 0x3d, 0xaa, 0xbf, 0x57, 0xbf, 0x93, 0x2b, 0xc1, 0xf3, 0xa8,
     0xfd, 0x19, 0x07, 0xb3, 0x80, 0x5a, 0x4f, 0x19, 0x13, 0xe7, 0x4e, 0x29, 0x68, 0xe9, 0x43, 0x18,
 };
-const uint8_t sChipTest_RCAC_Subject_CAT_Invalid_Cert_CHIP[264] = {
+const uint8_t sChipTest_RCAC_Subject_CAT_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x54, 0x65, 0x73, 0x85, 0xbf, 0x7a, 0xd6, 0xcf, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x26, 0x16, 0x00, 0x00, 0xcd, 0xab, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05,
     0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x26, 0x16, 0x00, 0x00, 0xcd,
@@ -2174,7 +2174,7 @@
     0x05, 0x98, 0xe9, 0x11, 0xe0, 0x8f, 0xec, 0xd6, 0x28, 0x3a, 0x76, 0x32, 0xba, 0x3c, 0x1f, 0x36, 0xac, 0xcf, 0xbf, 0x58, 0x11,
     0xf5, 0x9d, 0x09, 0x27, 0xfe, 0x1c, 0xde, 0x69, 0x8d, 0xba, 0x86, 0x18,
 };
-const uint8_t sChipTest_NOC_Subject_CAT_Twice_Cert_CHIP[291] = {
+const uint8_t sChipTest_NOC_Subject_CAT_Twice_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x20, 0xe6, 0xe5, 0x46, 0x55, 0x2a, 0xc3, 0x4f, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04, 0xef, 0x17,
     0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde, 0xde, 0xde, 0x27,
@@ -2190,7 +2190,7 @@
     0x12, 0x92, 0x69, 0x7b, 0x81, 0x6a, 0xc4, 0x0d, 0xe9, 0x41, 0x57, 0x8b, 0x4c, 0xbb, 0x6f, 0x40, 0x27, 0x16, 0x31, 0xa4, 0xf6,
     0x1b, 0x13, 0xfe, 0x32, 0xb1, 0x01, 0xf4, 0x1c, 0xfb, 0xab, 0x2f, 0x0d, 0x7f, 0xf7, 0x14, 0x1a, 0x3e, 0x18,
 };
-const uint8_t sChipTest_ICAC_Subject_CAT_Twice_Cert_CHIP[274] = {
+const uint8_t sChipTest_ICAC_Subject_CAT_Twice_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x79, 0xbc, 0x9a, 0x7b, 0xbf, 0xe4, 0xc1, 0x38, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c,
     0x37, 0x06, 0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2206,7 +2206,7 @@
     0x7c, 0xd0, 0x3c, 0x29, 0x09, 0x41, 0xed, 0xb8, 0x1f, 0xa6, 0x35, 0x5d, 0x12, 0xac, 0x01, 0xe7, 0x85, 0xf3, 0x00, 0xd1,
     0x46, 0xff, 0x8a, 0xf5, 0xe2, 0xb7, 0xb5, 0xa3, 0xb5, 0xd3, 0x0b, 0xf6, 0xd3, 0x18,
 };
-const uint8_t sChipTest_RCAC_Subject_CAT_Twice_Cert_CHIP[276] = {
+const uint8_t sChipTest_RCAC_Subject_CAT_Twice_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x4b, 0x51, 0x29, 0x6c, 0x51, 0x83, 0x07, 0x2f, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x26, 0x16, 0x10, 0x00, 0xcd, 0xab, 0x26, 0x16, 0x18, 0x00, 0xcd, 0xab, 0x18,
     0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00,
@@ -2222,7 +2222,7 @@
     0x59, 0xe0, 0xf3, 0x47, 0xe8, 0x67, 0xb4, 0xce, 0xac, 0x71, 0x26, 0xe4, 0x7a, 0x7f, 0x81, 0x08, 0x6d, 0xfa, 0xc5, 0x84,
     0x88, 0x7e, 0x8e, 0x17, 0x3a, 0xe6, 0x46, 0x17, 0x6e, 0x4a, 0xa2, 0x01, 0xef, 0x12, 0x08, 0x18,
 };
-const uint8_t sChipTest_NOC_Sig_Curve_Secp256k1_Cert_CHIP[279] = {
+const uint8_t sChipTest_NOC_Sig_Curve_Secp256k1_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x58, 0x17, 0x5b, 0x5f, 0x85, 0xea, 0xf7, 0x8b, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2238,7 +2238,7 @@
     0x24, 0x53, 0xb0, 0x23, 0x8d, 0xd5, 0x9a, 0x09, 0x61, 0x79, 0x02, 0x8d, 0x41, 0x78, 0x60, 0xf3, 0x0e, 0x29, 0xa5, 0x86,
     0x4c, 0xf0, 0xa1, 0xe2, 0xca, 0x63, 0xd1, 0xb9, 0x6a, 0x48, 0x6a, 0xb4, 0x30, 0x1a, 0xf1, 0xe6, 0x72, 0x18, 0x18,
 };
-const uint8_t sChipTest_ICAC_Sig_Curve_Secp256k1_Cert_CHIP[262] = {
+const uint8_t sChipTest_ICAC_Sig_Curve_Secp256k1_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x4b, 0x48, 0x12, 0x3b, 0xd2, 0x84, 0x19, 0x26, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -2253,7 +2253,7 @@
     0xa5, 0x6a, 0xbb, 0x02, 0xaf, 0x94, 0x4f, 0xc4, 0x67, 0x79, 0x95, 0xbd, 0x82, 0x16, 0x36, 0x11, 0x1c, 0xa9, 0x76, 0x30, 0x87,
     0x5c, 0x99, 0xf5, 0x64, 0x76, 0x4b, 0x54, 0x1e, 0x5e, 0x18,
 };
-const uint8_t sChipTest_RCAC_Sig_Curve_Secp256k1_Cert_CHIP[252] = {
+const uint8_t sChipTest_RCAC_Sig_Curve_Secp256k1_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x3e, 0xf1, 0x12, 0x9c, 0x45, 0xd2, 0xc5, 0x56, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x02, 0x30, 0x09, 0x41, 0x04,
@@ -2267,7 +2267,7 @@
     0x8b, 0x5f, 0x5d, 0x8e, 0xd9, 0xcc, 0x75, 0xcb, 0x6d, 0x16, 0xb3, 0x41, 0xb6, 0x28, 0x09, 0xd9, 0x22, 0xdd, 0xe5, 0x23, 0x14,
     0x97, 0x7a, 0x30, 0x2e, 0x1b, 0xb6, 0x67, 0x89, 0x6a, 0x4c, 0xe8, 0x20, 0xdb, 0x3b, 0x19, 0x44, 0x83, 0x4e, 0x4a, 0x66, 0x18,
 };
-const uint8_t sChipTest_NOC_PublicKey_Wrong_Cert_CHIP[279] = {
+const uint8_t sChipTest_NOC_PublicKey_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x13, 0xf3, 0xa8, 0xa4, 0x1e, 0x62, 0x47, 0x21, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2283,7 +2283,7 @@
     0xcc, 0xba, 0xb4, 0x02, 0x73, 0x8b, 0xeb, 0xd1, 0x61, 0xa9, 0xe3, 0xc2, 0xf2, 0xbb, 0x3a, 0x97, 0x7a, 0xfb, 0x00, 0x68,
     0x7b, 0x45, 0x3c, 0x74, 0xc3, 0xdd, 0xdf, 0x5b, 0xf4, 0x79, 0x1b, 0x09, 0x2e, 0x22, 0x13, 0xe0, 0x77, 0x7d, 0x18,
 };
-const uint8_t sChipTest_ICAC_PublicKey_Wrong_Cert_CHIP[262] = {
+const uint8_t sChipTest_ICAC_PublicKey_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x0e, 0x0d, 0x45, 0xcd, 0xc3, 0x15, 0x11, 0x23, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -2298,7 +2298,7 @@
     0x46, 0x26, 0xd4, 0x91, 0x3d, 0x7d, 0xf6, 0x16, 0xe4, 0x34, 0x26, 0xd1, 0xb3, 0xc5, 0x4a, 0x77, 0x61, 0x46, 0x4f, 0xc9, 0x80,
     0x2b, 0x6a, 0xae, 0xb0, 0x29, 0x19, 0xf0, 0x22, 0xfe, 0x18,
 };
-const uint8_t sChipTest_RCAC_PublicKey_Wrong_Cert_CHIP[252] = {
+const uint8_t sChipTest_RCAC_PublicKey_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x00, 0xe0, 0xca, 0x7a, 0xf4, 0xe5, 0xf7, 0x8f, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2312,7 +2312,7 @@
     0x34, 0xa3, 0x76, 0x31, 0x7f, 0x5f, 0x26, 0xcb, 0xe0, 0x57, 0x73, 0xc1, 0x30, 0x86, 0x5a, 0x4a, 0x5c, 0x3f, 0xa7, 0xf7, 0x41,
     0x90, 0x3b, 0x97, 0xf0, 0xbb, 0xfc, 0x19, 0x86, 0xdf, 0xcf, 0x64, 0x8a, 0x47, 0x9c, 0x71, 0xe1, 0x3b, 0xa7, 0xa0, 0xea, 0x18,
 };
-const uint8_t sChipTest_NOC_Ext_Basic_Missing_Cert_CHIP[274] = {
+const uint8_t sChipTest_NOC_Ext_Basic_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x00, 0xe0, 0x71, 0xab, 0x27, 0xaa, 0xa5, 0x83, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2328,7 +2328,7 @@
     0x32, 0x54, 0x3c, 0x8a, 0xcb, 0xbd, 0x13, 0xc3, 0x5e, 0x1c, 0x13, 0xc7, 0xfa, 0xc7, 0x9e, 0x40, 0xe5, 0xc8, 0xa5, 0x40,
     0x76, 0xff, 0xe1, 0x11, 0x9d, 0xea, 0xcf, 0xa9, 0x8b, 0x60, 0xd9, 0x69, 0xcc, 0x18,
 };
-const uint8_t sChipTest_ICAC_Ext_Basic_Missing_Cert_CHIP[257] = {
+const uint8_t sChipTest_ICAC_Ext_Basic_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x34, 0x0c, 0xdd, 0x5f, 0xfa, 0x7c, 0x8c, 0xae, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c,
     0x37, 0x06, 0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2343,7 +2343,7 @@
     0xb8, 0x82, 0xe7, 0xf6, 0xb8, 0x32, 0xe4, 0xef, 0x5c, 0xb5, 0x6f, 0xed, 0xd5, 0x9a, 0x92, 0x51, 0x48, 0x87, 0x7f, 0x77,
     0xb0, 0xc4, 0xcd, 0xd8, 0x37, 0x08, 0xe6, 0xf1, 0xa4, 0x77, 0x1c, 0x40, 0xa0, 0x4d, 0x96, 0xc3, 0x18,
 };
-const uint8_t sChipTest_RCAC_Ext_Basic_Missing_Cert_CHIP[247] = {
+const uint8_t sChipTest_RCAC_Ext_Basic_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x13, 0x05, 0x5d, 0xd2, 0xa1, 0x17, 0x56, 0xdd, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2357,7 +2357,7 @@
     0xd1, 0xe7, 0xb7, 0xa0, 0xc1, 0xd7, 0xc0, 0xa3, 0x20, 0x8c, 0xb5, 0xce, 0x75, 0x77, 0x16, 0xb8, 0xfd, 0x3a, 0x79, 0x9a, 0x00,
     0x09, 0x02, 0xbe, 0x54, 0xb8, 0x5b, 0x8a, 0xe0, 0xfa, 0xd8, 0x48, 0x3d, 0xbe, 0xd9, 0xa6, 0x18,
 };
-const uint8_t sChipTest_NOC_Ext_Basic_CA_Missing_Cert_CHIP[277] = {
+const uint8_t sChipTest_NOC_Ext_Basic_CA_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x01, 0xd0, 0xb3, 0x6c, 0x8d, 0x34, 0x5a, 0x06, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2373,7 +2373,7 @@
     0x39, 0x3e, 0x48, 0xb2, 0x63, 0x8d, 0xdb, 0xae, 0x5f, 0xe6, 0x26, 0x8d, 0x05, 0x6b, 0xca, 0xeb, 0x82, 0xb0, 0x7c, 0xde,
     0xb0, 0x72, 0xda, 0xf0, 0x75, 0x66, 0x40, 0x90, 0x8a, 0xbd, 0x80, 0x69, 0x17, 0x1b, 0x98, 0x63, 0x18,
 };
-const uint8_t sChipTest_ICAC_Ext_Basic_CA_Missing_Cert_CHIP[260] = {
+const uint8_t sChipTest_ICAC_Ext_Basic_CA_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x10, 0x0d, 0xad, 0x02, 0x89, 0x70, 0x22, 0xae, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c,
     0x37, 0x06, 0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2388,7 +2388,7 @@
     0xb0, 0xef, 0x73, 0xb7, 0x5f, 0xd8, 0x32, 0x7f, 0xe7, 0x03, 0xf3, 0xef, 0x8a, 0x16, 0x7d, 0x6f, 0xe0, 0xd7, 0xf9, 0x82,
     0x4f, 0x6a, 0x1a, 0x70, 0xec, 0x2f, 0x74, 0x41, 0x95, 0x52, 0x23, 0x4e, 0x45, 0xed, 0x11, 0xbd, 0x58, 0xe4, 0x07, 0x18,
 };
-const uint8_t sChipTest_RCAC_Ext_Basic_CA_Missing_Cert_CHIP[250] = {
+const uint8_t sChipTest_RCAC_Ext_Basic_CA_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x6b, 0xb5, 0x91, 0x53, 0x37, 0xee, 0x45, 0x2a, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2402,7 +2402,7 @@
     0x9e, 0x5c, 0x4e, 0xd8, 0x7d, 0xfb, 0x92, 0xa6, 0x21, 0xb6, 0x94, 0xa0, 0xb1, 0x1e, 0x01, 0x93, 0x59, 0x39, 0x01, 0xc0, 0x73,
     0x10, 0x9a, 0x1d, 0xfa, 0x00, 0x2e, 0xbc, 0xcc, 0x81, 0x3c, 0xcf, 0x12, 0x0c, 0x79, 0xbc, 0x43, 0x37, 0x6f, 0x18,
 };
-const uint8_t sChipTest_NOC_Ext_Basic_CA_Wrong_Cert_CHIP[279] = {
+const uint8_t sChipTest_NOC_Ext_Basic_CA_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x33, 0xc1, 0xc7, 0x50, 0x36, 0x97, 0x62, 0xc1, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2418,7 +2418,7 @@
     0x22, 0x44, 0x5d, 0x44, 0xc0, 0x06, 0x89, 0x1a, 0x9c, 0x43, 0x80, 0xb0, 0xa5, 0x06, 0x3f, 0x17, 0xef, 0x00, 0x11, 0x2f,
     0x6d, 0xcf, 0xe4, 0x4a, 0x41, 0x2c, 0x2f, 0xd0, 0xc1, 0x03, 0xf2, 0xba, 0x43, 0x53, 0xb1, 0x6d, 0x9a, 0x90, 0x18,
 };
-const uint8_t sChipTest_ICAC_Ext_Basic_CA_Wrong_Cert_CHIP[262] = {
+const uint8_t sChipTest_ICAC_Ext_Basic_CA_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x22, 0xb0, 0x7e, 0x34, 0xb5, 0xa2, 0xa9, 0x4c, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -2433,7 +2433,7 @@
     0xff, 0xdd, 0xc1, 0x17, 0x6b, 0xdf, 0x77, 0xb5, 0xb8, 0xc1, 0xa1, 0x22, 0xd8, 0xbf, 0x4f, 0x63, 0x3b, 0x92, 0x26, 0x96, 0xf8,
     0xde, 0x9c, 0xc0, 0x23, 0x06, 0x3a, 0x41, 0x58, 0x23, 0x18,
 };
-const uint8_t sChipTest_RCAC_Ext_Basic_CA_Wrong_Cert_CHIP[252] = {
+const uint8_t sChipTest_RCAC_Ext_Basic_CA_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x23, 0x34, 0xfc, 0x3d, 0xef, 0x9a, 0xdc, 0x0c, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2447,7 +2447,7 @@
     0x04, 0x6b, 0x88, 0x46, 0x11, 0x49, 0xf0, 0xd3, 0x74, 0x0b, 0xe0, 0x71, 0x98, 0x32, 0x49, 0x3a, 0x2e, 0x16, 0x8e, 0x39, 0xd6,
     0x12, 0x4e, 0x5f, 0xe2, 0xf4, 0xad, 0x98, 0xdb, 0x5d, 0x49, 0x9d, 0x5c, 0x76, 0xac, 0x4b, 0xbb, 0x81, 0xd2, 0x83, 0x9f, 0x18,
 };
-const uint8_t sChipTest_NOC_Ext_Basic_PathLen_Presence_Wrong_Cert_CHIP[279] = {
+const uint8_t sChipTest_NOC_Ext_Basic_PathLen_Presence_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x0b, 0x86, 0x21, 0x41, 0x75, 0x05, 0x6a, 0x67, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2463,7 +2463,7 @@
     0x5d, 0x1a, 0xe4, 0x7b, 0xfa, 0xe5, 0x1f, 0x34, 0x1e, 0x39, 0x94, 0xb1, 0x1b, 0xbb, 0x99, 0x10, 0xc3, 0x2b, 0xf9, 0x5b,
     0xff, 0x1a, 0xce, 0xb8, 0x24, 0x86, 0xb5, 0x1b, 0x60, 0x03, 0xcc, 0x27, 0x94, 0x48, 0x2d, 0x82, 0x42, 0x3a, 0x18,
 };
-const uint8_t sChipTest_ICAC_Ext_Basic_PathLen_Presence_Wrong_Cert_CHIP[262] = {
+const uint8_t sChipTest_ICAC_Ext_Basic_PathLen_Presence_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x5a, 0xf2, 0x09, 0x6a, 0x40, 0x21, 0x27, 0xc8, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -2478,7 +2478,7 @@
     0x86, 0x0b, 0xb8, 0xc0, 0x8b, 0x0a, 0x39, 0x00, 0xb5, 0x6b, 0xfd, 0x4a, 0x7e, 0x88, 0x5c, 0xae, 0x2a, 0xbe, 0x65, 0x2a, 0x38,
     0xcc, 0xf5, 0xdb, 0xf7, 0xdf, 0x68, 0xbe, 0xf0, 0x2a, 0x18,
 };
-const uint8_t sChipTest_RCAC_Ext_Basic_PathLen_Presence_Wrong_Cert_CHIP[252] = {
+const uint8_t sChipTest_RCAC_Ext_Basic_PathLen_Presence_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x11, 0xab, 0x40, 0x8a, 0x5e, 0x23, 0x2a, 0xb7, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2492,7 +2492,7 @@
     0x81, 0x15, 0x95, 0xd8, 0x44, 0x9b, 0x28, 0x61, 0x1d, 0x06, 0xee, 0x26, 0x33, 0xad, 0x4b, 0x5d, 0x30, 0x46, 0x26, 0xe0, 0x13,
     0xfc, 0x6c, 0xcf, 0x95, 0x3b, 0x17, 0xa4, 0xf8, 0xea, 0xd2, 0x67, 0x63, 0xb4, 0x42, 0xb1, 0x9d, 0x67, 0x56, 0xf5, 0x2e, 0x18,
 };
-const uint8_t sChipTest_NOC_Ext_Basic_PathLen2_Cert_CHIP[279] = {
+const uint8_t sChipTest_NOC_Ext_Basic_PathLen2_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x7b, 0xfb, 0x4a, 0xdc, 0x30, 0xef, 0x6f, 0x33, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2508,7 +2508,7 @@
     0x85, 0xd7, 0x9b, 0xfa, 0x3f, 0xab, 0x71, 0x5e, 0x76, 0x64, 0x77, 0x8f, 0x1c, 0xf3, 0xe7, 0xe0, 0x38, 0xc3, 0x55, 0x1e,
     0xc9, 0xdb, 0x07, 0xc2, 0x4b, 0x52, 0x60, 0xa0, 0x1d, 0xc6, 0x21, 0x02, 0x2a, 0x40, 0x15, 0xda, 0x7e, 0x05, 0x18,
 };
-const uint8_t sChipTest_ICAC_Ext_Basic_PathLen2_Cert_CHIP[262] = {
+const uint8_t sChipTest_ICAC_Ext_Basic_PathLen2_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x12, 0x85, 0x81, 0xb1, 0x01, 0x89, 0x25, 0xac, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -2523,7 +2523,7 @@
     0xef, 0x95, 0x75, 0xf9, 0xf8, 0xe1, 0x96, 0xff, 0x97, 0x20, 0x2d, 0xec, 0xf2, 0x78, 0x8a, 0xae, 0x29, 0xea, 0xf0, 0x1a, 0x53,
     0x58, 0xd6, 0x46, 0xb8, 0x25, 0x83, 0xd8, 0xe9, 0xd0, 0x18,
 };
-const uint8_t sChipTest_RCAC_Ext_Basic_PathLen2_Cert_CHIP[252] = {
+const uint8_t sChipTest_RCAC_Ext_Basic_PathLen2_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x55, 0xc3, 0xe6, 0xec, 0xd7, 0x17, 0xdd, 0xd5, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2537,7 +2537,7 @@
     0xcd, 0x1a, 0x64, 0x14, 0x55, 0x22, 0xad, 0x60, 0x55, 0xa3, 0xcb, 0xe7, 0x5f, 0x28, 0xd8, 0xe0, 0x7b, 0xbe, 0x54, 0x07, 0x31,
     0x12, 0x03, 0x65, 0x8f, 0x56, 0x0b, 0x6e, 0xd6, 0x12, 0x90, 0x66, 0x74, 0x30, 0x08, 0x67, 0x93, 0x02, 0x43, 0x90, 0x7d, 0x18,
 };
-const uint8_t sChipTest_NOC_Ext_KeyUsage_Missing_Cert_CHIP[276] = {
+const uint8_t sChipTest_NOC_Ext_KeyUsage_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x7a, 0xb2, 0x45, 0x84, 0xb2, 0x67, 0x7b, 0x5e, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2553,7 +2553,7 @@
     0x9c, 0xaa, 0xd2, 0x94, 0x5e, 0x9d, 0x67, 0x46, 0x9e, 0x93, 0x9e, 0x28, 0xca, 0x68, 0x06, 0x6a, 0x0b, 0xc6, 0x34, 0xfc,
     0x75, 0xa0, 0x07, 0xe2, 0xd2, 0x8f, 0xe3, 0x18, 0x12, 0x82, 0xc0, 0x92, 0xbe, 0x69, 0xd2, 0x18,
 };
-const uint8_t sChipTest_ICAC_Ext_KeyUsage_Missing_Cert_CHIP[259] = {
+const uint8_t sChipTest_ICAC_Ext_KeyUsage_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x25, 0x48, 0x17, 0x8e, 0xd6, 0x4d, 0x72, 0xf4, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c,
     0x37, 0x06, 0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2568,7 +2568,7 @@
     0x33, 0x44, 0xdd, 0x40, 0xcd, 0x3c, 0xb6, 0x97, 0x16, 0x20, 0xf0, 0x28, 0x20, 0x8c, 0x4e, 0x35, 0x93, 0xe6, 0x82, 0x2e,
     0xcd, 0x27, 0x52, 0xde, 0xd3, 0x5e, 0x21, 0x1a, 0x69, 0x53, 0x84, 0x3a, 0xbb, 0x0d, 0x53, 0x3e, 0xf0, 0x6f, 0x18,
 };
-const uint8_t sChipTest_RCAC_Ext_KeyUsage_Missing_Cert_CHIP[249] = {
+const uint8_t sChipTest_RCAC_Ext_KeyUsage_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x40, 0xdb, 0xdb, 0x9f, 0x3a, 0xb7, 0xfb, 0xec, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2582,7 +2582,7 @@
     0x8c, 0x63, 0xa9, 0x31, 0x30, 0x67, 0xe4, 0xd5, 0x8b, 0x96, 0xd0, 0x2f, 0x9a, 0x2e, 0x9f, 0xe2, 0x6d, 0xc4, 0xe0, 0x44, 0x58,
     0x7b, 0x67, 0x70, 0x6d, 0xc7, 0x4d, 0x5b, 0x2c, 0x31, 0x32, 0x5b, 0x31, 0x7d, 0x8b, 0xfc, 0x14, 0x86, 0x18,
 };
-const uint8_t sChipTest_NOC_Ext_KeyUsage_KeyCertSign_Wrong_Cert_CHIP[279] = {
+const uint8_t sChipTest_NOC_Ext_KeyUsage_KeyCertSign_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x61, 0xec, 0xf8, 0xbb, 0x7d, 0x9a, 0x24, 0xd4, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2598,7 +2598,7 @@
     0x22, 0x56, 0xae, 0x8a, 0xa4, 0x60, 0xa6, 0x63, 0x3a, 0x60, 0xd7, 0xaf, 0x6e, 0x51, 0xaf, 0xcf, 0xb9, 0xcd, 0xc8, 0x9f,
     0x7b, 0x9e, 0xc9, 0xe2, 0x9c, 0x20, 0x89, 0x55, 0x0d, 0x27, 0xe2, 0xff, 0x36, 0xa1, 0x6b, 0x96, 0x66, 0x02, 0x18,
 };
-const uint8_t sChipTest_ICAC_Ext_KeyUsage_KeyCertSign_Wrong_Cert_CHIP[262] = {
+const uint8_t sChipTest_ICAC_Ext_KeyUsage_KeyCertSign_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x02, 0x5a, 0x32, 0xde, 0x7e, 0x72, 0xfe, 0x3f, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -2613,7 +2613,7 @@
     0xf1, 0x74, 0x5d, 0x0b, 0xee, 0x0a, 0xc7, 0xa1, 0x5a, 0x2d, 0x35, 0x94, 0xdf, 0x98, 0x16, 0x01, 0x3b, 0x70, 0x2c, 0xa3, 0x13,
     0xe6, 0x91, 0x05, 0x64, 0x00, 0x75, 0x88, 0xbb, 0x3e, 0x18,
 };
-const uint8_t sChipTest_RCAC_Ext_KeyUsage_KeyCertSign_Wrong_Cert_CHIP[252] = {
+const uint8_t sChipTest_RCAC_Ext_KeyUsage_KeyCertSign_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x3c, 0x32, 0x40, 0xab, 0x13, 0x12, 0xb7, 0xba, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2627,7 +2627,7 @@
     0x9a, 0x08, 0xb4, 0x45, 0x3e, 0xdd, 0xac, 0xff, 0xe4, 0xfc, 0x82, 0x57, 0x7b, 0x35, 0xf1, 0x3c, 0xcb, 0x9d, 0x82, 0xf1, 0x9d,
     0x0c, 0x2e, 0xe9, 0xd5, 0x5d, 0x26, 0x03, 0x40, 0x7a, 0xdb, 0x52, 0xd6, 0x2f, 0xc3, 0x48, 0x0e, 0x5e, 0xb7, 0x93, 0xdc, 0x18,
 };
-const uint8_t sChipTest_NOC_Ext_AKID_Missing_Cert_CHIP[256] = {
+const uint8_t sChipTest_NOC_Ext_AKID_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x0b, 0x1e, 0xe3, 0x0f, 0xf4, 0x00, 0xb3, 0x03, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2642,7 +2642,7 @@
     0x4d, 0xdc, 0x80, 0x9b, 0x67, 0xeb, 0x30, 0xc4, 0x85, 0x35, 0x67, 0x81, 0x71, 0xd3, 0x7e, 0x1c, 0x36, 0xf9, 0x14, 0x96,
     0xd0, 0xb5, 0x10, 0x8b, 0x05, 0x5e, 0x3a, 0x9b, 0x4b, 0xa8, 0x76, 0xe5, 0x41, 0x0f, 0xe1, 0x18,
 };
-const uint8_t sChipTest_ICAC_Ext_AKID_Missing_Cert_CHIP[239] = {
+const uint8_t sChipTest_ICAC_Ext_AKID_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x52, 0x3d, 0xe1, 0x2f, 0xae, 0x0b, 0xeb, 0x15, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c,
     0x37, 0x06, 0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2656,7 +2656,7 @@
     0x45, 0x31, 0x76, 0x59, 0xe9, 0x42, 0x90, 0xcf, 0x61, 0x42, 0x83, 0xdb, 0x6d, 0x02, 0xeb, 0x49, 0xe9, 0x52, 0xcd, 0x3f,
     0x21, 0xc3, 0xe5, 0xf2, 0x6a, 0x4e, 0x7f, 0x98, 0x55, 0xb1, 0xb8, 0x2c, 0x34, 0x80, 0xac, 0x28, 0xbb, 0x44, 0x18,
 };
-const uint8_t sChipTest_RCAC_Ext_AKID_Missing_Cert_CHIP[229] = {
+const uint8_t sChipTest_RCAC_Ext_AKID_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x1c, 0x8e, 0xf7, 0xa3, 0xf9, 0xde, 0x11, 0x3e, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2669,7 +2669,7 @@
     0xcd, 0x37, 0xd2, 0x6c, 0x77, 0xb6, 0xf5, 0xa2, 0xaf, 0xd1, 0x3b, 0xe2, 0x50, 0xaa, 0xc0, 0x3b, 0x48, 0x29, 0xcc, 0x21, 0x3c,
     0x6a, 0x6c, 0x56, 0xf5, 0x12, 0xad, 0x93, 0x69, 0x4c, 0xf9, 0x8c, 0xf3, 0xcc, 0x65, 0x26, 0xab, 0x9e, 0xf7, 0x18,
 };
-const uint8_t sChipTest_NOC_Ext_AKID_Length_Invalid_Cert_CHIP[278] = {
+const uint8_t sChipTest_NOC_Ext_AKID_Length_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x50, 0xc7, 0xf7, 0x27, 0x54, 0x2f, 0xa3, 0xf4, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2685,7 +2685,7 @@
     0xd5, 0x38, 0x73, 0x2e, 0x44, 0xf3, 0xb9, 0x6e, 0x9a, 0x23, 0x7d, 0x21, 0x4c, 0xb9, 0xae, 0xe8, 0x95, 0xc8, 0x44, 0x0b,
     0x6a, 0x93, 0x90, 0x60, 0x6b, 0xfa, 0xd8, 0x75, 0xfd, 0x3e, 0xd7, 0x49, 0x82, 0xfb, 0x76, 0xac, 0x17, 0x18,
 };
-const uint8_t sChipTest_ICAC_Ext_AKID_Length_Invalid_Cert_CHIP[261] = {
+const uint8_t sChipTest_ICAC_Ext_AKID_Length_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x52, 0x2a, 0xac, 0x6e, 0xca, 0x29, 0xe1, 0x43, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -2700,7 +2700,7 @@
     0x29, 0x54, 0x42, 0x6c, 0xbf, 0x3f, 0x5c, 0xb2, 0xcb, 0xf3, 0xe2, 0x1a, 0x35, 0xb7, 0xb1, 0x36, 0x68, 0xbf, 0xd0, 0xad, 0x1b,
     0xad, 0x89, 0x0c, 0x49, 0x4c, 0x47, 0x7f, 0xf9, 0x18,
 };
-const uint8_t sChipTest_RCAC_Ext_AKID_Length_Invalid_Cert_CHIP[251] = {
+const uint8_t sChipTest_RCAC_Ext_AKID_Length_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x06, 0x0c, 0x59, 0xd1, 0xc8, 0x43, 0xeb, 0xce, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2714,7 +2714,7 @@
     0x11, 0x51, 0x32, 0x54, 0xd1, 0xb7, 0xf0, 0x14, 0x66, 0x08, 0x3d, 0x5f, 0x38, 0xb9, 0x90, 0x14, 0x3b, 0x83, 0xe8, 0x88, 0x57,
     0x53, 0xf4, 0xe1, 0x10, 0xa6, 0x74, 0x0d, 0x22, 0x16, 0x85, 0x49, 0x90, 0x8a, 0x10, 0xf9, 0x88, 0xe6, 0x83, 0x57, 0x18,
 };
-const uint8_t sChipTest_NOC_Ext_SKID_Missing_Cert_CHIP[256] = {
+const uint8_t sChipTest_NOC_Ext_SKID_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x2e, 0x4c, 0xee, 0x19, 0x9f, 0xa2, 0xad, 0x45, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2729,7 +2729,7 @@
     0x9b, 0xea, 0x3d, 0x11, 0x3a, 0x71, 0x7a, 0x81, 0xcb, 0x9f, 0x21, 0xf9, 0x29, 0xe5, 0x59, 0x5a, 0x96, 0xf8, 0xa3, 0x68,
     0xf7, 0xc8, 0xe7, 0xe6, 0x8f, 0xc3, 0xda, 0xb5, 0x21, 0x44, 0x76, 0x8a, 0x2d, 0x01, 0x61, 0x18,
 };
-const uint8_t sChipTest_ICAC_Ext_SKID_Missing_Cert_CHIP[239] = {
+const uint8_t sChipTest_ICAC_Ext_SKID_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x37, 0x66, 0x06, 0x6f, 0x0b, 0x93, 0x68, 0xb6, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c,
     0x37, 0x06, 0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2743,7 +2743,7 @@
     0xb8, 0xa7, 0xac, 0x8f, 0x17, 0x8b, 0xe5, 0x82, 0xd8, 0xe8, 0x5e, 0x32, 0x62, 0xfe, 0xa1, 0xdb, 0x28, 0x02, 0x53, 0xce,
     0x8c, 0xf1, 0x51, 0x81, 0x09, 0xf9, 0x6c, 0x1a, 0x79, 0x8c, 0xbb, 0xff, 0x55, 0x81, 0xa3, 0xef, 0xdb, 0x35, 0x18,
 };
-const uint8_t sChipTest_RCAC_Ext_SKID_Missing_Cert_CHIP[229] = {
+const uint8_t sChipTest_RCAC_Ext_SKID_Missing_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x4e, 0xdf, 0xe6, 0xc4, 0xc5, 0xcc, 0x38, 0x50, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2756,7 +2756,7 @@
     0xef, 0x8c, 0x08, 0xdb, 0x01, 0x83, 0x3c, 0x63, 0x91, 0x49, 0xda, 0x9d, 0x47, 0x49, 0x23, 0x1f, 0x16, 0x81, 0x65, 0x4b, 0x51,
     0xc3, 0xb3, 0x88, 0xa7, 0x0d, 0x8c, 0x36, 0x66, 0x07, 0x4d, 0x6f, 0xa8, 0x95, 0xfe, 0x31, 0xa7, 0xa3, 0x36, 0x18,
 };
-const uint8_t sChipTest_NOC_Ext_SKID_Length_Invalid_Cert_CHIP[278] = {
+const uint8_t sChipTest_NOC_Ext_SKID_Length_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x16, 0x2a, 0x4d, 0xfa, 0x70, 0x32, 0x14, 0x48, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2772,7 +2772,7 @@
     0x03, 0x77, 0x1a, 0x7c, 0xde, 0x66, 0x90, 0x35, 0x31, 0x9e, 0x44, 0xac, 0xc9, 0x14, 0xb2, 0x7a, 0x1e, 0x48, 0xb7, 0xa0,
     0xce, 0x1c, 0x6a, 0x1e, 0x8f, 0xa6, 0x4e, 0xa1, 0xb4, 0xe9, 0xb0, 0xc9, 0x9c, 0x4b, 0x84, 0xa6, 0x11, 0x18,
 };
-const uint8_t sChipTest_ICAC_Ext_SKID_Length_Invalid_Cert_CHIP[261] = {
+const uint8_t sChipTest_ICAC_Ext_SKID_Length_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x31, 0x69, 0xff, 0xf4, 0x94, 0x51, 0xeb, 0x37, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -2787,7 +2787,7 @@
     0xc1, 0x68, 0x62, 0xb4, 0x35, 0x85, 0x73, 0xb5, 0xc1, 0x2f, 0xcc, 0x90, 0xeb, 0xbd, 0xdb, 0x6c, 0x8b, 0x8c, 0x93, 0x24, 0x1b,
     0x25, 0xc4, 0x6f, 0x75, 0x9e, 0x4e, 0x95, 0xf9, 0x18,
 };
-const uint8_t sChipTest_RCAC_Ext_SKID_Length_Invalid_Cert_CHIP[251] = {
+const uint8_t sChipTest_RCAC_Ext_SKID_Length_Invalid_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x02, 0xb4, 0xb6, 0x62, 0x7b, 0xff, 0x57, 0x93, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
@@ -2801,7 +2801,7 @@
     0xb7, 0xbf, 0xfd, 0x64, 0xad, 0x39, 0xaa, 0x06, 0x97, 0x73, 0x06, 0x34, 0x3a, 0xbc, 0x17, 0x21, 0x38, 0x1f, 0xd2, 0x40, 0xaf,
     0x35, 0x0a, 0x1a, 0x4e, 0x58, 0xeb, 0x6b, 0xb2, 0x41, 0x92, 0xce, 0xc4, 0xe5, 0x06, 0x4b, 0xf2, 0xcf, 0xbf, 0x38, 0x18,
 };
-const uint8_t sChipTest_NOC_Signature_Wrong_Cert_CHIP[279] = {
+const uint8_t sChipTest_NOC_Signature_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x07, 0x8d, 0xc6, 0xdc, 0x67, 0x57, 0xed, 0xe4, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x13, 0x04,
     0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18, 0x26, 0x04,
     0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06, 0x27, 0x11, 0x01, 0x00, 0x01, 0x00, 0xde, 0xde,
@@ -2817,7 +2817,7 @@
     0x67, 0x16, 0x2a, 0x20, 0x20, 0xc6, 0x9f, 0xf1, 0xb1, 0x93, 0x2b, 0x3c, 0xbe, 0xb2, 0xe0, 0x1d, 0x74, 0x22, 0xd2, 0x50,
     0x25, 0x70, 0xef, 0x9a, 0x31, 0xcd, 0x4c, 0x2c, 0x62, 0x98, 0x23, 0xe8, 0xcb, 0xd0, 0x12, 0x2a, 0x71, 0x30, 0x18,
 };
-const uint8_t sChipTest_ICAC_Signature_Wrong_Cert_CHIP[262] = {
+const uint8_t sChipTest_ICAC_Signature_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x4d, 0x7b, 0x5c, 0x64, 0x3e, 0x8f, 0xf8, 0x21, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x13, 0x03, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x27, 0x15, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfa, 0x18,
@@ -2832,7 +2832,7 @@
     0xd5, 0x13, 0xef, 0x70, 0x6e, 0xa5, 0x29, 0xa7, 0x66, 0x73, 0x44, 0x81, 0xeb, 0x6a, 0xa2, 0xce, 0x0a, 0x91, 0x40, 0xcf, 0xa5,
     0xd0, 0x50, 0x58, 0x4f, 0x1f, 0x2b, 0xb6, 0x7e, 0xd0, 0x18,
 };
-const uint8_t sChipTest_RCAC_Signature_Wrong_Cert_CHIP[252] = {
+const uint8_t sChipTest_RCAC_Signature_Wrong_Cert_CHIP[] = {
     0x15, 0x30, 0x01, 0x08, 0x6c, 0x65, 0x68, 0x4e, 0x24, 0xa0, 0x80, 0xbf, 0x24, 0x02, 0x01, 0x37, 0x03, 0x27, 0x14, 0x01, 0x00,
     0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x26, 0x04, 0xef, 0x17, 0x1b, 0x27, 0x26, 0x05, 0x6e, 0xb5, 0xb9, 0x4c, 0x37, 0x06,
     0x27, 0x14, 0x01, 0x00, 0x00, 0x00, 0xca, 0xca, 0xca, 0xca, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04,
diff --git a/src/credentials/tests/TestCertificationDeclaration.cpp b/src/credentials/tests/TestCertificationDeclaration.cpp
index 17a3667..4fc4426 100644
--- a/src/credentials/tests/TestCertificationDeclaration.cpp
+++ b/src/credentials/tests/TestCertificationDeclaration.cpp
@@ -162,7 +162,7 @@
 // -p 8013 -p 8014 -p 8015 -p 8016 -p 8017 -p 8018 -p 8019 -p 801a -p 801b -p 801c -p 801d -p 801e -p 801f -d 0016 -c
 // "ZIG0000000000000000" -l 0 -i 0 -n 0001 -t 0
 //
-static constexpr uint8_t gUntrustedCd[333] = {
+static constexpr uint8_t gUntrustedCd[] = {
     0x30, 0x82, 0x01, 0x49, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x01, 0x3a, 0x30, 0x82,
     0x01, 0x36, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30,
     0x81, 0xa2, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x81, 0x94, 0x04, 0x81, 0x91, 0x15, 0x24,
@@ -181,7 +181,7 @@
     0x1e, 0xf5, 0x68, 0x00, 0x23, 0x86, 0xba, 0x39, 0xe7, 0xab, 0x2d, 0xe5, 0x71, 0xe5, 0x36, 0x4e, 0xd0, 0x38,
 };
 
-static constexpr uint8_t gUntrustedCdCert[481] = {
+static constexpr uint8_t gUntrustedCdCert[] = {
     0x30, 0x82, 0x01, 0xdd, 0x30, 0x82, 0x01, 0x83, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x14, 0x4e, 0x84, 0xea, 0x0a, 0x68, 0x5b,
     0xbe, 0xe2, 0xfb, 0x2d, 0xed, 0x76, 0xaf, 0xa1, 0x92, 0xc4, 0x3a, 0xce, 0x9b, 0x03, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48,
     0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x44, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31,
@@ -207,18 +207,19 @@
     0xd4, 0x77, 0xb2, 0xf2, 0xae, 0x65, 0xbd, 0x9d, 0xfe, 0x2f, 0xf8, 0x38, 0xfc, 0x47, 0x45, 0x4f, 0x0c, 0x30, 0xfd
 };
 
-static constexpr uint8_t gUntrustedCdVerifyingKeyBytes[65] = { 0x04, 0xbc, 0x87, 0x13, 0x3a, 0x19, 0x16, 0x87, 0x04, 0x34, 0x1b,
-                                                               0x78, 0xc5, 0x70, 0x41, 0x21, 0x14, 0xbb, 0xe5, 0x3f, 0x62, 0x45,
-                                                               0x70, 0xe8, 0xf2, 0x37, 0x78, 0x77, 0x1a, 0xf3, 0x5c, 0xd8, 0x04,
-                                                               0x21, 0xc8, 0x2d, 0x40, 0x7f, 0xee, 0x37, 0xf5, 0xa5, 0x9f, 0x17,
-                                                               0x26, 0x33, 0x00, 0x4d, 0xf7, 0x66, 0xa3, 0x3a, 0x50, 0x75, 0x9f,
-                                                               0xcf, 0xd2, 0xb2, 0x1b, 0x5e, 0x58, 0x75, 0x08, 0x82, 0x3e };
+static constexpr uint8_t gUntrustedCdVerifyingKeyBytes[] = {
+    0x04, 0xbc, 0x87, 0x13, 0x3a, 0x19, 0x16, 0x87, 0x04, 0x34, 0x1b, 0x78, 0xc5, 0x70, 0x41, 0x21, 0x14,
+    0xbb, 0xe5, 0x3f, 0x62, 0x45, 0x70, 0xe8, 0xf2, 0x37, 0x78, 0x77, 0x1a, 0xf3, 0x5c, 0xd8, 0x04, 0x21,
+    0xc8, 0x2d, 0x40, 0x7f, 0xee, 0x37, 0xf5, 0xa5, 0x9f, 0x17, 0x26, 0x33, 0x00, 0x4d, 0xf7, 0x66, 0xa3,
+    0x3a, 0x50, 0x75, 0x9f, 0xcf, 0xd2, 0xb2, 0x1b, 0x5e, 0x58, 0x75, 0x08, 0x82, 0x3e,
+};
 static const P256PublicKey gUntrustedCdVerifyingKey(gUntrustedCdVerifyingKeyBytes);
 
-static constexpr uint8_t gUntrustedCdKid[20] = { 0x75, 0xE3, 0x06, 0x0E, 0x0F, 0xCE, 0x28, 0x69, 0x5D, 0x19,
-                                                 0x75, 0x43, 0x32, 0xBB, 0xC7, 0x9B, 0xEB, 0x3D, 0x60, 0x6C };
+static constexpr uint8_t gUntrustedCdKid[] = {
+    0x75, 0xE3, 0x06, 0x0E, 0x0F, 0xCE, 0x28, 0x69, 0x5D, 0x19, 0x75, 0x43, 0x32, 0xBB, 0xC7, 0x9B, 0xEB, 0x3D, 0x60, 0x6C,
+};
 
-static constexpr uint8_t gCdSigningCert001[524] = {
+static constexpr uint8_t gCdSigningCert001[] = {
     0x30, 0x82, 0x02, 0x08, 0x30, 0x82, 0x01, 0xad, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x07, 0x63, 0x73, 0x61, 0x63, 0x64, 0x73,
     0x31, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x52, 0x31, 0x0c, 0x30, 0x0a, 0x06, 0x03,
     0x55, 0x04, 0x0a, 0x0c, 0x03, 0x43, 0x53, 0x41, 0x31, 0x2c, 0x30, 0x2a, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x23, 0x4d, 0x61,
diff --git a/src/credentials/tests/TestDeviceAttestationConstruction.cpp b/src/credentials/tests/TestDeviceAttestationConstruction.cpp
index f9f285f..8d1b017 100644
--- a/src/credentials/tests/TestDeviceAttestationConstruction.cpp
+++ b/src/credentials/tests/TestDeviceAttestationConstruction.cpp
@@ -44,16 +44,21 @@
         0xab, 0x66, 0x62, 0x2e, 0x9d, 0x26, 0x10, 0x41, 0xf8, 0x0e, 0x97, 0x49, 0xfe, 0xff, 0x78, 0x10, 0x02, 0x49, 0x67,
         0xae, 0xdf, 0x41, 0x38, 0x36, 0x5b, 0x0a, 0x22, 0x57, 0x14, 0x9c, 0x9a, 0x12, 0x3e, 0x0d, 0x30, 0xaa
     };
-    static constexpr uint8_t attestationNonce[] = { 0xe0, 0x42, 0x1b, 0x91, 0xc6, 0xfd, 0xcd, 0xb4, 0x0e, 0x2a, 0x4d,
-                                                    0x2c, 0xf3, 0x1d, 0xb2, 0xb4, 0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a,
-                                                    0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2 };
-    static constexpr uint32_t timestamp         = 677103357;
-    static constexpr uint8_t vendorReserved1[]  = { 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x6e, 0x64, 0x6f,
-                                                   0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x31 };
-    static constexpr uint8_t vendorReserved3[]  = { 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72,
-                                                   0x76, 0x65, 0x64, 0x33, 0x5f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65 };
-    static constexpr uint16_t vendorId          = 0xbeef;
-    static constexpr uint16_t profileNum        = 0xdead;
+    static constexpr uint8_t attestationNonce[] = {
+        0xe0, 0x42, 0x1b, 0x91, 0xc6, 0xfd, 0xcd, 0xb4, 0x0e, 0x2a, 0x4d, 0x2c, 0xf3, 0x1d, 0xb2, 0xb4,
+        0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a, 0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2,
+    };
+    static constexpr uint32_t timestamp        = 677103357;
+    static constexpr uint8_t vendorReserved1[] = {
+        0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x6e, 0x64, 0x6f,
+        0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x31,
+    };
+    static constexpr uint8_t vendorReserved3[] = {
+        0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72,
+        0x76, 0x65, 0x64, 0x33, 0x5f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+    };
+    static constexpr uint16_t vendorId   = 0xbeef;
+    static constexpr uint16_t profileNum = 0xdead;
     VendorReservedElement vendorReservedArray[2];
     DeviceAttestationVendorReservedConstructor vendorReservedConstructor(vendorReservedArray, 2);
 
@@ -147,16 +152,21 @@
         0xab, 0x66, 0x62, 0x2e, 0x9d, 0x26, 0x10, 0x41, 0xf8, 0x0e, 0x97, 0x49, 0xfe, 0xff, 0x78, 0x10, 0x02, 0x49, 0x67,
         0xae, 0xdf, 0x41, 0x38, 0x36, 0x5b, 0x0a, 0x22, 0x57, 0x14, 0x9c, 0x9a, 0x12, 0x3e, 0x0d, 0x30, 0xaa
     };
-    static constexpr uint8_t attestationNonce[] = { 0xe0, 0x42, 0x1b, 0x91, 0xc6, 0xfd, 0xcd, 0xb4, 0x0e, 0x2a, 0x4d,
-                                                    0x2c, 0xf3, 0x1d, 0xb2, 0xb4, 0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a,
-                                                    0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2 };
-    static constexpr uint32_t timestamp         = 677103357;
-    static constexpr uint8_t vendorReserved1[]  = { 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x6e, 0x64, 0x6f,
-                                                   0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x31 };
-    static constexpr uint8_t vendorReserved3[]  = { 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72,
-                                                   0x76, 0x65, 0x64, 0x33, 0x5f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65 };
-    static constexpr uint16_t vendorId          = 0xFFF1;
-    static constexpr uint16_t profileNum        = 0x003E;
+    static constexpr uint8_t attestationNonce[] = {
+        0xe0, 0x42, 0x1b, 0x91, 0xc6, 0xfd, 0xcd, 0xb4, 0x0e, 0x2a, 0x4d, 0x2c, 0xf3, 0x1d, 0xb2, 0xb4,
+        0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a, 0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2,
+    };
+    static constexpr uint32_t timestamp        = 677103357;
+    static constexpr uint8_t vendorReserved1[] = {
+        0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x6e, 0x64, 0x6f,
+        0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x31,
+    };
+    static constexpr uint8_t vendorReserved3[] = {
+        0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72,
+        0x76, 0x65, 0x64, 0x33, 0x5f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+    };
+    static constexpr uint16_t vendorId   = 0xFFF1;
+    static constexpr uint16_t profileNum = 0x003E;
     VendorReservedElement vendorReservedArray[2];
     DeviceAttestationVendorReservedConstructor vendorReserved(vendorReservedArray, 2);
     vendorReserved.addVendorReservedElement(vendorId, profileNum, 1, ByteSpan(vendorReserved1));
@@ -222,14 +232,19 @@
         0xab, 0x66, 0x62, 0x2e, 0x9d, 0x26, 0x10, 0x41, 0xf8, 0x0e, 0x97, 0x49, 0xfe, 0xff, 0x78, 0x10, 0x02, 0x49, 0x67,
         0xae, 0xdf, 0x41, 0x38, 0x36, 0x5b, 0x0a, 0x22, 0x57, 0x14, 0x9c, 0x9a, 0x12, 0x3e, 0x0d, 0x30, 0xaa
     };
-    constexpr uint8_t attestationNonceTestVector[] = { 0xe0, 0x42, 0x1b, 0x91, 0xc6, 0xfd, 0xcd, 0xb4, 0x0e, 0x2a, 0x4d,
-                                                       0x2c, 0xf3, 0x1d, 0xb2, 0xb4, 0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a,
-                                                       0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2 };
-    constexpr uint32_t timestampTestVector         = 677103357;
-    constexpr uint8_t vendorReserved1TestVector[]  = { 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x6e, 0x64, 0x6f,
-                                                      0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x31 };
-    constexpr uint8_t vendorReserved3TestVector[]  = { 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72,
-                                                      0x76, 0x65, 0x64, 0x33, 0x5f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65 };
+    constexpr uint8_t attestationNonceTestVector[] = {
+        0xe0, 0x42, 0x1b, 0x91, 0xc6, 0xfd, 0xcd, 0xb4, 0x0e, 0x2a, 0x4d, 0x2c, 0xf3, 0x1d, 0xb2, 0xb4,
+        0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a, 0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2,
+    };
+    constexpr uint32_t timestampTestVector        = 677103357;
+    constexpr uint8_t vendorReserved1TestVector[] = {
+        0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x6e, 0x64, 0x6f,
+        0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x31,
+    };
+    constexpr uint8_t vendorReserved3TestVector[] = {
+        0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72,
+        0x76, 0x65, 0x64, 0x33, 0x5f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+    };
     const ByteSpan vendorReservedArrayTestVector[] = { ByteSpan{ vendorReserved1TestVector },
                                                        ByteSpan{ vendorReserved3TestVector } };
     constexpr uint16_t vendorIdTestVector          = 0xFFF1;
@@ -302,10 +317,11 @@
         0xab, 0x66, 0x62, 0x2e, 0x9d, 0x26, 0x10, 0x41, 0xf8, 0x0e, 0x97, 0x49, 0xfe, 0xff, 0x78, 0x10, 0x02, 0x49, 0x67,
         0xae, 0xdf, 0x41, 0x38, 0x36, 0x5b, 0x0a, 0x22, 0x57, 0x14, 0x9c, 0x9a, 0x12, 0x3e, 0x0d, 0x30, 0xaa
     };
-    constexpr uint8_t attestationNonceTestVector[] = { 0xe0, 0x42, 0x1b, 0x91, 0xc6, 0xfd, 0xcd, 0xb4, 0x0e, 0x2a, 0x4d,
-                                                       0x2c, 0xf3, 0x1d, 0xb2, 0xb4, 0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a,
-                                                       0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2 };
-    constexpr uint32_t timestampTestVector         = 677103357;
+    constexpr uint8_t attestationNonceTestVector[] = {
+        0xe0, 0x42, 0x1b, 0x91, 0xc6, 0xfd, 0xcd, 0xb4, 0x0e, 0x2a, 0x4d, 0x2c, 0xf3, 0x1d, 0xb2, 0xb4,
+        0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a, 0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2,
+    };
+    constexpr uint32_t timestampTestVector = 677103357;
 
     CHIP_ERROR err = CHIP_NO_ERROR;
     ByteSpan certificationDeclarationDeconstructed;
@@ -404,11 +420,12 @@
         0xab, 0x66, 0x62, 0x2e, 0x9d, 0x26, 0x10, 0x41, 0xf8, 0x0e, 0x97, 0x49, 0xfe, 0xff, 0x78, 0x10, 0x02, 0x49, 0x67,
         0xae, 0xdf, 0x41, 0x38, 0x36, 0x5b, 0x0a, 0x22, 0x57, 0x14, 0x9c, 0x9a, 0x12, 0x3e, 0x0d, 0x30, 0xaa
     };
-    static constexpr uint8_t attestationNonceTestVector[] = { 0xe0, 0x42, 0x1b, 0x91, 0xc6, 0xfd, 0xcd, 0xb4, 0x0e, 0x2a, 0x4d,
-                                                              0x2c, 0xf3, 0x1d, 0xb2, 0xb4, 0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a,
-                                                              0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2 };
-    static constexpr uint32_t timestampTestVector         = 677103357;
-    static constexpr uint8_t firmwareInfoTestVector[]     = {
+    static constexpr uint8_t attestationNonceTestVector[] = {
+        0xe0, 0x42, 0x1b, 0x91, 0xc6, 0xfd, 0xcd, 0xb4, 0x0e, 0x2a, 0x4d, 0x2c, 0xf3, 0x1d, 0xb2, 0xb4,
+        0xe1, 0x8b, 0x41, 0x1b, 0x1d, 0x3a, 0xd4, 0xd1, 0x2a, 0x9d, 0x90, 0xaa, 0x8e, 0x52, 0xfa, 0xe2,
+    };
+    static constexpr uint32_t timestampTestVector     = 677103357;
+    static constexpr uint8_t firmwareInfoTestVector[] = {
         0x30, 0x67, 0x80, 0x01, 0x05, 0xA1, 0x62, 0x30, 0x2F, 0xA0, 0x0B, 0x80, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65,
         0x03, 0x04, 0x02, 0x01, 0x81, 0x20, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB,
         0xCC, 0xDD, 0xEE, 0xFF, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD,
@@ -416,8 +433,10 @@
         0x20, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x10,
         0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F
     };
-    static constexpr uint8_t vendorReserved1TestVector[] = { 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x6e, 0x64, 0x6f,
-                                                             0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x31 };
+    static constexpr uint8_t vendorReserved1TestVector[] = {
+        0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x6e, 0x64, 0x6f,
+        0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x31,
+    };
     static constexpr uint8_t vendorReserved3TestVector[] = {
         0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72,
         0x76, 0x65, 0x64, 0x33, 0x5f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65
@@ -527,12 +546,12 @@
 
 static void TestNocsrElements_Construction(nlTestSuite * inSuite, void * inContext)
 {
-    static constexpr uint8_t kNocsrNonce[32] = {
+    static constexpr uint8_t kNocsrNonce[] = {
         0x81, 0x4a, 0x4d, 0x4c, 0x1c, 0x4a, 0x8e, 0xbb, 0xea, 0xdb, 0x0a, 0xe2, 0x82, 0xf9, 0x91, 0xeb,
         0x13, 0xac, 0x5f, 0x9f, 0xce, 0x94, 0x30, 0x93, 0x19, 0xaa, 0x94, 0x09, 0x6c, 0x8c, 0xd4, 0xb8,
     };
 
-    static constexpr uint8_t kExampleCsr[221] = {
+    static constexpr uint8_t kExampleCsr[] = {
         0x30, 0x81, 0xda, 0x30, 0x81, 0x81, 0x02, 0x01, 0x00, 0x30, 0x0e, 0x31, 0x0c, 0x30, 0x0a, 0x06, 0x03, 0x55, 0x04,
         0x0a, 0x0c, 0x03, 0x43, 0x53, 0x41, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01,
         0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x5c, 0xa2, 0x79, 0xe3, 0x66,
@@ -547,17 +566,17 @@
         0x72, 0x1c, 0x58, 0x0b, 0x6e, 0xae, 0x21, 0xbe, 0x5e, 0x6d, 0x0c, 0x72,
     };
 
-    const uint8_t kVendorReserved1[23] = {
+    const uint8_t kVendorReserved1[] = {
         0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x6e, 0x64, 0x6f,
         0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x31,
     };
 
-    const uint8_t kVendorReserved3[24] = {
+    const uint8_t kVendorReserved3[] = {
         0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72,
         0x76, 0x65, 0x64, 0x33, 0x5f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
     };
 
-    const uint8_t kNoCsrElementsVector[314] = {
+    const uint8_t kNoCsrElementsVector[] = {
         0x15, 0x30, 0x01, 0xdd, 0x30, 0x81, 0xda, 0x30, 0x81, 0x81, 0x02, 0x01, 0x00, 0x30, 0x0e, 0x31, 0x0c, 0x30, 0x0a, 0x06,
         0x03, 0x55, 0x04, 0x0a, 0x0c, 0x03, 0x43, 0x53, 0x41, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d,
         0x02, 0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x5c, 0xa2, 0x79, 0xe3,
@@ -594,12 +613,12 @@
 
 static void TestNocsrElements_Deconstruction(nlTestSuite * inSuite, void * inContext)
 {
-    static constexpr uint8_t kNocsrNonce[32] = {
+    static constexpr uint8_t kNocsrNonce[] = {
         0x81, 0x4a, 0x4d, 0x4c, 0x1c, 0x4a, 0x8e, 0xbb, 0xea, 0xdb, 0x0a, 0xe2, 0x82, 0xf9, 0x91, 0xeb,
         0x13, 0xac, 0x5f, 0x9f, 0xce, 0x94, 0x30, 0x93, 0x19, 0xaa, 0x94, 0x09, 0x6c, 0x8c, 0xd4, 0xb8,
     };
 
-    static constexpr uint8_t kExampleCsr[221] = {
+    static constexpr uint8_t kExampleCsr[] = {
         0x30, 0x81, 0xda, 0x30, 0x81, 0x81, 0x02, 0x01, 0x00, 0x30, 0x0e, 0x31, 0x0c, 0x30, 0x0a, 0x06, 0x03, 0x55, 0x04,
         0x0a, 0x0c, 0x03, 0x43, 0x53, 0x41, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01,
         0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x5c, 0xa2, 0x79, 0xe3, 0x66,
@@ -614,17 +633,17 @@
         0x72, 0x1c, 0x58, 0x0b, 0x6e, 0xae, 0x21, 0xbe, 0x5e, 0x6d, 0x0c, 0x72,
     };
 
-    const uint8_t kVendorReserved1[23] = {
+    const uint8_t kVendorReserved1[] = {
         0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x76, 0x65, 0x6e, 0x64, 0x6f,
         0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x31,
     };
 
-    const uint8_t kVendorReserved3[24] = {
+    const uint8_t kVendorReserved3[] = {
         0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x5f, 0x72, 0x65, 0x73, 0x65, 0x72,
         0x76, 0x65, 0x64, 0x33, 0x5f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
     };
 
-    const uint8_t kNoCsrElementsVector[314] = {
+    const uint8_t kNoCsrElementsVector[] = {
         0x15, 0x30, 0x01, 0xdd, 0x30, 0x81, 0xda, 0x30, 0x81, 0x81, 0x02, 0x01, 0x00, 0x30, 0x0e, 0x31, 0x0c, 0x30, 0x0a, 0x06,
         0x03, 0x55, 0x04, 0x0a, 0x0c, 0x03, 0x43, 0x53, 0x41, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d,
         0x02, 0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x5c, 0xa2, 0x79, 0xe3,
diff --git a/src/crypto/CHIPCryptoPAL.h b/src/crypto/CHIPCryptoPAL.h
index c8da9f9..a5e2c08 100644
--- a/src/crypto/CHIPCryptoPAL.h
+++ b/src/crypto/CHIPCryptoPAL.h
@@ -133,13 +133,13 @@
  * Spake2+ parameters for P256
  * Defined in https://www.ietf.org/id/draft-bar-cfrg-spake2plus-01.html#name-ciphersuites
  */
-const uint8_t spake2p_M_p256[65] = {
+const uint8_t spake2p_M_p256[] = {
     0x04, 0x88, 0x6e, 0x2f, 0x97, 0xac, 0xe4, 0x6e, 0x55, 0xba, 0x9d, 0xd7, 0x24, 0x25, 0x79, 0xf2, 0x99,
     0x3b, 0x64, 0xe1, 0x6e, 0xf3, 0xdc, 0xab, 0x95, 0xaf, 0xd4, 0x97, 0x33, 0x3d, 0x8f, 0xa1, 0x2f, 0x5f,
     0xf3, 0x55, 0x16, 0x3e, 0x43, 0xce, 0x22, 0x4e, 0x0b, 0x0e, 0x65, 0xff, 0x02, 0xac, 0x8e, 0x5c, 0x7b,
     0xe0, 0x94, 0x19, 0xc7, 0x85, 0xe0, 0xca, 0x54, 0x7d, 0x55, 0xa1, 0x2e, 0x2d, 0x20,
 };
-const uint8_t spake2p_N_p256[65] = {
+const uint8_t spake2p_N_p256[] = {
     0x04, 0xd8, 0xbb, 0xd6, 0xc6, 0x39, 0xc6, 0x29, 0x37, 0xb0, 0x4d, 0x99, 0x7f, 0x38, 0xc3, 0x77, 0x07,
     0x19, 0xc6, 0x29, 0xd7, 0x01, 0x4d, 0x49, 0xa2, 0x4b, 0x4f, 0x98, 0xba, 0xa1, 0x29, 0x2b, 0x49, 0x07,
     0xd6, 0x0a, 0xa6, 0xbf, 0xad, 0xe4, 0x50, 0x08, 0xa6, 0x36, 0x33, 0x7f, 0x51, 0x68, 0xc6, 0x4d, 0x9b,
diff --git a/src/crypto/tests/AES_CCM_128_test_vectors.h b/src/crypto/tests/AES_CCM_128_test_vectors.h
index 98eb06e..52911f5 100644
--- a/src/crypto/tests/AES_CCM_128_test_vectors.h
+++ b/src/crypto/tests/AES_CCM_128_test_vectors.h
@@ -956,25 +956,25 @@
                                                                                   .tcId      = 37,
                                                                                   .result    = CHIP_ERROR_INTERNAL };
 
-static const uint8_t test_vector_2ef53070ae20_key[16] = {
+static const uint8_t test_vector_2ef53070ae20_key[] = {
     0x09, 0x53, 0xfa, 0x93, 0xe7, 0xca, 0xac, 0x96, 0x38, 0xf5, 0x88, 0x20, 0x22, 0x0a, 0x39, 0x8e,
 };
 
-static const uint8_t test_vector_2ef53070ae20_nonce[13] = {
+static const uint8_t test_vector_2ef53070ae20_nonce[] = {
     0x00, 0x80, 0x00, 0x00, 0x01, 0x12, 0x01, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78,
 };
 
-static const uint8_t test_vector_2ef53070ae20_in[13] = {
+static const uint8_t test_vector_2ef53070ae20_in[] = {
     0xff, 0xfd, 0x03, 0x4b, 0x50, 0x05, 0x7e, 0x40, 0x00, 0x00, 0x01, 0x00, 0x00,
 };
 
-static const uint8_t test_vector_2ef53070ae20_ad[0] = {};
+static const uint8_t test_vector_2ef53070ae20_ad[] = {};
 
-static const uint8_t test_vector_2ef53070ae20_ct[13] = {
+static const uint8_t test_vector_2ef53070ae20_ct[] = {
     0xb5, 0xe5, 0xbf, 0xda, 0xcb, 0xaf, 0x6c, 0xb7, 0xfb, 0x6b, 0xff, 0x87, 0x1f,
 };
 
-static const uint8_t test_vector_2ef53070ae20_tag[16] = {
+static const uint8_t test_vector_2ef53070ae20_tag[] = {
     0xb0, 0xd6, 0xdd, 0x82, 0x7d, 0x35, 0xbf, 0x37, 0x2f, 0xa6, 0x42, 0x5d, 0xcd, 0x17, 0xd3, 0x56,
 };
 
@@ -994,25 +994,25 @@
     .tcId      = 0,
     .result    = CHIP_NO_ERROR,
 };
-static const uint8_t test_vector_91c8d337cf46_key[16] = {
+static const uint8_t test_vector_91c8d337cf46_key[] = {
     0x09, 0x53, 0xfa, 0x93, 0xe7, 0xca, 0xac, 0x96, 0x38, 0xf5, 0x88, 0x20, 0x22, 0x0a, 0x39, 0x8e,
 };
 
-static const uint8_t test_vector_91c8d337cf46_nonce[13] = {
+static const uint8_t test_vector_91c8d337cf46_nonce[] = {
     0x00, 0x80, 0x01, 0x48, 0x20, 0x23, 0x45, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78,
 };
 
-static const uint8_t test_vector_91c8d337cf46_in[9] = {
+static const uint8_t test_vector_91c8d337cf46_in[] = {
     0x12, 0x01, 0x04, 0x32, 0x03, 0x08, 0xba, 0x07, 0x2f,
 };
 
-static const uint8_t test_vector_91c8d337cf46_ad[0] = {};
+static const uint8_t test_vector_91c8d337cf46_ad[] = {};
 
-static const uint8_t test_vector_91c8d337cf46_ct[9] = {
+static const uint8_t test_vector_91c8d337cf46_ct[] = {
     0x79, 0xd7, 0xdb, 0xc0, 0xc9, 0xb4, 0xd4, 0x3e, 0xeb,
 };
 
-static const uint8_t test_vector_91c8d337cf46_tag[16] = {
+static const uint8_t test_vector_91c8d337cf46_tag[] = {
     0x28, 0x15, 0x08, 0xe5, 0x0d, 0x58, 0xdb, 0xbd, 0x27, 0xc3, 0x95, 0x97, 0x80, 0x0f, 0x47, 0x33,
 };
 
@@ -1032,25 +1032,25 @@
     .tcId      = 1,
     .result    = CHIP_NO_ERROR,
 };
-static const uint8_t test_vector_37fc295e3601_key[16] = {
+static const uint8_t test_vector_37fc295e3601_key[] = {
     0x09, 0x53, 0xfa, 0x93, 0xe7, 0xca, 0xac, 0x96, 0x38, 0xf5, 0x88, 0x20, 0x22, 0x0a, 0x39, 0x8e,
 };
 
-static const uint8_t test_vector_37fc295e3601_nonce[13] = {
+static const uint8_t test_vector_37fc295e3601_nonce[] = {
     0x00, 0x80, 0x2b, 0x38, 0x32, 0x2f, 0xe3, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78,
 };
 
-static const uint8_t test_vector_37fc295e3601_in[9] = {
+static const uint8_t test_vector_37fc295e3601_in[] = {
     0x12, 0x01, 0x04, 0xfa, 0x02, 0x05, 0xa6, 0x00, 0x0a,
 };
 
-static const uint8_t test_vector_37fc295e3601_ad[0] = {};
+static const uint8_t test_vector_37fc295e3601_ad[] = {};
 
-static const uint8_t test_vector_37fc295e3601_ct[9] = {
+static const uint8_t test_vector_37fc295e3601_ct[] = {
     0x53, 0x27, 0x30, 0x86, 0xb8, 0xc5, 0xee, 0x00, 0xbd,
 };
 
-static const uint8_t test_vector_37fc295e3601_tag[16] = {
+static const uint8_t test_vector_37fc295e3601_tag[] = {
     0xd5, 0x2b, 0x87, 0xa8, 0xce, 0x62, 0x90, 0xa7, 0x72, 0xd4, 0x72, 0xb8, 0xc6, 0x2b, 0xdc, 0x13,
 };
 
@@ -1070,31 +1070,31 @@
     .tcId      = 2,
     .result    = CHIP_NO_ERROR,
 };
-static const uint8_t test_vector_8bab3993e4d1_key[16] = {
+static const uint8_t test_vector_8bab3993e4d1_key[] = {
     0xbe, 0x63, 0x51, 0x05, 0x43, 0x48, 0x59, 0xf4, 0x84, 0xfc, 0x79, 0x8e, 0x04, 0x3c, 0xe4, 0x0e,
 };
 
-static const uint8_t test_vector_8bab3993e4d1_nonce[13] = {
+static const uint8_t test_vector_8bab3993e4d1_nonce[] = {
     0x00, 0x80, 0x00, 0x00, 0x02, 0x12, 0x01, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78,
 };
 
-static const uint8_t test_vector_8bab3993e4d1_in[4] = {
+static const uint8_t test_vector_8bab3993e4d1_in[] = {
     0x23,
     0x45,
     0x01,
     0x00,
 };
 
-static const uint8_t test_vector_8bab3993e4d1_ad[0] = {};
+static const uint8_t test_vector_8bab3993e4d1_ad[] = {};
 
-static const uint8_t test_vector_8bab3993e4d1_ct[4] = {
+static const uint8_t test_vector_8bab3993e4d1_ct[] = {
     0xb0,
     0xe5,
     0xd0,
     0xad,
 };
 
-static const uint8_t test_vector_8bab3993e4d1_tag[16] = {
+static const uint8_t test_vector_8bab3993e4d1_tag[] = {
     0x60, 0x78, 0xe0, 0xdd, 0xbb, 0x7c, 0xd4, 0x3f, 0xae, 0xa5, 0x7c, 0x70, 0x51, 0xe5, 0xb4, 0xae,
 };
 
@@ -1114,25 +1114,25 @@
     .tcId      = 3,
     .result    = CHIP_NO_ERROR,
 };
-static const uint8_t test_vector_76dbd8e42344_key[16] = {
+static const uint8_t test_vector_76dbd8e42344_key[] = {
     0xbe, 0x63, 0x51, 0x05, 0x43, 0x48, 0x59, 0xf4, 0x84, 0xfc, 0x79, 0x8e, 0x04, 0x3c, 0xe4, 0x0e,
 };
 
-static const uint8_t test_vector_76dbd8e42344_nonce[13] = {
+static const uint8_t test_vector_76dbd8e42344_nonce[] = {
     0x00, 0x80, 0x01, 0x48, 0x34, 0x23, 0x45, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78,
 };
 
-static const uint8_t test_vector_76dbd8e42344_in[9] = {
+static const uint8_t test_vector_76dbd8e42344_in[] = {
     0x12, 0x01, 0x02, 0x00, 0x12, 0x34, 0x56, 0x78, 0x00,
 };
 
-static const uint8_t test_vector_76dbd8e42344_ad[0] = {};
+static const uint8_t test_vector_76dbd8e42344_ad[] = {};
 
-static const uint8_t test_vector_76dbd8e42344_ct[9] = {
+static const uint8_t test_vector_76dbd8e42344_ct[] = {
     0x5c, 0x39, 0xda, 0x17, 0x92, 0xb1, 0xfe, 0xe9, 0xec,
 };
 
-static const uint8_t test_vector_76dbd8e42344_tag[16] = {
+static const uint8_t test_vector_76dbd8e42344_tag[] = {
     0xa9, 0x23, 0x39, 0x58, 0xac, 0xed, 0x64, 0xf2, 0x34, 0x3b, 0x9d, 0x61, 0x0e, 0x87, 0x64, 0x40,
 };
 
@@ -1152,25 +1152,25 @@
     .tcId      = 4,
     .result    = CHIP_NO_ERROR,
 };
-static const uint8_t test_vector_ea145e3af464_key[16] = {
+static const uint8_t test_vector_ea145e3af464_key[] = {
     0x09, 0x53, 0xfa, 0x93, 0xe7, 0xca, 0xac, 0x96, 0x38, 0xf5, 0x88, 0x20, 0x22, 0x0a, 0x39, 0x8e,
 };
 
-static const uint8_t test_vector_ea145e3af464_nonce[13] = {
+static const uint8_t test_vector_ea145e3af464_nonce[] = {
     0x00, 0x8b, 0x01, 0x48, 0x35, 0x23, 0x45, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78,
 };
 
-static const uint8_t test_vector_ea145e3af464_in[9] = {
+static const uint8_t test_vector_ea145e3af464_in[] = {
     0x00, 0x03, 0x00, 0xa6, 0xac, 0x00, 0x00, 0x00, 0x02,
 };
 
-static const uint8_t test_vector_ea145e3af464_ad[0] = {};
+static const uint8_t test_vector_ea145e3af464_ad[] = {};
 
-static const uint8_t test_vector_ea145e3af464_ct[9] = {
+static const uint8_t test_vector_ea145e3af464_ct[] = {
     0x0d, 0x0d, 0x73, 0x0f, 0x94, 0xd7, 0xf3, 0x50, 0x9d,
 };
 
-static const uint8_t test_vector_ea145e3af464_tag[16] = {
+static const uint8_t test_vector_ea145e3af464_tag[] = {
     0xdd, 0xa1, 0x69, 0x4a, 0xdb, 0x79, 0x16, 0x52, 0xfb, 0x6a, 0xe0, 0x46, 0x82, 0xf1, 0x9b, 0x29,
 };
 
@@ -1190,25 +1190,25 @@
     .tcId      = 5,
     .result    = CHIP_NO_ERROR,
 };
-static const uint8_t test_vector_08f3cd0b35d1_key[16] = {
+static const uint8_t test_vector_08f3cd0b35d1_key[] = {
     0x09, 0x53, 0xfa, 0x93, 0xe7, 0xca, 0xac, 0x96, 0x38, 0xf5, 0x88, 0x20, 0x22, 0x0a, 0x39, 0x8e,
 };
 
-static const uint8_t test_vector_08f3cd0b35d1_nonce[13] = {
+static const uint8_t test_vector_08f3cd0b35d1_nonce[] = {
     0x00, 0x8b, 0x01, 0x48, 0x36, 0x23, 0x45, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78,
 };
 
-static const uint8_t test_vector_08f3cd0b35d1_in[9] = {
+static const uint8_t test_vector_08f3cd0b35d1_in[] = {
     0x00, 0x03, 0x00, 0xa6, 0xac, 0x00, 0x00, 0x00, 0x03,
 };
 
-static const uint8_t test_vector_08f3cd0b35d1_ad[0] = {};
+static const uint8_t test_vector_08f3cd0b35d1_ad[] = {};
 
-static const uint8_t test_vector_08f3cd0b35d1_ct[9] = {
+static const uint8_t test_vector_08f3cd0b35d1_ct[] = {
     0xd8, 0x5d, 0x80, 0x6b, 0xbe, 0xd2, 0x48, 0x61, 0x4f,
 };
 
-static const uint8_t test_vector_08f3cd0b35d1_tag[16] = {
+static const uint8_t test_vector_08f3cd0b35d1_tag[] = {
     0xef, 0x7f, 0x4d, 0x55, 0xe4, 0x7d, 0x21, 0x52, 0x2e, 0xbe, 0x3d, 0x5b, 0xc7, 0x35, 0xa5, 0xc5,
 };
 
@@ -1228,31 +1228,31 @@
     .tcId      = 6,
     .result    = CHIP_NO_ERROR,
 };
-static const uint8_t test_vector_70d7d4a1f8ea_key[16] = {
+static const uint8_t test_vector_70d7d4a1f8ea_key[] = {
     0xbe, 0x63, 0x51, 0x05, 0x43, 0x48, 0x59, 0xf4, 0x84, 0xfc, 0x79, 0x8e, 0x04, 0x3c, 0xe4, 0x0e,
 };
 
-static const uint8_t test_vector_70d7d4a1f8ea_nonce[13] = {
+static const uint8_t test_vector_70d7d4a1f8ea_nonce[] = {
     0x00, 0x80, 0x00, 0x00, 0x03, 0x12, 0x01, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78,
 };
 
-static const uint8_t test_vector_70d7d4a1f8ea_in[4] = {
+static const uint8_t test_vector_70d7d4a1f8ea_in[] = {
     0x23,
     0x45,
     0x01,
     0x01,
 };
 
-static const uint8_t test_vector_70d7d4a1f8ea_ad[0] = {};
+static const uint8_t test_vector_70d7d4a1f8ea_ad[] = {};
 
-static const uint8_t test_vector_70d7d4a1f8ea_ct[4] = {
+static const uint8_t test_vector_70d7d4a1f8ea_ct[] = {
     0x77,
     0x77,
     0xed,
     0x35,
 };
 
-static const uint8_t test_vector_70d7d4a1f8ea_tag[16] = {
+static const uint8_t test_vector_70d7d4a1f8ea_tag[] = {
     0x35, 0xd8, 0x4e, 0x18, 0x78, 0x4c, 0x4b, 0xf3, 0xcb, 0x1b, 0x4c, 0x19, 0x1d, 0xc5, 0x55, 0xcc,
 };
 
@@ -1272,31 +1272,31 @@
     .tcId      = 7,
     .result    = CHIP_NO_ERROR,
 };
-static const uint8_t test_vector_56f7e4096627_key[16] = {
+static const uint8_t test_vector_56f7e4096627_key[] = {
     0xbe, 0x63, 0x51, 0x05, 0x43, 0x48, 0x59, 0xf4, 0x84, 0xfc, 0x79, 0x8e, 0x04, 0x3c, 0xe4, 0x0e,
 };
 
-static const uint8_t test_vector_56f7e4096627_nonce[13] = {
+static const uint8_t test_vector_56f7e4096627_nonce[] = {
     0x00, 0x80, 0x00, 0x00, 0x04, 0x12, 0x01, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78,
 };
 
-static const uint8_t test_vector_56f7e4096627_in[4] = {
+static const uint8_t test_vector_56f7e4096627_in[] = {
     0x23,
     0x45,
     0x01,
     0x01,
 };
 
-static const uint8_t test_vector_56f7e4096627_ad[0] = {};
+static const uint8_t test_vector_56f7e4096627_ad[] = {};
 
-static const uint8_t test_vector_56f7e4096627_ct[4] = {
+static const uint8_t test_vector_56f7e4096627_ct[] = {
     0xae,
     0x21,
     0x46,
     0x60,
 };
 
-static const uint8_t test_vector_56f7e4096627_tag[16] = {
+static const uint8_t test_vector_56f7e4096627_tag[] = {
     0xd1, 0x46, 0xb2, 0x8b, 0xea, 0xfe, 0x7f, 0x98, 0x4f, 0x94, 0x30, 0x50, 0x2d, 0x07, 0xaa, 0xfe,
 };
 
@@ -1316,31 +1316,31 @@
     .tcId      = 8,
     .result    = CHIP_NO_ERROR,
 };
-static const uint8_t test_vector_02112b4a46d8_key[16] = {
+static const uint8_t test_vector_02112b4a46d8_key[] = {
     0xbe, 0x63, 0x51, 0x05, 0x43, 0x48, 0x59, 0xf4, 0x84, 0xfc, 0x79, 0x8e, 0x04, 0x3c, 0xe4, 0x0e,
 };
 
-static const uint8_t test_vector_02112b4a46d8_nonce[13] = {
+static const uint8_t test_vector_02112b4a46d8_nonce[] = {
     0x00, 0x80, 0x00, 0x00, 0x05, 0x12, 0x01, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78,
 };
 
-static const uint8_t test_vector_02112b4a46d8_in[4] = {
+static const uint8_t test_vector_02112b4a46d8_in[] = {
     0x23,
     0x45,
     0x01,
     0x00,
 };
 
-static const uint8_t test_vector_02112b4a46d8_ad[0] = {};
+static const uint8_t test_vector_02112b4a46d8_ad[] = {};
 
-static const uint8_t test_vector_02112b4a46d8_ct[4] = {
+static const uint8_t test_vector_02112b4a46d8_ct[] = {
     0x7d,
     0x3a,
     0xe6,
     0x2a,
 };
 
-static const uint8_t test_vector_02112b4a46d8_tag[16] = {
+static const uint8_t test_vector_02112b4a46d8_tag[] = {
     0x52, 0xee, 0x03, 0xab, 0x84, 0xe1, 0xa3, 0x33, 0x65, 0xe8, 0xa6, 0x12, 0x75, 0x66, 0x5f, 0x71,
 };
 
@@ -1360,27 +1360,27 @@
     .tcId      = 9,
     .result    = CHIP_NO_ERROR,
 };
-static const uint8_t test_vector_ac063659d220_key[16] = {
+static const uint8_t test_vector_ac063659d220_key[] = {
     0x63, 0x96, 0x47, 0x71, 0x73, 0x4f, 0xbd, 0x76, 0xe3, 0xb4, 0x05, 0x19, 0xd1, 0xd9, 0x4a, 0x48,
 };
 
-static const uint8_t test_vector_ac063659d220_nonce[13] = {
+static const uint8_t test_vector_ac063659d220_nonce[] = {
     0x01, 0x00, 0x07, 0x08, 0x0d, 0x12, 0x34, 0x97, 0x36, 0x12, 0x34, 0x56, 0x77,
 };
 
-static const uint8_t test_vector_ac063659d220_in[8] = {
+static const uint8_t test_vector_ac063659d220_in[] = {
     0xea, 0x0a, 0x00, 0x57, 0x6f, 0x72, 0x6c, 0x64,
 };
 
-static const uint8_t test_vector_ac063659d220_ad[16] = {
+static const uint8_t test_vector_ac063659d220_ad[] = {
     0xf4, 0xa0, 0x02, 0xc7, 0xfb, 0x1e, 0x4c, 0xa0, 0xa4, 0x69, 0xa0, 0x21, 0xde, 0x0d, 0xb8, 0x75,
 };
 
-static const uint8_t test_vector_ac063659d220_ct[8] = {
+static const uint8_t test_vector_ac063659d220_ct[] = {
     0xde, 0x15, 0x47, 0x11, 0x84, 0x63, 0x12, 0x3e,
 };
 
-static const uint8_t test_vector_ac063659d220_tag[16] = {
+static const uint8_t test_vector_ac063659d220_tag[] = {
     0x14, 0x60, 0x4c, 0x1d, 0xdb, 0x4f, 0x59, 0x87, 0x06, 0x4b, 0x17, 0x36, 0xf3, 0x92, 0x39, 0x62,
 };
 
diff --git a/src/crypto/tests/CHIPCryptoPALTest.cpp b/src/crypto/tests/CHIPCryptoPALTest.cpp
index 117957b..fae2591 100644
--- a/src/crypto/tests/CHIPCryptoPALTest.cpp
+++ b/src/crypto/tests/CHIPCryptoPALTest.cpp
@@ -1200,7 +1200,7 @@
 
     // Second case: correct CSR
     {
-        const uint8_t kGoodCsr[205] = {
+        const uint8_t kGoodCsr[] = {
             0x30, 0x81, 0xca, 0x30, 0x70, 0x02, 0x01, 0x00, 0x30, 0x0e, 0x31, 0x0c, 0x30, 0x0a, 0x06, 0x03, 0x55, 0x04, 0x0a,
             0x0c, 0x03, 0x43, 0x53, 0x52, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
             0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xa3, 0xbe, 0xa1, 0xf5, 0x42, 0x01,
@@ -1213,7 +1213,7 @@
             0x21, 0x00, 0x8b, 0x6b, 0x49, 0xb6, 0x7d, 0x3e, 0x67, 0x9e, 0xb1, 0x22, 0xd3, 0x63, 0x82, 0x40, 0x4f, 0x49, 0xa4,
             0xdc, 0x17, 0x35, 0xac, 0x4b, 0x7a, 0xbf, 0x52, 0x05, 0x58, 0x68, 0xe0, 0xaa, 0xd2, 0x8e,
         };
-        const uint8_t kGoodCsrSubjectPublicKey[65] = {
+        const uint8_t kGoodCsrSubjectPublicKey[] = {
             0x04, 0xa3, 0xbe, 0xa1, 0xf5, 0x42, 0x01, 0x07, 0x3c, 0x4b, 0x75, 0x85, 0xd8, 0xe2, 0x98, 0xac, 0x2f,
             0xf6, 0x98, 0xdb, 0xd9, 0x5b, 0xe0, 0x7e, 0xc1, 0x04, 0xd5, 0x73, 0xc5, 0xb0, 0x90, 0x77, 0x27, 0x00,
             0x1e, 0x22, 0xc7, 0x89, 0x5e, 0x4d, 0x75, 0x07, 0x89, 0x82, 0x0f, 0x49, 0xb6, 0x59, 0xd5, 0xc5, 0x15,
@@ -1234,7 +1234,7 @@
 
     // Third case: bad signature
     {
-        const uint8_t kBadSignatureSignatureCsr[205] = {
+        const uint8_t kBadSignatureSignatureCsr[] = {
             0x30, 0x81, 0xca, 0x30, 0x70, 0x02, 0x01, 0x00, 0x30, 0x0e, 0x31, 0x0c, 0x30, 0x0a, 0x06, 0x03, 0x55, 0x04, 0x0a,
             0x0c, 0x03, 0x43, 0x53, 0x52, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
             0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xa3, 0xbe, 0xa1, 0xf5, 0x42, 0x01,
@@ -1259,7 +1259,7 @@
 
     // Fourth case: CSR too big
     {
-        const uint8_t kBadTooBigCsr[256] = {
+        const uint8_t kBadTooBigCsr[] = {
             0x30, 0x81, 0xda, 0x30, 0x81, 0x81, 0x02, 0x01, 0x00, 0x30, 0x0e, 0x31, 0x0c, 0x30, 0x0a, 0x06, 0x03, 0x55, 0x04, 0x0b,
             0x0c, 0x03, 0x43, 0x53, 0x41, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08,
             0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x72, 0x48, 0xc0, 0x36, 0xf0, 0x12, 0x5f, 0xd1,
@@ -1285,7 +1285,9 @@
 
     // Fifth case: obviously invalid CSR (1/2)
     {
-        const uint8_t kTooSmallCsr[10] = { 0x30, 0x81, 0xda, 0x30, 0x81, 0x81, 0x02, 0x01, 0x00, 0x30 };
+        const uint8_t kTooSmallCsr[] = {
+            0x30, 0x81, 0xda, 0x30, 0x81, 0x81, 0x02, 0x01, 0x00, 0x30,
+        };
 
         Crypto::ClearSecretData(pubKey.Bytes(), pubKey.Length());
 
@@ -1298,7 +1300,7 @@
 
     // Sixth case: obviously invalid CSR (2/2)
     {
-        const uint8_t kNotSequenceCsr[205] = {
+        const uint8_t kNotSequenceCsr[] = {
             0x31, 0x81, 0xca, 0x30, 0x70, 0x02, 0x01, 0x00, 0x30, 0x0e, 0x31, 0x0c, 0x30, 0x0a, 0x06, 0x03, 0x55, 0x04, 0x0a,
             0x0c, 0x03, 0x43, 0x53, 0x52, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,
             0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xa3, 0xbe, 0xa1, 0xf5, 0x42, 0x01,
@@ -1838,7 +1840,7 @@
 {
     HeapChecker heapChecker(inSuite);
     // Data from spec test vector (see Operational Discovery section)
-    const uint8_t kRootPublicKey[65] = {
+    const uint8_t kRootPublicKey[] = {
         0x04, 0x4a, 0x9f, 0x42, 0xb1, 0xca, 0x48, 0x40, 0xd3, 0x72, 0x92, 0xbb, 0xc7, 0xf6, 0xa7, 0xe1, 0x1e,
         0x22, 0x20, 0x0c, 0x97, 0x6f, 0xc9, 0x00, 0xdb, 0xc9, 0x8a, 0x7a, 0x38, 0x3a, 0x64, 0x1c, 0xb8, 0x25,
         0x4a, 0x2e, 0x56, 0xd4, 0xe2, 0x95, 0xa8, 0x47, 0x94, 0x3b, 0x4e, 0x38, 0x97, 0xc4, 0xa7, 0x73, 0xe9,
@@ -1848,7 +1850,7 @@
 
     constexpr uint64_t kFabricId = 0x2906C908D115D362;
 
-    const uint8_t kExpectedCompressedFabricIdentifier[8] = {
+    const uint8_t kExpectedCompressedFabricIdentifier[] = {
         0x87, 0xe1, 0xb0, 0x04, 0xe2, 0x35, 0xa1, 0x30,
     };
     static_assert(sizeof(kExpectedCompressedFabricIdentifier) == kCompressedFabricIdentifierSize,
@@ -1892,7 +1894,7 @@
     NL_TEST_ASSERT(inSuite, compressed_fabric_id_int == kExpectedCompressedFabricIdentifierInt);
 
     // Test invalid public key
-    const uint8_t kInvalidRootPublicKey[65] = {
+    const uint8_t kInvalidRootPublicKey[] = {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/src/crypto/tests/DerSigConversion_test_vectors.h b/src/crypto/tests/DerSigConversion_test_vectors.h
index 622019e..533a1a2 100644
--- a/src/crypto/tests/DerSigConversion_test_vectors.h
+++ b/src/crypto/tests/DerSigConversion_test_vectors.h
@@ -41,24 +41,24 @@
 } der_sig_conv_vector;
 
 // CASE 1: MSB not set, all bytes non-zero
-const uint8_t kDerSigConvRCase1[32] = {
+const uint8_t kDerSigConvRCase1[] = {
     0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e,
     0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e,
 };
 
-const uint8_t kDerSigConvSCase1[32] = {
+const uint8_t kDerSigConvSCase1[] = {
     0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
     0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
 };
 
-const uint8_t kDerSigConvRawCase1[64] = {
+const uint8_t kDerSigConvRawCase1[] = {
     0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e,
     0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e,
     0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
     0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
 };
 
-const uint8_t kDerSigConvDerCase1[70] = {
+const uint8_t kDerSigConvDerCase1[] = {
     0x30, 0x44, 0x02, 0x20, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e,
     0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e,
     0x02, 0x20, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
@@ -76,24 +76,24 @@
                                                       .raw_version_length = sizeof(kDerSigConvRawCase1) };
 
 // CASE 2: MSB not set, first 16 bytes zero
-const uint8_t kDerSigConvRCase2[32] = {
+const uint8_t kDerSigConvRCase2[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
 };
 
-const uint8_t kDerSigConvSCase2[32] = {
+const uint8_t kDerSigConvSCase2[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
 };
 
-const uint8_t kDerSigConvRawCase2[64] = {
+const uint8_t kDerSigConvRawCase2[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
 };
 
-const uint8_t kDerSigConvDerCase2[40] = {
+const uint8_t kDerSigConvDerCase2[] = {
     0x30, 0x26, 0x02, 0x11, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
     0x80, 0x02, 0x11, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
 };
@@ -109,24 +109,24 @@
                                                       .raw_version_length = sizeof(kDerSigConvRawCase2) };
 
 // CASE 3: MSB set, full width value (worst case for 256 bit ECDSA)
-const uint8_t kDerSigConvRCase3[32] = {
+const uint8_t kDerSigConvRCase3[] = {
     0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
 };
 
-const uint8_t kDerSigConvSCase3[32] = {
+const uint8_t kDerSigConvSCase3[] = {
     0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
 };
 
-const uint8_t kDerSigConvRawCase3[64] = {
+const uint8_t kDerSigConvRawCase3[] = {
     0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
     0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
 };
 
-const uint8_t kDerSigConvDerCase3[72] = {
+const uint8_t kDerSigConvDerCase3[] = {
     0x30, 0x46, 0x02, 0x21, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x01, 0x02, 0x21, 0x00, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -145,21 +145,21 @@
 
 // CASE 4: MSB set, full width value (worst case for 512 bit ECDSA, using 2 bytes length for sequence)
 // Overhead here is the max
-const uint8_t kDerSigConvRCase4[64] = {
+const uint8_t kDerSigConvRCase4[] = {
     0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
 };
 
-const uint8_t kDerSigConvSCase4[64] = {
+const uint8_t kDerSigConvSCase4[] = {
     0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
 };
 
-const uint8_t kDerSigConvRawCase4[128] = {
+const uint8_t kDerSigConvRawCase4[] = {
     0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -169,7 +169,7 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
 };
 
-const uint8_t kDerSigConvDerCase4[137] = {
+const uint8_t kDerSigConvDerCase4[] = {
     0x30, 0x81, 0x86, 0x02, 0x41, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -190,21 +190,21 @@
                                                       .raw_version_length = sizeof(kDerSigConvRawCase4) };
 
 // CASE 5: All zeroes
-const uint8_t kDerSigConvRCase5[64] = {
+const uint8_t kDerSigConvRCase5[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-const uint8_t kDerSigConvSCase5[64] = {
+const uint8_t kDerSigConvSCase5[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-const uint8_t kDerSigConvRawCase5[128] = {
+const uint8_t kDerSigConvRawCase5[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -214,7 +214,7 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-const uint8_t kDerSigConvDerCase5[8] = {
+const uint8_t kDerSigConvDerCase5[] = {
     0x30, 0x06, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00,
 };
 
diff --git a/src/crypto/tests/HMAC_SHA256_test_vectors.h b/src/crypto/tests/HMAC_SHA256_test_vectors.h
index 4a8b574..ae6005c 100644
--- a/src/crypto/tests/HMAC_SHA256_test_vectors.h
+++ b/src/crypto/tests/HMAC_SHA256_test_vectors.h
@@ -37,7 +37,7 @@
 } hmac_sha256_vector;
 
 // Basic test case
-const uint8_t kHmacTestCase1Key[131] = {
+const uint8_t kHmacTestCase1Key[] = {
     0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
     0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
     0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
@@ -47,13 +47,13 @@
     0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
 };
 
-const uint8_t kHmacTestCase1Message[54] = {
+const uint8_t kHmacTestCase1Message[] = {
     0x54, 0x65, 0x73, 0x74, 0x20, 0x55, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x4c, 0x61, 0x72, 0x67, 0x65, 0x72, 0x20,
     0x54, 0x68, 0x61, 0x6e, 0x20, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x2d, 0x53, 0x69, 0x7a, 0x65, 0x20, 0x4b, 0x65,
     0x79, 0x20, 0x2d, 0x20, 0x48, 0x61, 0x73, 0x68, 0x20, 0x4b, 0x65, 0x79, 0x20, 0x46, 0x69, 0x72, 0x73, 0x74,
 };
 
-const uint8_t kHmacTestCase1Expected[32] = {
+const uint8_t kHmacTestCase1Expected[] = {
     0x60, 0xe4, 0x31, 0x59, 0x1e, 0xe0, 0xb6, 0x7f, 0x0d, 0x8a, 0x26, 0xaa, 0xcb, 0xf5, 0xb7, 0x7f,
     0x8e, 0x0b, 0xc6, 0x21, 0x37, 0x28, 0xc5, 0x14, 0x05, 0x46, 0x04, 0x0f, 0x0e, 0xe3, 0x7f, 0x54,
 };
diff --git a/src/crypto/tests/RawIntegerToDer_test_vectors.h b/src/crypto/tests/RawIntegerToDer_test_vectors.h
index ed496b8..ebd05a5 100644
--- a/src/crypto/tests/RawIntegerToDer_test_vectors.h
+++ b/src/crypto/tests/RawIntegerToDer_test_vectors.h
@@ -36,15 +36,15 @@
 };
 
 // MSB set, no leading zeros
-const uint8_t kRawToDerMsbSetNoLeadingZeroes_Candidate[5] = {
+const uint8_t kRawToDerMsbSetNoLeadingZeroes_Candidate[] = {
     0x80, 0x01, 0x02, 0x03, 0x04,
 };
 
-const uint8_t kRawToDerMsbSetNoLeadingZeroes_Expected[8] = {
+const uint8_t kRawToDerMsbSetNoLeadingZeroes_Expected[] = {
     0x02, 0x06, 0x00, 0x80, 0x01, 0x02, 0x03, 0x04,
 };
 
-const uint8_t kRawToDerMsbSetNoLeadingZeroes_Expected_WithoutTag[6] = {
+const uint8_t kRawToDerMsbSetNoLeadingZeroes_Expected_WithoutTag[] = {
     0x00, 0x80, 0x01, 0x02, 0x03, 0x04,
 };
 
@@ -58,15 +58,15 @@
 };
 
 // MSB clear, no leading zeros
-const uint8_t kRawToDerMsbClearNoLeadingZeroes_Candidate[5] = {
+const uint8_t kRawToDerMsbClearNoLeadingZeroes_Candidate[] = {
     0x40, 0x01, 0x02, 0x03, 0x04,
 };
 
-const uint8_t kRawToDerMsbClearNoLeadingZeroes_Expected[7] = {
+const uint8_t kRawToDerMsbClearNoLeadingZeroes_Expected[] = {
     0x02, 0x05, 0x40, 0x01, 0x02, 0x03, 0x04,
 };
 
-const uint8_t kRawToDerMsbClearNoLeadingZeroes_Expected_WithoutTag[5] = {
+const uint8_t kRawToDerMsbClearNoLeadingZeroes_Expected_WithoutTag[] = {
     0x40, 0x01, 0x02, 0x03, 0x04,
 };
 
@@ -80,15 +80,15 @@
 };
 
 // Three leading zeroes
-const uint8_t kRawToDerThreeLeadingZeroes_Candidate[7] = {
+const uint8_t kRawToDerThreeLeadingZeroes_Candidate[] = {
     0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04,
 };
 
-const uint8_t kRawToDerThreeLeadingZeroes_Expected[6] = {
+const uint8_t kRawToDerThreeLeadingZeroes_Expected[] = {
     0x02, 0x04, 0x01, 0x02, 0x03, 0x04,
 };
 
-const uint8_t kRawToDerThreeLeadingZeroes_Expected_WithoutTag[4] = {
+const uint8_t kRawToDerThreeLeadingZeroes_Expected_WithoutTag[] = {
     0x01,
     0x02,
     0x03,
@@ -105,17 +105,17 @@
 };
 
 // Literal zero
-const uint8_t kRawToDerLiteralZero_Candidate[1] = {
+const uint8_t kRawToDerLiteralZero_Candidate[] = {
     0x00,
 };
 
-const uint8_t kRawToDerLiteralZero_Expected[3] = {
+const uint8_t kRawToDerLiteralZero_Expected[] = {
     0x02,
     0x01,
     0x00,
 };
 
-const uint8_t kRawToDerLiteralZero_Expected_WithoutTag[1] = {
+const uint8_t kRawToDerLiteralZero_Expected_WithoutTag[] = {
     0x00,
 };
 
@@ -129,20 +129,20 @@
 };
 
 // Only leading zeroes
-const uint8_t kRawToDerOnlyLeadingZeroes_Candidate[4] = {
+const uint8_t kRawToDerOnlyLeadingZeroes_Candidate[] = {
     0x00,
     0x00,
     0x00,
     0x00,
 };
 
-const uint8_t kRawToDerOnlyLeadingZeroes_Expected[3] = {
+const uint8_t kRawToDerOnlyLeadingZeroes_Expected[] = {
     0x02,
     0x01,
     0x00,
 };
 
-const uint8_t kRawToDerOnlyLeadingZeroes_Expected_WithoutTag[1] = {
+const uint8_t kRawToDerOnlyLeadingZeroes_Expected_WithoutTag[] = {
     0x00,
 };
 
@@ -156,18 +156,18 @@
 };
 
 // Only one byte, non-zero, MSB set
-const uint8_t kRawToDerMsbSetOneByte_Candidate[1] = {
+const uint8_t kRawToDerMsbSetOneByte_Candidate[] = {
     0xff,
 };
 
-const uint8_t kRawToDerMsbSetOneByte_Expected[4] = {
+const uint8_t kRawToDerMsbSetOneByte_Expected[] = {
     0x02,
     0x02,
     0x00,
     0xff,
 };
 
-const uint8_t kRawToDerMsbSetOneByte_Expected_WithoutTag[2] = {
+const uint8_t kRawToDerMsbSetOneByte_Expected_WithoutTag[] = {
     0x00,
     0xff,
 };
@@ -182,17 +182,17 @@
 };
 
 // Only one byte, non-zero, MSB clear
-const uint8_t kRawToDerMsbClearOneByte_Candidate[1] = {
+const uint8_t kRawToDerMsbClearOneByte_Candidate[] = {
     0x7f,
 };
 
-const uint8_t kRawToDerMsbClearOneByte_Expected[3] = {
+const uint8_t kRawToDerMsbClearOneByte_Expected[] = {
     0x02,
     0x01,
     0x7f,
 };
 
-const uint8_t kRawToDerMsbClearOneByte_Expected_WithoutTag[1] = {
+const uint8_t kRawToDerMsbClearOneByte_Expected_WithoutTag[] = {
     0x7f,
 };
 
diff --git a/src/platform/ASR/ASRFactoryDataProvider.cpp b/src/platform/ASR/ASRFactoryDataProvider.cpp
index e620398..382b4ab 100644
--- a/src/platform/ASR/ASRFactoryDataProvider.cpp
+++ b/src/platform/ASR/ASRFactoryDataProvider.cpp
@@ -174,7 +174,7 @@
     //-> certification_type = 0
     //-> dac_origin_vendor_id is not present
     //-> dac_origin_product_id is not present
-    const uint8_t kCdForAllExamples[541] = {
+    const uint8_t kCdForAllExamples[] = {
         0x30, 0x82, 0x02, 0x19, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x0a, 0x30,
         0x82, 0x02, 0x06, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
         0x01, 0x30, 0x82, 0x01, 0x71, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x62,
@@ -228,7 +228,7 @@
     size_t certSize;
 #if !CONFIG_ENABLE_ASR_FACTORY_DATA_PROVIDER
 #ifdef USE_EXAMPLES_DAC
-    const uint8_t kDacCert[491] = {
+    const uint8_t kDacCert[] = {
         0x30, 0x82, 0x01, 0xe7, 0x30, 0x82, 0x01, 0x8e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x69, 0xcd, 0xf1, 0x0d, 0xe9,
         0xe5, 0x4e, 0xd1, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x3d, 0x31, 0x25, 0x30,
         0x23, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50,
@@ -271,7 +271,7 @@
     size_t certSize;
 #if !CONFIG_ENABLE_ASR_FACTORY_DATA_PROVIDER
 #ifdef USE_EXAMPLES_DAC
-    const uint8_t kPaiCert[463] = {
+    const uint8_t kPaiCert[] = {
         0x30, 0x82, 0x01, 0xcb, 0x30, 0x82, 0x01, 0x71, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x56, 0xad, 0x82, 0x22, 0xad,
         0x94, 0x5b, 0x64, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x30, 0x31, 0x18, 0x30,
         0x16, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x0f, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x54, 0x65, 0x73, 0x74, 0x20,
@@ -319,13 +319,13 @@
 
 #if !CONFIG_ENABLE_ASR_FACTORY_DATA_PROVIDER
 #ifdef USE_EXAMPLES_DAC
-    const uint8_t kDacPublicKey[65] = {
+    const uint8_t kDacPublicKey[] = {
         0x04, 0x46, 0x3a, 0xc6, 0x93, 0x42, 0x91, 0x0a, 0x0e, 0x55, 0x88, 0xfc, 0x6f, 0xf5, 0x6b, 0xb6, 0x3e,
         0x62, 0xec, 0xce, 0xcb, 0x14, 0x8f, 0x7d, 0x4e, 0xb0, 0x3e, 0xe5, 0x52, 0x60, 0x14, 0x15, 0x76, 0x7d,
         0x16, 0xa5, 0xc6, 0x63, 0xf7, 0x93, 0xe4, 0x91, 0x23, 0x26, 0x0b, 0x82, 0x97, 0xa7, 0xcd, 0x7e, 0x7c,
         0xfc, 0x7b, 0x31, 0x6b, 0x39, 0xd9, 0x8e, 0x90, 0xd2, 0x93, 0x77, 0x73, 0x8e, 0x82,
     };
-    const uint8_t kDacPrivateKey[32] = {
+    const uint8_t kDacPrivateKey[] = {
         0xaa, 0xb6, 0x00, 0xae, 0x8a, 0xe8, 0xaa, 0xb7, 0xd7, 0x36, 0x27, 0xc2, 0x17, 0xb7, 0xc2, 0x04,
         0x70, 0x9c, 0xa6, 0x94, 0x6a, 0xf5, 0xf2, 0xf7, 0x53, 0x08, 0x33, 0xa5, 0x2b, 0x44, 0xfb, 0xff,
     };
diff --git a/src/platform/Ameba/FactoryDataProvider.cpp b/src/platform/Ameba/FactoryDataProvider.cpp
index d545e0e..ad1441b 100644
--- a/src/platform/Ameba/FactoryDataProvider.cpp
+++ b/src/platform/Ameba/FactoryDataProvider.cpp
@@ -117,14 +117,14 @@
     0x91,
 };
 
-const uint8_t kDacPublicKey[65] = {
+const uint8_t kDacPublicKey[] = {
     0x04, 0x46, 0x3a, 0xc6, 0x93, 0x42, 0x91, 0x0a, 0x0e, 0x55, 0x88, 0xfc, 0x6f, 0xf5, 0x6b, 0xb6, 0x3e,
     0x62, 0xec, 0xce, 0xcb, 0x14, 0x8f, 0x7d, 0x4e, 0xb0, 0x3e, 0xe5, 0x52, 0x60, 0x14, 0x15, 0x76, 0x7d,
     0x16, 0xa5, 0xc6, 0x63, 0xf7, 0x93, 0xe4, 0x91, 0x23, 0x26, 0x0b, 0x82, 0x97, 0xa7, 0xcd, 0x7e, 0x7c,
     0xfc, 0x7b, 0x31, 0x6b, 0x39, 0xd9, 0x8e, 0x90, 0xd2, 0x93, 0x77, 0x73, 0x8e, 0x82,
 };
 
-const uint8_t kDacPrivateKey[32] = {
+const uint8_t kDacPrivateKey[] = {
     0xaa, 0xb6, 0x00, 0xae, 0x8a, 0xe8, 0xaa, 0xb7, 0xd7, 0x36, 0x27, 0xc2, 0x17, 0xb7, 0xc2, 0x04,
     0x70, 0x9c, 0xa6, 0x94, 0x6a, 0xf5, 0xf2, 0xf7, 0x53, 0x08, 0x33, 0xa5, 0x2b, 0x44, 0xfb, 0xff,
 };
diff --git a/src/platform/bouffalolab/common/FactoryDataProvider.cpp b/src/platform/bouffalolab/common/FactoryDataProvider.cpp
index d659afc..2bee53f 100644
--- a/src/platform/bouffalolab/common/FactoryDataProvider.cpp
+++ b/src/platform/bouffalolab/common/FactoryDataProvider.cpp
@@ -76,7 +76,7 @@
     return CHIP_ERROR_BUFFER_TOO_SMALL;
 #else
 
-    static const unsigned char Chip_Test_CD_130D_f001_der[539] = {
+    static const unsigned char Chip_Test_CD_130D_f001_der[] = {
         0x30, 0x81, 0xe9, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x81, 0xdb, 0x30, 0x81, 0xd8,
         0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30, 0x45,
         0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x38, 0x04, 0x36, 0x15, 0x24, 0x00, 0x01, 0x25,