Tests: Use TestCert enum type instead of uint8_t

ksperling-apple · ksperling-apple · commit 723ae94ad69f · 2023-10-26T11:21:07.000+13:00
diff --git a/src/credentials/tests/CHIPCert_test_vectors.cpp b/src/credentials/tests/CHIPCert_test_vectors.cpp
@@ -32,7 +32,7 @@ namespace chip {
 namespace TestCerts {
 
 // clang-format off
-extern const uint8_t gTestCerts[] = {
+extern const TestCert gTestCerts[] = {
     TestCert::kRoot01,
     TestCert::kRoot02,
     TestCert::kRoot03,
@@ -55,7 +55,7 @@ extern const uint8_t gTestCerts[] = {
 
 extern const size_t gNumTestCerts = ArraySize(gTestCerts);
 
-CHIP_ERROR GetTestCert(uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFlags, ByteSpan & cert)
+CHIP_ERROR GetTestCert(TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags, ByteSpan & cert)
 {
     CHIP_ERROR err;
     bool derForm = certLoadFlags.Has(TestCertLoadFlags::kDERForm);
@@ -96,7 +96,7 @@ CHIP_ERROR GetTestCert(uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFla
     return err;
 }
 
-const char * GetTestCertName(uint8_t certType)
+const char * GetTestCertName(TestCert certType)
 {
 #define NAME_CERT(NAME)                                                                                                            \
     do                                                                                                                             \
@@ -129,7 +129,7 @@ const char * GetTestCertName(uint8_t certType)
     return nullptr;
 }
 
-CHIP_ERROR GetTestCertPubkey(uint8_t certType, ByteSpan & pubkey)
+CHIP_ERROR GetTestCertPubkey(TestCert certType, ByteSpan & pubkey)
 {
     CHIP_ERROR err;
 
@@ -169,7 +169,7 @@ CHIP_ERROR GetTestCertPubkey(uint8_t certType, ByteSpan & pubkey)
     return err;
 }
 
-CHIP_ERROR GetTestCertSKID(uint8_t certType, ByteSpan & skid)
+CHIP_ERROR GetTestCertSKID(TestCert certType, ByteSpan & skid)
 {
     CHIP_ERROR err;
 
@@ -209,7 +209,7 @@ CHIP_ERROR GetTestCertSKID(uint8_t certType, ByteSpan & skid)
     return err;
 }
 
-CHIP_ERROR GetTestCertAKID(uint8_t certType, ByteSpan & akid)
+CHIP_ERROR GetTestCertAKID(TestCert certType, ByteSpan & akid)
 {
     CHIP_ERROR err;
 
@@ -249,7 +249,7 @@ CHIP_ERROR GetTestCertAKID(uint8_t certType, ByteSpan & akid)
     return err;
 }
 
-CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFlags,
+CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags,
                         BitFlags<CertDecodeFlags> decodeFlags)
 {
     CHIP_ERROR err;
diff --git a/src/credentials/tests/CHIPCert_test_vectors.h b/src/credentials/tests/CHIPCert_test_vectors.h
@@ -68,15 +68,15 @@ enum class TestCertLoadFlags : uint8_t
     kSetAppDefinedCertType = 0x20,
 };
 
-extern CHIP_ERROR GetTestCert(uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFlags, ByteSpan & cert);
-extern const char * GetTestCertName(uint8_t certType);
-extern CHIP_ERROR GetTestCertPubkey(uint8_t certType, ByteSpan & pubkey);
-extern CHIP_ERROR GetTestCertSKID(uint8_t certType, ByteSpan & skid);
-extern CHIP_ERROR GetTestCertAKID(uint8_t certType, ByteSpan & akid);
-extern CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFlags,
+extern CHIP_ERROR GetTestCert(TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags, ByteSpan & cert);
+extern const char * GetTestCertName(TestCert certType);
+extern CHIP_ERROR GetTestCertPubkey(TestCert certType, ByteSpan & pubkey);
+extern CHIP_ERROR GetTestCertSKID(TestCert certType, ByteSpan & skid);
+extern CHIP_ERROR GetTestCertAKID(TestCert certType, ByteSpan & akid);
+extern CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags,
                                BitFlags<CertDecodeFlags> decodeFlags);
 
-extern const uint8_t gTestCerts[];
+extern const TestCert gTestCerts[];
 extern const size_t gNumTestCerts;
 
 // ------------------------------ DECLARATIONS ----------------------------------------
diff --git a/src/credentials/tests/TestChipCert.cpp b/src/credentials/tests/TestChipCert.cpp
@@ -171,7 +171,7 @@ static void TestChipCert_ChipToX509(nlTestSuite * inSuite, void * inContext)
 
     for (size_t i = 0; i < gNumTestCerts; i++)
     {
-        uint8_t certType = gTestCerts[i];
+        TestCert certType = gTestCerts[i];
 
         err = GetTestCert(certType, sNullLoadFlag, inCert);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
@@ -267,7 +267,7 @@ static void TestChipCert_X509ToChip(nlTestSuite * inSuite, void * inContext)
 
     for (size_t i = 0; i < gNumTestCerts; i++)
     {
-        uint8_t certType = gTestCerts[i];
+        TestCert certType = gTestCerts[i];
 
         err = GetTestCert(certType, sDerFormFlag, inCert);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
@@ -368,7 +368,7 @@ static void TestChipCert_CertValidation(nlTestSuite * inSuite, void * inContext)
         int mExpectedTrustAnchorIndex;
         struct
         {
-            uint8_t Type;
+            TestCert Type;
             BitFlags<CertDecodeFlags> DecodeFlags;
             BitFlags<TestCertLoadFlags> LoadFlags;
         } InputCerts[kMaxCertsPerTestCase];
@@ -832,7 +832,7 @@ static void TestChipCert_ValidateChipRCAC(nlTestSuite * inSuite, void * inContex
 {
     struct RCACTestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         CHIP_ERROR mExpectedResult;
     };
 
@@ -1191,7 +1191,7 @@ static void TestChipCert_CertType(nlTestSuite * inSuite, void * inContext)
 
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         CertType ExpectedCertType;
     };
 
@@ -1237,7 +1237,7 @@ static void TestChipCert_CertId(nlTestSuite * inSuite, void * inContext)
 
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         uint64_t ExpectedCertId;
     };
 
@@ -1728,8 +1728,8 @@ static void TestChipCert_ExtractNodeIdFabricId(nlTestSuite * inSuite, void * inC
 {
     struct TestCase
     {
-        uint8_t Cert;
-        uint8_t ICACert;
+        TestCert Cert;
+        TestCert ICACert;
         uint64_t ExpectedNodeId;
         uint64_t ExpectedFabricId;
     };
@@ -1844,8 +1844,8 @@ static void TestChipCert_ExtractOperationalDiscoveryId(nlTestSuite * inSuite, vo
 {
     struct TestCase
     {
-        uint8_t Noc;
-        uint8_t Rcac;
+        TestCert Noc;
+        TestCert Rcac;
         uint64_t ExpectedNodeId;
         uint64_t ExpectedFabricId;
         uint64_t ExpectedCompressedFabricId;
@@ -1900,7 +1900,7 @@ static void TestChipCert_ExtractAndValidateCATsFromOpCert(nlTestSuite * inSuite,
 {
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         CATValues ExpectedCATs;
     };
 
@@ -1986,7 +1986,7 @@ static void TestChipCert_ExtractSubjectDNFromChipCert(nlTestSuite * inSuite, voi
 {
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         ChipDN ExpectedSubjectDN;
     };
 
@@ -2058,7 +2058,7 @@ static void TestChipCert_ExtractPublicKeyAndSKID(nlTestSuite * inSuite, void * i
 {
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         ByteSpan ExpectedPublicKey;
         ByteSpan ExpectedSKID;
     };

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ namespace chip {`
`32`	`32`	`namespace TestCerts {`
`33`	`33`
`34`	`34`	`// clang-format off`
`35`		`-extern const uint8_t gTestCerts[] = {`
	`35`	`+extern const TestCert gTestCerts[] = {`
`36`	`36`	`TestCert::kRoot01,`
`37`	`37`	`TestCert::kRoot02,`
`38`	`38`	`TestCert::kRoot03,`
`@@ -55,7 +55,7 @@ extern const uint8_t gTestCerts[] = {`
`55`	`55`
`56`	`56`	`extern const size_t gNumTestCerts = ArraySize(gTestCerts);`
`57`	`57`
`58`		`-CHIP_ERROR GetTestCert(uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFlags, ByteSpan & cert)`
	`58`	`+CHIP_ERROR GetTestCert(TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags, ByteSpan & cert)`
`59`	`59`	`{`
`60`	`60`	`CHIP_ERROR err;`
`61`	`61`	`bool derForm = certLoadFlags.Has(TestCertLoadFlags::kDERForm);`
`@@ -96,7 +96,7 @@ CHIP_ERROR GetTestCert(uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFla`
`96`	`96`	`return err;`
`97`	`97`	`}`
`98`	`98`
`99`		`-const char * GetTestCertName(uint8_t certType)`
	`99`	`+const char * GetTestCertName(TestCert certType)`
`100`	`100`	`{`
`101`	`101`	`#define NAME_CERT(NAME) \`
`102`	`102`	`do \`
`@@ -129,7 +129,7 @@ const char * GetTestCertName(uint8_t certType)`
`129`	`129`	`return nullptr;`
`130`	`130`	`}`
`131`	`131`
`132`		`-CHIP_ERROR GetTestCertPubkey(uint8_t certType, ByteSpan & pubkey)`
	`132`	`+CHIP_ERROR GetTestCertPubkey(TestCert certType, ByteSpan & pubkey)`
`133`	`133`	`{`
`134`	`134`	`CHIP_ERROR err;`
`135`	`135`
`@@ -169,7 +169,7 @@ CHIP_ERROR GetTestCertPubkey(uint8_t certType, ByteSpan & pubkey)`
`169`	`169`	`return err;`
`170`	`170`	`}`
`171`	`171`
`172`		`-CHIP_ERROR GetTestCertSKID(uint8_t certType, ByteSpan & skid)`
	`172`	`+CHIP_ERROR GetTestCertSKID(TestCert certType, ByteSpan & skid)`
`173`	`173`	`{`
`174`	`174`	`CHIP_ERROR err;`
`175`	`175`
`@@ -209,7 +209,7 @@ CHIP_ERROR GetTestCertSKID(uint8_t certType, ByteSpan & skid)`
`209`	`209`	`return err;`
`210`	`210`	`}`
`211`	`211`
`212`		`-CHIP_ERROR GetTestCertAKID(uint8_t certType, ByteSpan & akid)`
	`212`	`+CHIP_ERROR GetTestCertAKID(TestCert certType, ByteSpan & akid)`
`213`	`213`	`{`
`214`	`214`	`CHIP_ERROR err;`
`215`	`215`
`@@ -249,7 +249,7 @@ CHIP_ERROR GetTestCertAKID(uint8_t certType, ByteSpan & akid)`
`249`	`249`	`return err;`
`250`	`250`	`}`
`251`	`251`
`252`		`-CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFlags,`
	`252`	`+CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags,`
`253`	`253`	`BitFlags<CertDecodeFlags> decodeFlags)`
`254`	`254`	`{`
`255`	`255`	`CHIP_ERROR err;`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ static void TestChipCert_ChipToX509(nlTestSuite * inSuite, void * inContext)`
`171`	`171`
`172`	`172`	`for (size_t i = 0; i < gNumTestCerts; i++)`
`173`	`173`	`{`
`174`		`- uint8_t certType = gTestCerts[i];`
	`174`	`+ TestCert certType = gTestCerts[i];`
`175`	`175`
`176`	`176`	`err = GetTestCert(certType, sNullLoadFlag, inCert);`
`177`	`177`	`NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);`
`@@ -267,7 +267,7 @@ static void TestChipCert_X509ToChip(nlTestSuite * inSuite, void * inContext)`
`267`	`267`
`268`	`268`	`for (size_t i = 0; i < gNumTestCerts; i++)`
`269`	`269`	`{`
`270`		`- uint8_t certType = gTestCerts[i];`
	`270`	`+ TestCert certType = gTestCerts[i];`
`271`	`271`
`272`	`272`	`err = GetTestCert(certType, sDerFormFlag, inCert);`
`273`	`273`	`NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);`
`@@ -368,7 +368,7 @@ static void TestChipCert_CertValidation(nlTestSuite * inSuite, void * inContext)`
`368`	`368`	`int mExpectedTrustAnchorIndex;`
`369`	`369`	`struct`
`370`	`370`	`{`
`371`		`- uint8_t Type;`
	`371`	`+ TestCert Type;`
`372`	`372`	`BitFlags<CertDecodeFlags> DecodeFlags;`
`373`	`373`	`BitFlags<TestCertLoadFlags> LoadFlags;`
`374`	`374`	`} InputCerts[kMaxCertsPerTestCase];`
`@@ -832,7 +832,7 @@ static void TestChipCert_ValidateChipRCAC(nlTestSuite * inSuite, void * inContex`
`832`	`832`	`{`
`833`	`833`	`struct RCACTestCase`
`834`	`834`	`{`
`835`		`- uint8_t Cert;`
	`835`	`+ TestCert Cert;`
`836`	`836`	`CHIP_ERROR mExpectedResult;`
`837`	`837`	`};`
`838`	`838`
`@@ -1191,7 +1191,7 @@ static void TestChipCert_CertType(nlTestSuite * inSuite, void * inContext)`
`1191`	`1191`
`1192`	`1192`	`struct TestCase`
`1193`	`1193`	`{`
`1194`		`- uint8_t Cert;`
	`1194`	`+ TestCert Cert;`
`1195`	`1195`	`CertType ExpectedCertType;`
`1196`	`1196`	`};`
`1197`	`1197`
`@@ -1237,7 +1237,7 @@ static void TestChipCert_CertId(nlTestSuite * inSuite, void * inContext)`
`1237`	`1237`
`1238`	`1238`	`struct TestCase`
`1239`	`1239`	`{`
`1240`		`- uint8_t Cert;`
	`1240`	`+ TestCert Cert;`
`1241`	`1241`	`uint64_t ExpectedCertId;`
`1242`	`1242`	`};`
`1243`	`1243`
`@@ -1728,8 +1728,8 @@ static void TestChipCert_ExtractNodeIdFabricId(nlTestSuite * inSuite, void * inC`
`1728`	`1728`	`{`
`1729`	`1729`	`struct TestCase`
`1730`	`1730`	`{`
`1731`		`- uint8_t Cert;`
`1732`		`- uint8_t ICACert;`
	`1731`	`+ TestCert Cert;`
	`1732`	`+ TestCert ICACert;`
`1733`	`1733`	`uint64_t ExpectedNodeId;`
`1734`	`1734`	`uint64_t ExpectedFabricId;`
`1735`	`1735`	`};`
`@@ -1844,8 +1844,8 @@ static void TestChipCert_ExtractOperationalDiscoveryId(nlTestSuite * inSuite, vo`
`1844`	`1844`	`{`
`1845`	`1845`	`struct TestCase`
`1846`	`1846`	`{`
`1847`		`- uint8_t Noc;`
`1848`		`- uint8_t Rcac;`
	`1847`	`+ TestCert Noc;`
	`1848`	`+ TestCert Rcac;`
`1849`	`1849`	`uint64_t ExpectedNodeId;`
`1850`	`1850`	`uint64_t ExpectedFabricId;`
`1851`	`1851`	`uint64_t ExpectedCompressedFabricId;`
`@@ -1900,7 +1900,7 @@ static void TestChipCert_ExtractAndValidateCATsFromOpCert(nlTestSuite * inSuite,`
`1900`	`1900`	`{`
`1901`	`1901`	`struct TestCase`
`1902`	`1902`	`{`
`1903`		`- uint8_t Cert;`
	`1903`	`+ TestCert Cert;`
`1904`	`1904`	`CATValues ExpectedCATs;`
`1905`	`1905`	`};`
`1906`	`1906`
`@@ -1986,7 +1986,7 @@ static void TestChipCert_ExtractSubjectDNFromChipCert(nlTestSuite * inSuite, voi`
`1986`	`1986`	`{`
`1987`	`1987`	`struct TestCase`
`1988`	`1988`	`{`
`1989`		`- uint8_t Cert;`
	`1989`	`+ TestCert Cert;`
`1990`	`1990`	`ChipDN ExpectedSubjectDN;`
`1991`	`1991`	`};`
`1992`	`1992`
`@@ -2058,7 +2058,7 @@ static void TestChipCert_ExtractPublicKeyAndSKID(nlTestSuite * inSuite, void * i`
`2058`	`2058`	`{`
`2059`	`2059`	`struct TestCase`
`2060`	`2060`	`{`
`2061`		`- uint8_t Cert;`
	`2061`	`+ TestCert Cert;`
`2062`	`2062`	`ByteSpan ExpectedPublicKey;`
`2063`	`2063`	`ByteSpan ExpectedSKID;`
`2064`	`2064`	`};`