Skip to content

Commit 7d61630

Browse files
committed
Fix asan
1 parent 47974c4 commit 7d61630

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

src/credentials/tests/TestFabricTable.cpp

+15-13
Original file line numberDiff line numberDiff line change
@@ -1929,27 +1929,29 @@ TEST_F(TestFabricTable, TestUpdateNocFailSafe)
19291929
// Validate contents
19301930
const auto * fabricInfo = fabricTable.FindFabricWithIndex(1);
19311931
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);
19361937

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);
19421943

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+
}
19461948

19471949
// Validate that fabric has the correct operational key by verifying a signature
19481950
{
19491951
uint8_t nocBuf[Credentials::kMaxCHIPCertLength];
19501952
MutableByteSpan nocSpan{ nocBuf };
19511953
EXPECT_EQ(fabricTable.FetchNOCCert(1, nocSpan), CHIP_NO_ERROR);
1952-
1954+
Credentials::ChipCertificateSet certificates;
19531955
EXPECT_EQ(certificates.Init(1), CHIP_NO_ERROR);
19541956
EXPECT_EQ(certificates.LoadCert(nocSpan, BitFlags<CertDecodeFlags>(CertDecodeFlags::kIsTrustAnchor)), CHIP_NO_ERROR);
19551957
Crypto::P256PublicKey nocPubKey(certificates.GetCertSet()[0].mPublicKey);

0 commit comments

Comments
 (0)