TestChipCert: Test TLV to DER for compact PDC test vector (project-chip#43660)

Also update the PDC Identity test vector to the example given in the latest
spec version. (The updated test vector was generated using Deterministic ECDSA,
which will become relevant to future tests / code but makes no practical
difference for now.)

Author: ksperling-apple

src/credentials/tests/CHIPCert_test_vectors.cpp

@@ -2344,11 +2344,12 @@ extern constexpr ByteSpan sTestCert_Node02_08_AuthorityKeyId((const uint8_t[]){
 });
 
 /**************  Test PDCID01 Certificate  **************
+Example Network Identity from the spec, signed using Deterministic ECDSA
 Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: ecdsa-with-SHA256
+        Signature Algorithm: ecdsa-with-SHA256
         Issuer: CN=*
         Validity
             Not Before: Jan  1 00:00:01 2000 GMT
@@ -2373,19 +2374,19 @@ extern constexpr ByteSpan sTestCert_Node02_08_AuthorityKeyId((const uint8_t[]){
             X509v3 Extended Key Usage: critical
                 TLS Web Client Authentication, TLS Web Server Authentication
     Signature Algorithm: ecdsa-with-SHA256
-         30:45:02:21:00:e9:43:b6:16:f3:1a:f3:81:52:e7:37:41:f7:
-         47:28:db:7d:56:87:b5:94:c0:2e:0f:5f:ee:3a:60:bf:36:44:
-         a9:02:20:1c:85:2c:fd:6b:15:d8:f8:fe:19:93:4d:af:2f:91:
-         93:fd:2c:bc:4e:23:50:0a:31:7d:a4:a0:79:b2:db:69:42
+         30:45:02:20:38:4c:1b:d0:8f:e4:ca:a0:46:07:91:66:0d:82:
+         14:5d:fb:fe:97:d3:14:d1:5e:00:0d:75:c0:73:af:5d:7c:7e:
+         02:21:00:cc:1a:01:85:21:26:18:4a:d9:eb:ec:80:9b:4c:78:
+         ff:f3:81:fe:32:4b:af:88:1c:c8:24:9e:16:92:59:bd:5a
 
 -----BEGIN CERTIFICATE-----
 MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMAwxCjAIBgNVBAMMASowIBcNMDAw
 MTAxMDAwMDAxWhgPOTk5OTEyMzEyMzU5NTlaMAwxCjAIBgNVBAMMASowWTATBgcq
 hkjOPQIBBggqhkjOPQMBBwNCAAQ5zNSsfllovfGwgBEdklNklPxRYkxwqm1zCNrt
 86FeOGkXexvz0JBH6/Br6N0XviPy+z1jkMbPgoAvYtBTYsAIo0IwQDAMBgNVHRMB
 Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwCgYIKoZIzj0EAwIDSAAwRQIhAOlDthbzGvOBUuc3QfdHKNt9Voe1
-lMAuD1/uOmC/NkSpAiAchSz9axXY+P4Zk02vL5GT/Sy8TiNQCjF9pKB5sttpQg==
+KwYBBQUHAwEwCgYIKoZIzj0EAwIDSAAwRQIgOEwb0I/kyqBGB5FmDYIUXfv+l9MU
+0V4ADXXAc69dfH4CIQDMGgGFISYYStnr7ICbTHj/84H+MkuviBzIJJ4Wklm9Wg==
 -----END CERTIFICATE-----
 
 -----BEGIN EC PRIVATE KEY-----
@@ -2395,26 +2396,27 @@ R+vwa+jdF74j8vs9Y5DGz4KAL2LQU2LACA==
 -----END EC PRIVATE KEY-----
 */
 
+// NOTE: This non-compact TLV version of the certificate is not given in the spec, it was created from DER via chip-cert convert
 extern constexpr ByteSpan sTestCert_PDCID01_Chip((const uint8_t[]){
     0x15, 0x30, 0x01, 0x01, 0x01, 0x24, 0x02, 0x01, 0x37, 0x03, 0x2c, 0x01, 0x01, 0x2a, 0x18, 0x24, 0x04, 0x01, 0x24, 0x05, 0x00,
     0x37, 0x06, 0x2c, 0x01, 0x01, 0x2a, 0x18, 0x24, 0x07, 0x01, 0x24, 0x08, 0x01, 0x30, 0x09, 0x41, 0x04, 0x39, 0xcc, 0xd4, 0xac,
     0x7e, 0x59, 0x68, 0xbd, 0xf1, 0xb0, 0x80, 0x11, 0x1d, 0x92, 0x53, 0x64, 0x94, 0xfc, 0x51, 0x62, 0x4c, 0x70, 0xaa, 0x6d, 0x73,
     0x08, 0xda, 0xed, 0xf3, 0xa1, 0x5e, 0x38, 0x69, 0x17, 0x7b, 0x1b, 0xf3, 0xd0, 0x90, 0x47, 0xeb, 0xf0, 0x6b, 0xe8, 0xdd, 0x17,
     0xbe, 0x23, 0xf2, 0xfb, 0x3d, 0x63, 0x90, 0xc6, 0xcf, 0x82, 0x80, 0x2f, 0x62, 0xd0, 0x53, 0x62, 0xc0, 0x08, 0x37, 0x0a, 0x35,
-    0x01, 0x28, 0x01, 0x18, 0x24, 0x02, 0x01, 0x36, 0x03, 0x04, 0x02, 0x04, 0x01, 0x18, 0x18, 0x30, 0x0b, 0x40, 0xe9, 0x43, 0xb6,
-    0x16, 0xf3, 0x1a, 0xf3, 0x81, 0x52, 0xe7, 0x37, 0x41, 0xf7, 0x47, 0x28, 0xdb, 0x7d, 0x56, 0x87, 0xb5, 0x94, 0xc0, 0x2e, 0x0f,
-    0x5f, 0xee, 0x3a, 0x60, 0xbf, 0x36, 0x44, 0xa9, 0x1c, 0x85, 0x2c, 0xfd, 0x6b, 0x15, 0xd8, 0xf8, 0xfe, 0x19, 0x93, 0x4d, 0xaf,
-    0x2f, 0x91, 0x93, 0xfd, 0x2c, 0xbc, 0x4e, 0x23, 0x50, 0x0a, 0x31, 0x7d, 0xa4, 0xa0, 0x79, 0xb2, 0xdb, 0x69, 0x42, 0x18,
+    0x01, 0x28, 0x01, 0x18, 0x24, 0x02, 0x01, 0x36, 0x03, 0x04, 0x02, 0x04, 0x01, 0x18, 0x18, 0x30, 0x0b, 0x40, 0x38, 0x4c, 0x1b,
+    0xd0, 0x8f, 0xe4, 0xca, 0xa0, 0x46, 0x07, 0x91, 0x66, 0x0d, 0x82, 0x14, 0x5d, 0xfb, 0xfe, 0x97, 0xd3, 0x14, 0xd1, 0x5e, 0x00,
+    0x0d, 0x75, 0xc0, 0x73, 0xaf, 0x5d, 0x7c, 0x7e, 0xcc, 0x1a, 0x01, 0x85, 0x21, 0x26, 0x18, 0x4a, 0xd9, 0xeb, 0xec, 0x80, 0x9b,
+    0x4c, 0x78, 0xff, 0xf3, 0x81, 0xfe, 0x32, 0x4b, 0xaf, 0x88, 0x1c, 0xc8, 0x24, 0x9e, 0x16, 0x92, 0x59, 0xbd, 0x5a, 0x18,
 });
 
 extern constexpr ByteSpan sTestCert_PDCID01_ChipCompact((const uint8_t[]){
     0x15, 0x30, 0x09, 0x41, 0x04, 0x39, 0xcc, 0xd4, 0xac, 0x7e, 0x59, 0x68, 0xbd, 0xf1, 0xb0, 0x80, 0x11, 0x1d, 0x92, 0x53,
     0x64, 0x94, 0xfc, 0x51, 0x62, 0x4c, 0x70, 0xaa, 0x6d, 0x73, 0x08, 0xda, 0xed, 0xf3, 0xa1, 0x5e, 0x38, 0x69, 0x17, 0x7b,
     0x1b, 0xf3, 0xd0, 0x90, 0x47, 0xeb, 0xf0, 0x6b, 0xe8, 0xdd, 0x17, 0xbe, 0x23, 0xf2, 0xfb, 0x3d, 0x63, 0x90, 0xc6, 0xcf,
-    0x82, 0x80, 0x2f, 0x62, 0xd0, 0x53, 0x62, 0xc0, 0x08, 0x30, 0x0b, 0x40, 0xe9, 0x43, 0xb6, 0x16, 0xf3, 0x1a, 0xf3, 0x81,
-    0x52, 0xe7, 0x37, 0x41, 0xf7, 0x47, 0x28, 0xdb, 0x7d, 0x56, 0x87, 0xb5, 0x94, 0xc0, 0x2e, 0x0f, 0x5f, 0xee, 0x3a, 0x60,
-    0xbf, 0x36, 0x44, 0xa9, 0x1c, 0x85, 0x2c, 0xfd, 0x6b, 0x15, 0xd8, 0xf8, 0xfe, 0x19, 0x93, 0x4d, 0xaf, 0x2f, 0x91, 0x93,
-    0xfd, 0x2c, 0xbc, 0x4e, 0x23, 0x50, 0x0a, 0x31, 0x7d, 0xa4, 0xa0, 0x79, 0xb2, 0xdb, 0x69, 0x42, 0x18,
+    0x82, 0x80, 0x2f, 0x62, 0xd0, 0x53, 0x62, 0xc0, 0x08, 0x30, 0x0b, 0x40, 0x38, 0x4c, 0x1b, 0xd0, 0x8f, 0xe4, 0xca, 0xa0,
+    0x46, 0x07, 0x91, 0x66, 0x0d, 0x82, 0x14, 0x5d, 0xfb, 0xfe, 0x97, 0xd3, 0x14, 0xd1, 0x5e, 0x00, 0x0d, 0x75, 0xc0, 0x73,
+    0xaf, 0x5d, 0x7c, 0x7e, 0xcc, 0x1a, 0x01, 0x85, 0x21, 0x26, 0x18, 0x4a, 0xd9, 0xeb, 0xec, 0x80, 0x9b, 0x4c, 0x78, 0xff,
+    0xf3, 0x81, 0xfe, 0x32, 0x4b, 0xaf, 0x88, 0x1c, 0xc8, 0x24, 0x9e, 0x16, 0x92, 0x59, 0xbd, 0x5a, 0x18,
 });
 
 extern constexpr ByteSpan sTestCert_PDCID01_DER((const uint8_t[]){
@@ -2430,10 +2432,10 @@ extern constexpr ByteSpan sTestCert_PDCID01_DER((const uint8_t[]){
     0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04,
     0x03, 0x02, 0x07, 0x80, 0x30, 0x20, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x01, 0x01, 0xff, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b,
     0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x30, 0x0a, 0x06, 0x08,
-    0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45, 0x02, 0x21, 0x00, 0xe9, 0x43, 0xb6, 0x16, 0xf3,
-    0x1a, 0xf3, 0x81, 0x52, 0xe7, 0x37, 0x41, 0xf7, 0x47, 0x28, 0xdb, 0x7d, 0x56, 0x87, 0xb5, 0x94, 0xc0, 0x2e, 0x0f, 0x5f, 0xee,
-    0x3a, 0x60, 0xbf, 0x36, 0x44, 0xa9, 0x02, 0x20, 0x1c, 0x85, 0x2c, 0xfd, 0x6b, 0x15, 0xd8, 0xf8, 0xfe, 0x19, 0x93, 0x4d, 0xaf,
-    0x2f, 0x91, 0x93, 0xfd, 0x2c, 0xbc, 0x4e, 0x23, 0x50, 0x0a, 0x31, 0x7d, 0xa4, 0xa0, 0x79, 0xb2, 0xdb, 0x69, 0x42,
+    0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45, 0x02, 0x20, 0x38, 0x4c, 0x1b, 0xd0, 0x8f, 0xe4,
+    0xca, 0xa0, 0x46, 0x07, 0x91, 0x66, 0x0d, 0x82, 0x14, 0x5d, 0xfb, 0xfe, 0x97, 0xd3, 0x14, 0xd1, 0x5e, 0x00, 0x0d, 0x75, 0xc0,
+    0x73, 0xaf, 0x5d, 0x7c, 0x7e, 0x02, 0x21, 0x00, 0xcc, 0x1a, 0x01, 0x85, 0x21, 0x26, 0x18, 0x4a, 0xd9, 0xeb, 0xec, 0x80, 0x9b,
+    0x4c, 0x78, 0xff, 0xf3, 0x81, 0xfe, 0x32, 0x4b, 0xaf, 0x88, 0x1c, 0xc8, 0x24, 0x9e, 0x16, 0x92, 0x59, 0xbd, 0x5a,
 });
 
 extern constexpr ByteSpan sTestCert_PDCID01_PublicKey((const uint8_t[]){

src/credentials/tests/TestChipCert.cpp

@@ -191,9 +191,19 @@ TEST_F(TestChipCert, TestChipCert_ChipToX509)
     }
 
     // Error Case:
-    MutableByteSpan outCert(outCertBuf);
-    err = ConvertChipCertToX509Cert(sTestCert_Node01_01_Err01_Chip, outCert);
-    EXPECT_EQ(err, CHIP_ERROR_INVALID_TLV_TAG);
+    {
+        MutableByteSpan outCert(outCertBuf);
+        err = ConvertChipCertToX509Cert(sTestCert_Node01_01_Err01_Chip, outCert);
+        EXPECT_EQ(err, CHIP_ERROR_INVALID_TLV_TAG);
+    }
+
+    // For a PDC Identity, converting from the compact form must work too
+    {
+        MutableByteSpan outCert(outCertBuf);
+        err = ConvertChipCertToX509Cert(sTestCert_PDCID01_ChipCompact, outCert);
+        EXPECT_EQ(err, CHIP_NO_ERROR);
+        EXPECT_TRUE(sTestCert_PDCID01_DER.data_equal(outCert));
+    }
 }
 
 TEST_F(TestChipCert, TestChipCert_ChipToX509_ErrorCases)