@@ -1929,27 +1929,29 @@ TEST_F(TestFabricTable, TestUpdateNocFailSafe)
1929
1929
// Validate contents
1930
1930
const auto * fabricInfo = fabricTable.FindFabricWithIndex (1 );
1931
1931
ASSERT_NE (fabricInfo, nullptr );
1932
- Credentials::ChipCertificateSet certificates;
1933
- EXPECT_EQ (certificates.Init (1 ), CHIP_NO_ERROR);
1934
- EXPECT_EQ (certificates.LoadCert (rcac, BitFlags<CertDecodeFlags>(CertDecodeFlags::kIsTrustAnchor )), CHIP_NO_ERROR);
1935
- Crypto::P256PublicKey rcacPublicKey (certificates.GetCertSet ()[0 ].mPublicKey );
1932
+ {
1933
+ Credentials::ChipCertificateSet certificates;
1934
+ EXPECT_EQ (certificates.Init (1 ), CHIP_NO_ERROR);
1935
+ EXPECT_EQ (certificates.LoadCert (rcac, BitFlags<CertDecodeFlags>(CertDecodeFlags::kIsTrustAnchor )), CHIP_NO_ERROR);
1936
+ Crypto::P256PublicKey rcacPublicKey (certificates.GetCertSet ()[0 ].mPublicKey );
1936
1937
1937
- EXPECT_EQ (fabricInfo->GetFabricIndex (), fabricIndex);
1938
- EXPECT_EQ (fabricInfo->GetNodeId (), 999u );
1939
- EXPECT_EQ (fabricInfo->GetFabricId (), 44u );
1940
- EXPECT_EQ (fabricInfo->GetVendorId (), kVendorId );
1941
- EXPECT_EQ (fabricInfo->GetFabricLabel ().size (), 0u );
1938
+ EXPECT_EQ (fabricInfo->GetFabricIndex (), fabricIndex);
1939
+ EXPECT_EQ (fabricInfo->GetNodeId (), 999u );
1940
+ EXPECT_EQ (fabricInfo->GetFabricId (), 44u );
1941
+ EXPECT_EQ (fabricInfo->GetVendorId (), kVendorId );
1942
+ EXPECT_EQ (fabricInfo->GetFabricLabel ().size (), 0u );
1942
1943
1943
- Crypto::P256PublicKey rootPublicKeyOfFabric;
1944
- EXPECT_EQ (fabricTable.FetchRootPubkey (fabricIndex, rootPublicKeyOfFabric), CHIP_NO_ERROR);
1945
- EXPECT_TRUE (rootPublicKeyOfFabric.Matches (rcacPublicKey));
1944
+ Crypto::P256PublicKey rootPublicKeyOfFabric;
1945
+ EXPECT_EQ (fabricTable.FetchRootPubkey (fabricIndex, rootPublicKeyOfFabric), CHIP_NO_ERROR);
1946
+ EXPECT_TRUE (rootPublicKeyOfFabric.Matches (rcacPublicKey));
1947
+ }
1946
1948
1947
1949
// Validate that fabric has the correct operational key by verifying a signature
1948
1950
{
1949
1951
uint8_t nocBuf[Credentials::kMaxCHIPCertLength ];
1950
1952
MutableByteSpan nocSpan{ nocBuf };
1951
1953
EXPECT_EQ (fabricTable.FetchNOCCert (1 , nocSpan), CHIP_NO_ERROR);
1952
-
1954
+ Credentials::ChipCertificateSet certificates;
1953
1955
EXPECT_EQ (certificates.Init (1 ), CHIP_NO_ERROR);
1954
1956
EXPECT_EQ (certificates.LoadCert (nocSpan, BitFlags<CertDecodeFlags>(CertDecodeFlags::kIsTrustAnchor )), CHIP_NO_ERROR);
1955
1957
Crypto::P256PublicKey nocPubKey (certificates.GetCertSet ()[0 ].mPublicKey );
0 commit comments