Updated mbedTLS certificate chain validity check. (#21741)

- Updated mbedTLS callback function to implement Matter cautom certificate chain validity logic. - Implemented the same changes in the TinyCrypt library. - Removed IsCertificateValidAtIssuance() checks from the DefaultDeviceAttestationVerifier.cpp because these checks are now performed by the ValidateCertificateChain() function. - Added new negative test cases.
project-chip · Aug 11, 2022 · acfe0d7 · acfe0d7
1 parent c758e8b
commit acfe0d7
Show file tree

Hide file tree

Showing 82 changed files with 1,216 additions and 635 deletions.
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0020-ValInPast-Cert.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0020-ValInPast-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0020-ValInPast-Cert.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0020-ValInPast-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBtzCCAV2gAwIBAgIIXrooKwMa2ZcwCgYIKoZIzj0EAwIwLjEsMCoGA1UEAwwj
+MIIBzzCCAXWgAwIBAgIIH91Afsa/ysEwCgYIKoZIzj0EAwIwLjEsMCoGA1UEAwwj
 TWF0dGVyIFRlc3QgUEFJIE12aWQ6RkZGMiBNcGlkOjgwMDQwHhcNMjEwNjI4MTQy
-MzQzWhcNMjIwNjI4MTQyMzQyWjAzMTEwLwYDVQQDDChNYXR0ZXIgVGVzdCBEQUMg
-MDAyMCBNdmlkOkZGRjIgTXBpZDo4MDA0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAErvxiV4Il2qLB+hezzYAikD5f1cIMUBR29YeZjDMCbamiTNQUMa34kWtWRapd
-BUURV939uVrTSt+1+nfKp4OgeKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8E
-BAMCB4AwHQYDVR0OBBYEFHT8M83P0Ax8o9XyMA0BLepGsySSMB8GA1UdIwQYMBaA
-FBVuzYwUvoC0EK7kAqPyMxfnNAZ0MAoGCCqGSM49BAMCA0gAMEUCIQCn/XxU6EGf
-uZGSUl66/kt9PtW/cgUT1Dv3UWbbfdOyhQIgEBcUM/4TX66Bs0P5p3tC5A/XyU8Z
-qK1sWlj+Czdc8WQ=
+MzQzWhcNMjIwNjI4MTQyMzQyWjBLMR0wGwYDVQQDDBRNYXR0ZXIgVGVzdCBEQUMg
+MDAyMDEUMBIGCisGAQQBgqJ8AgEMBEZGRjIxFDASBgorBgEEAYKifAICDAQ4MDA0
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEFS7+Z7y724w/pLRX+j79xfpE0MIX
+ludLpYXRMRjCRtvtCsBYeoNIfE5IZQ7obeqzgYCAkZo64lpPo6yAjq8RS6NgMF4w
+DAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFJy/C9g7xl5P
+QC8VofdG/Rd9Q+ekMB8GA1UdIwQYMBaAFBVuzYwUvoC0EK7kAqPyMxfnNAZ0MAoG
+CCqGSM49BAMCA0gAMEUCIQCmwd5OJQ2hGsv3NPp2nlCL0T72Hu8XD/iFXFcjTShg
+iQIgZeCyGAbA3dvVmH/tRMjucImyRxXM3dimOD72L7e03M0=
 -----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0020-ValInPast-Key.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0020-ValInPast-Key.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0020-ValInPast-Key.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0020-ValInPast-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMlVUvd5WAO8C9MhJ6hSEyddENcxhbqVUdFp3Snb+mdkoAoGCCqGSM49
-AwEHoUQDQgAErvxiV4Il2qLB+hezzYAikD5f1cIMUBR29YeZjDMCbamiTNQUMa34
-kWtWRapdBUURV939uVrTSt+1+nfKp4OgeA==
+MHcCAQEEIASAEoQWHgLvBUO9LOpqWvI8lzFQSuuKiXksAfrsi/4GoAoGCCqGSM49
+AwEHoUQDQgAEFS7+Z7y724w/pLRX+j79xfpE0MIXludLpYXRMRjCRtvtCsBYeoNI
+fE5IZQ7obeqzgYCAkZo64lpPo6yAjq8RSw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0021-ValInFuture-Cert.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0021-ValInFuture-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0021-ValInFuture-Cert.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0021-ValInFuture-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuDCCAV+gAwIBAgIIL2+OMx/9kVUwCgYIKoZIzj0EAwIwLjEsMCoGA1UEAwwj
+MIIB0jCCAXegAwIBAgIIdnxuVvbiYEEwCgYIKoZIzj0EAwIwLjEsMCoGA1UEAwwj
 TWF0dGVyIFRlc3QgUEFJIE12aWQ6RkZGMiBNcGlkOjgwMDQwIBcNMzEwNjI4MTQy
-MzQzWhgPOTk5OTEyMzEyMzU5NTlaMDMxMTAvBgNVBAMMKE1hdHRlciBUZXN0IERB
-QyAwMDIxIE12aWQ6RkZGMiBNcGlkOjgwMDQwWTATBgcqhkjOPQIBBggqhkjOPQMB
-BwNCAAQRHr2Ctqa02cGQwHGYB230EQpOD7gX6gWuxe43hK3pfu9OisH52JOffmPZ
-eQAZ/6ZGZ1lHJXELzWmLu4VNKFx9o2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB
-/wQEAwIHgDAdBgNVHQ4EFgQUxhJQRkw3u9GOOrAdSGC2pMCKuQAwHwYDVR0jBBgw
-FoAUFW7NjBS+gLQQruQCo/IzF+c0BnQwCgYIKoZIzj0EAwIDRwAwRAIgMVHxOktZ
-rOmV1Wo1m6UpX9Qnz3xmLSVC+UVxGwoRsl4CICtbPhvsZd4PBAtA1vWgoxTYHaF6
-nX8v80+VnBE1D80m
+MzQzWhgPOTk5OTEyMzEyMzU5NTlaMEsxHTAbBgNVBAMMFE1hdHRlciBUZXN0IERB
+QyAwMDIxMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQBgqJ8AgIMBDgw
+MDQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS103Em9S5chfaCZF9/PdlvTO2n
+72fZPAoGg06j557zbiUP0wl2s9EZuwmtRiVDiLeErgXzMQChcmDXJ4rnwuCYo2Aw
+XjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUCIT/DSUj
+l3/ZtoAvnn1810AfW/EwHwYDVR0jBBgwFoAUFW7NjBS+gLQQruQCo/IzF+c0BnQw
+CgYIKoZIzj0EAwIDSQAwRgIhAN4DVD0GReGifgW75Ys1Ac8Gp8miCAPJoXt+wuNW
+B6arAiEA4cCUnmpl9gA4j04IvEXeqjKGdTDc1Y8M0OXE5zm8Mug=
 -----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0021-ValInFuture-Key.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0021-ValInFuture-Key.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0021-ValInFuture-Key.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0021-ValInFuture-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINQv/MgSg+W2mSszIULj+jOCyjRBodoDveDXWTqfqWPfoAoGCCqGSM49
-AwEHoUQDQgAEER69gramtNnBkMBxmAdt9BEKTg+4F+oFrsXuN4St6X7vTorB+diT
-n35j2XkAGf+mRmdZRyVxC81pi7uFTShcfQ==
+MHcCAQEEIPNbU+J1ABCpdNUj1CpB6bu5J4yCPd+VvAHDsrAzqziGoAoGCCqGSM49
+AwEHoUQDQgAEtdNxJvUuXIX2gmRffz3Zb0ztp+9n2TwKBoNOo+ee824lD9MJdrPR
+GbsJrUYlQ4i3hK4F8zEAoXJg1yeK58LgmA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0030-Val1SecBefore-Cert.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0030-Val1SecBefore-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0030-Val1SecBefore-Cert.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0030-Val1SecBefore-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBzjCCAXWgAwIBAgIIcJUxyGtpjVowCgYIKoZIzj0EAwIwLjEsMCoGA1UEAwwj
+TWF0dGVyIFRlc3QgUEFJIE12aWQ6RkZGMiBNcGlkOjgwMDQwHhcNMjEwNjI4MTQy
+MzQyWhcNMjIwNjI4MTQyMzQxWjBLMR0wGwYDVQQDDBRNYXR0ZXIgVGVzdCBEQUMg
+MDAzMDEUMBIGCisGAQQBgqJ8AgEMBEZGRjIxFDASBgorBgEEAYKifAICDAQ4MDA0
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEOpUgmL9cJ/GaPSP3uEi6OiMX795H
+WKWD0q+PAjNnPxKtF59lxsi6doo7LE3DIJALUauQjYrD7PBzW5j6z1WyyaNgMF4w
+DAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFLR+qP8uqp4e
+zZY1p+vXZNcJ8EpgMB8GA1UdIwQYMBaAFBVuzYwUvoC0EK7kAqPyMxfnNAZ0MAoG
+CCqGSM49BAMCA0cAMEQCICFXmskjYavoWiSWI64sCoXZJd3YCv+AKskYD6WmswEp
+AiByQiVOtkLdpkJg31suqSIRvYQbi/NRPeYAY6FSWEjKPQ==
+-----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0030-Val1SecBefore-Key.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0030-Val1SecBefore-Key.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0030-Val1SecBefore-Key.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8004-0030-Val1SecBefore-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIBYvXS8SMyA3zYKtg80iu4eAkqsdrZWHrd/BCroyCm2joAoGCCqGSM49
+AwEHoUQDQgAEOpUgmL9cJ/GaPSP3uEi6OiMX795HWKWD0q+PAjNnPxKtF59lxsi6
+doo7LE3DIJALUauQjYrD7PBzW5j6z1WyyQ==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0022-ValInPast-Cert.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0022-ValInPast-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0022-ValInPast-Cert.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0022-ValInPast-Cert.pem
@@ -1,12 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB0DCCAXWgAwIBAgIIFNEnEMzzd/QwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB6DCCAY2gAwIBAgIIBSkCuVFmtjgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDUwHhcNMjEwNjI4MTQyMzQzWhcNMjIwNjI4MTQyMzQyWjAzMTEw
-LwYDVQQDDChNYXR0ZXIgVGVzdCBEQUMgMDAyMiBNdmlkOkZGRjIgTXBpZDo4MDA1
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAERvdMULOvnfeG+cOIL4dfuw/RHR7e
-Yo+od3OexwqRfcIj6N9L2ucDXCnSMF2loJb5gheKk5kxozP3pwWSTDooSaNgMF4w
-DAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFB1YdmsPC9u8
-hQJk2llNvIMw8i+MMB8GA1UdIwQYMBaAFChvMnm+E3duHmi781ZfvxLbqaBJMAoG
-CCqGSM49BAMCA0kAMEYCIQD5I8j01u9JXZ0qMULOfkUJvgsjifPfYVlH1WkYkoMH
-WgIhAJKx5ygA84hufEb8qDcI2eRvcruopxcHdvDJ/b9ELSZy
+gqJ8AgIMBDgwMDUwHhcNMjEwNjI4MTQyMzQzWhcNMjIwNjI4MTQyMzQyWjBLMR0w
+GwYDVQQDDBRNYXR0ZXIgVGVzdCBEQUMgMDAyMjEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIxFDASBgorBgEEAYKifAICDAQ4MDA1MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+QgAEW8nj6u5FH8gYyNJKcas5Sr05S+HfW47a4HKUGJRXJswPDHQv9MsBptucEQ3m
+7Ra84RGSrVV83LF2+K6bUkMTfaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8E
+BAMCB4AwHQYDVR0OBBYEFFPW2+/OyFOvXVhJ7JLoKWqFpcogMB8GA1UdIwQYMBaA
+FNrUZ29QbUVD25R21hhpHGdJco0IMAoGCCqGSM49BAMCA0kAMEYCIQDR6XP/+jr6
+tS62aDJRdC53NEmqH/jXvdAIO4A12JFE9AIhAJTznQpXWbUzVy/rRB26Vp9TtSuj
+mQBsq60Ub04PlaYZ
 -----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0022-ValInPast-Key.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0022-ValInPast-Key.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0022-ValInPast-Key.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0022-ValInPast-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBhWz3O2Imf64t80ybxUBi5t9xfmSRVeGqMxAr3iKLFGoAoGCCqGSM49
-AwEHoUQDQgAERvdMULOvnfeG+cOIL4dfuw/RHR7eYo+od3OexwqRfcIj6N9L2ucD
-XCnSMF2loJb5gheKk5kxozP3pwWSTDooSQ==
+MHcCAQEEINDvoURyhwV7B21J5MsWUVJtTYMLNPSh7XuADTr58pTFoAoGCCqGSM49
+AwEHoUQDQgAEW8nj6u5FH8gYyNJKcas5Sr05S+HfW47a4HKUGJRXJswPDHQv9MsB
+ptucEQ3m7Ra84RGSrVV83LF2+K6bUkMTfQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0023-ValInFuture-Cert.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0023-ValInFuture-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0023-ValInFuture-Cert.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0023-ValInFuture-Cert.pem
@@ -1,12 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB0TCCAXegAwIBAgIIPyT2YBwFtGowCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB6jCCAY+gAwIBAgIIWKeVU4YrDXQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDUwIBcNMzEwNjI4MTQyMzQzWhgPOTk5OTEyMzEyMzU5NTlaMDMx
-MTAvBgNVBAMMKE1hdHRlciBUZXN0IERBQyAwMDIzIE12aWQ6RkZGMiBNcGlkOjgw
-MDUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATaeZIz+cj9alUr+noNkecOwkNd
-MujHQHVxdzJfPLvVvWwCB2RGF4zpWZQT+KWMhK/6uevX/TCLcsHI7cLYmWnoo2Aw
-XjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUJ2ZBbChD
-c66dIiuS3qiTWm++vgMwHwYDVR0jBBgwFoAUvxZ2kFJXJv6TXPXAnni9CWW2H9Yw
-CgYIKoZIzj0EAwIDSAAwRQIhALxXiTqllnc96t7TeDj/dhMmb6VL1hJitgzMNGax
-jjhsAiBR1OCc9bQjB2lzL1ZplvLrGf3rEnGVLlOQrKM8ZFUcrg==
+gqJ8AgIMBDgwMDUwIBcNMzEwNjI4MTQyMzQzWhgPOTk5OTEyMzEyMzU5NTlaMEsx
+HTAbBgNVBAMMFE1hdHRlciBUZXN0IERBQyAwMDIzMRQwEgYKKwYBBAGConwCAQwE
+RkZGMjEUMBIGCisGAQQBgqJ8AgIMBDgwMDUwWTATBgcqhkjOPQIBBggqhkjOPQMB
+BwNCAARh265nHmOBQtO1TQXIhwaFjNR/70sFkafB/R12mc/g3Wsjz2hdy2rGPz1r
+nXv+Wl5ciu9CAMQqUeOIMX2tldRuo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB
+/wQEAwIHgDAdBgNVHQ4EFgQUx2SlaoSgqBaIARZ8apXQnKJTbHYwHwYDVR0jBBgw
+FoAUKTi6x/Yj4YMmQ6Xrdiuv1ApiwCEwCgYIKoZIzj0EAwIDSQAwRgIhAPbFN59P
+3XMZKsMF8QBYx6Mgu+nKYLOR+6YAw/Ika4p8AiEAxbtAXl02zqyERT4fy3bnNA8B
+5HIIapgBMwUNpxlX1Mc=
 -----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0023-ValInFuture-Key.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0023-ValInFuture-Key.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0023-ValInFuture-Key.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0023-ValInFuture-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGPeIDSWWMXFt/4TjTlpETdXcStcG4+5c/M+FfOpC9I3oAoGCCqGSM49
-AwEHoUQDQgAE2nmSM/nI/WpVK/p6DZHnDsJDXTLox0B1cXcyXzy71b1sAgdkRheM
-6VmUE/iljISv+rnr1/0wi3LByO3C2Jlp6A==
+MHcCAQEEIF15CzY6AHeCNREq5dWS6xGqqlyqzmHwwvR+ozuHSQ6/oAoGCCqGSM49
+AwEHoUQDQgAEYduuZx5jgULTtU0FyIcGhYzUf+9LBZGnwf0ddpnP4N1rI89oXctq
+xj89a517/lpeXIrvQgDEKlHjiDF9rZXUbg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0032-Val1SecBefore-Cert.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0032-Val1SecBefore-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0032-Val1SecBefore-Cert.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0032-Val1SecBefore-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5zCCAY2gAwIBAgIIKlyq8F9VyP0wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQB
+gqJ8AgIMBDgwMDUwHhcNMjEwNjI4MTQyMzQyWhcNMjIwNjI4MTQyMzQxWjBLMR0w
+GwYDVQQDDBRNYXR0ZXIgVGVzdCBEQUMgMDAzMjEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIxFDASBgorBgEEAYKifAICDAQ4MDA1MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+QgAEOhzeKi8OIMbPuDtAFqZCohlcTR3DzuJ5vFHKekB39WRfU0XNSJdR8YWAhGTn
+7illsGdycCwabSZWF2zIO7TeLqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8E
+BAMCB4AwHQYDVR0OBBYEFDdqzFyNenXgn+/p2PP15bt5yIcBMB8GA1UdIwQYMBaA
+FLMOkFNCbwINE5EbA8tXjctKq5pSMAoGCCqGSM49BAMCA0gAMEUCIGwE5PKRePao
+uIj0QFBIxsJeN/VCSZgUGH+07TBce/1sAiEAiZLZ5ZH4Hlv+IBB+sKP06XSP04IC
+osWYmOMRBf3NC8E=
+-----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0032-Val1SecBefore-Key.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0032-Val1SecBefore-Key.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0032-Val1SecBefore-Key.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0032-Val1SecBefore-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIX8NHTNz+Kpp5U4FbwPTkdGPC7ECpAgc2dOlBoY22mZoAoGCCqGSM49
+AwEHoUQDQgAEOhzeKi8OIMbPuDtAFqZCohlcTR3DzuJ5vFHKekB39WRfU0XNSJdR
+8YWAhGTn7illsGdycCwabSZWF2zIO7TeLg==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0033-Val1SecBefore-Cert.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0033-Val1SecBefore-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0033-Val1SecBefore-Cert.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0033-Val1SecBefore-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY+gAwIBAgIIASGtWiRWQtQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQB
+gqJ8AgIMBDgwMDUwIBcNMzEwNjI4MTQyMzQyWhgPOTk5OTEyMzEyMzU5NTlaMEsx
+HTAbBgNVBAMMFE1hdHRlciBUZXN0IERBQyAwMDMzMRQwEgYKKwYBBAGConwCAQwE
+RkZGMjEUMBIGCisGAQQBgqJ8AgIMBDgwMDUwWTATBgcqhkjOPQIBBggqhkjOPQMB
+BwNCAARE88T1gl90NXeDhYkq5dCdaG9KXtkqcnTqK6fJXwivyUDmkvJthyNbEnq3
+K08bpsbekHIuDNC212nTyeVZuz0uo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB
+/wQEAwIHgDAdBgNVHQ4EFgQUptIZJ9Vic7MZygRth4J8BjFkxJswHwYDVR0jBBgw
+FoAUKTi6x/Yj4YMmQ6Xrdiuv1ApiwCEwCgYIKoZIzj0EAwIDRwAwRAIgOzoPtRla
+vs8tDrP1drGY0jocZW+HcrePZzs/40zMwrECICgSGWpLLg2ijaTZEFroDEJLRAKm
+2qqDG6UplDfadS+I
+-----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0033-Val1SecBefore-Key.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0033-Val1SecBefore-Key.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0033-Val1SecBefore-Key.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8005-0033-Val1SecBefore-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIBfWM7pU4T89QAw312iP48ZEUim+x+7vAp4Xwtw6/NPRoAoGCCqGSM49
+AwEHoUQDQgAERPPE9YJfdDV3g4WJKuXQnWhvSl7ZKnJ06iunyV8Ir8lA5pLybYcj
+WxJ6tytPG6bG3pByLgzQttdp08nlWbs9Lg==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0024-ValInPast-Cert.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0024-ValInPast-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0024-ValInPast-Cert.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0024-ValInPast-Cert.pem
@@ -1,12 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB0TCCAXegAwIBAgIIC2Df/K/j52IwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB6DCCAY+gAwIBAgIIJfucpmThVeUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDYwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEyMzU5NTlaMDMx
-MTAvBgNVBAMMKE1hdHRlciBUZXN0IERBQyAwMDI0IE12aWQ6RkZGMiBNcGlkOjgw
-MDYwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARWyLSzlDwl/hUDRsmlbdv4opHi
-kRBXw9ByHzYkOlHM4e6DLsivHG9IjYRKRPLb1lEFzB/HFlE3Nbaf5wkFlerco2Aw
-XjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUeM1hUJt2
-duGgQUa1cxM7e6OB8awwHwYDVR0jBBgwFoAUoO1tHhBjbCKAbcvaIWWyGGWAZIgw
-CgYIKoZIzj0EAwIDSAAwRQIhAJ4Kv56AeFodYcUmOsFozMV9ysF5SiJ9Rybc/Zh+
-NwRfAiBcm63vllUiZS9l3SbvFGufWGpaGUd73Np3yMJGOR5/gA==
+gqJ8AgIMBDgwMDYwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEyMzU5NTlaMEsx
+HTAbBgNVBAMMFE1hdHRlciBUZXN0IERBQyAwMDI0MRQwEgYKKwYBBAGConwCAQwE
+RkZGMjEUMBIGCisGAQQBgqJ8AgIMBDgwMDYwWTATBgcqhkjOPQIBBggqhkjOPQMB
+BwNCAATuwO+Qc5LoCOy1Us2590wDnBR7Tw5mDtGeh1eYb0ZFsUm5touSmKy9kkP0
+umpMvIvZKne9g58J9w8RV8gkhvNVo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB
+/wQEAwIHgDAdBgNVHQ4EFgQUPwQXpV/hyKBEyaQDXbswjjXioVowHwYDVR0jBBgw
+FoAUCm+rveJ3/Rn2RlElYpFYrDqzpOIwCgYIKoZIzj0EAwIDRwAwRAIgDYXHr6G7
+1nVDuF3ByMpnT/psZYlxkX19cv+NKScRmaICIHImGvZOBIoNWClvq8IiTqpTyWWn
+up5odhDAlc9gXDd/
 -----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0024-ValInPast-Key.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0024-ValInPast-Key.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0024-ValInPast-Key.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0024-ValInPast-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINTDqdNbGVxGlORCD9x1i0I303XN//Fp5vV7TIVdu1JqoAoGCCqGSM49
-AwEHoUQDQgAEVsi0s5Q8Jf4VA0bJpW3b+KKR4pEQV8PQch82JDpRzOHugy7Irxxv
-SI2ESkTy29ZRBcwfxxZRNzW2n+cJBZXq3A==
+MHcCAQEEILM7HBxvKdqJUEImsjzDbJxGDMRTKPoZ1xCIIcLElo7JoAoGCCqGSM49
+AwEHoUQDQgAE7sDvkHOS6AjstVLNufdMA5wUe08OZg7RnodXmG9GRbFJubaLkpis
+vZJD9LpqTLyL2Sp3vYOfCfcPEVfIJIbzVQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0025-ValInFuture-Cert.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0025-ValInFuture-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0025-ValInFuture-Cert.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0025-ValInFuture-Cert.pem
@@ -1,12 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB0TCCAXegAwIBAgIIa824xHsMph4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB6TCCAY+gAwIBAgIIUALfMudUiqwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDYwIBcNMzEwNjI4MTQyMzQzWhgPOTk5OTEyMzEyMzU5NTlaMDMx
-MTAvBgNVBAMMKE1hdHRlciBUZXN0IERBQyAwMDI1IE12aWQ6RkZGMiBNcGlkOjgw
-MDYwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARiwBrDw1agkONg9EBL5Ee6vckN
-FGKhPL6nuvfQ8p+NXPjoT5QqzFP0+oi+hIWqT3CJ2j2sxFw+QClfcp2CxHbwo2Aw
-XjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUA7ol0c/i
-jNfq3Dli5sXvc9V/x4IwHwYDVR0jBBgwFoAUK3czGkbOw31H9+xqyvLpMhV67Fww
-CgYIKoZIzj0EAwIDSAAwRQIhAKVUBRd0TbVgaffhtIsDfJTtvA2W2c9+gFTNUTVC
-2MljAiBqm4dj7+yTPWoLY40EZwcAjFVfDyVsTCO8i/G8ZqLrmQ==
+gqJ8AgIMBDgwMDYwIBcNMzEwNjI4MTQyMzQzWhgPOTk5OTEyMzEyMzU5NTlaMEsx
+HTAbBgNVBAMMFE1hdHRlciBUZXN0IERBQyAwMDI1MRQwEgYKKwYBBAGConwCAQwE
+RkZGMjEUMBIGCisGAQQBgqJ8AgIMBDgwMDYwWTATBgcqhkjOPQIBBggqhkjOPQMB
+BwNCAAR9XBiDZsT3q77SMrc4+hba9ND+7oVUFs2C3ol4GKEkvVIOLa2n/CYq19CW
+jDOPs1VOWJrscFRszuAJbTyRH/q9o2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB
+/wQEAwIHgDAdBgNVHQ4EFgQU0BrF5hxAAzJkrUXiQoxV/t0Ap/MwHwYDVR0jBBgw
+FoAUPCiG0ChUhwBQL4lL2gmCudlwXrAwCgYIKoZIzj0EAwIDSAAwRQIhAJkWIymc
+hmMEe2kW/qrHCpZmfp5pr+QYBwpbpnJNAxSnAiA5BsgOZpLw55SsfNaP261Js96m
+Ci6mH5v0AnKGJT6cbQ==
 -----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0025-ValInFuture-Key.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0025-ValInFuture-Key.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0025-ValInFuture-Key.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0025-ValInFuture-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAFdMZifi76G2K5MUL1Jep+/1T6xCvi/eqLfePbZeFDIoAoGCCqGSM49
-AwEHoUQDQgAEYsAaw8NWoJDjYPRAS+RHur3JDRRioTy+p7r30PKfjVz46E+UKsxT
-9PqIvoSFqk9wido9rMRcPkApX3KdgsR28A==
+MHcCAQEEIFjoHtXgoHNJwLmE+lGNF+b2+sv3dZ5YSfaPo0z3wZixoAoGCCqGSM49
+AwEHoUQDQgAEfVwYg2bE96u+0jK3OPoW2vTQ/u6FVBbNgt6JeBihJL1SDi2tp/wm
+KtfQlowzj7NVTlia7HBUbM7gCW08kR/6vQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0034-ValInFuture-Cert.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0034-ValInFuture-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0034-ValInFuture-Cert.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0034-ValInFuture-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6jCCAY+gAwIBAgIIUzG5FoUxOAAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQB
+gqJ8AgIMBDgwMDYwIBcNMzEwNjI4MTQyMzQzWhgPOTk5OTEyMzEyMzU5NTlaMEsx
+HTAbBgNVBAMMFE1hdHRlciBUZXN0IERBQyAwMDM0MRQwEgYKKwYBBAGConwCAQwE
+RkZGMjEUMBIGCisGAQQBgqJ8AgIMBDgwMDYwWTATBgcqhkjOPQIBBggqhkjOPQMB
+BwNCAARKyv1JDxOWxwBjY9xV4Zqe1agJwZnZdmaNYSQ3khorORiJxx7CQtZloHiP
+yq0b+4EdLxyf8f/WFpOUCteA9Gc3o2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB
+/wQEAwIHgDAdBgNVHQ4EFgQUUDUfuj+S2wcm113kEwDpmd5NOnowHwYDVR0jBBgw
+FoAUCm+rveJ3/Rn2RlElYpFYrDqzpOIwCgYIKoZIzj0EAwIDSQAwRgIhAMmwKNxf
+9DtgrI6nq5tEJfWYowcHjmXSsAIO4QwgzQKEAiEAurYxb9SofjEY1pWVab+CTf2H
+PW7XEvRhOm+moOXB6z0=
+-----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0034-ValInFuture-Key.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0034-ValInFuture-Key.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0034-ValInFuture-Key.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0034-ValInFuture-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIKB85AfzTKIvP2SQZnb+r5zCprEaSk+BLMkzv8EKIhoroAoGCCqGSM49
+AwEHoUQDQgAESsr9SQ8TlscAY2PcVeGantWoCcGZ2XZmjWEkN5IaKzkYiccewkLW
+ZaB4j8qtG/uBHS8cn/H/1haTlArXgPRnNw==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0035-Val1SecBefore-Cert.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0035-Val1SecBefore-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0035-Val1SecBefore-Cert.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0035-Val1SecBefore-Cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB6DCCAY2gAwIBAgIISXanOQx24nYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQB
+gqJ8AgIMBDgwMDYwHhcNMzEwNjI4MTQyMzQyWhcNMzIwNjI3MTQyMzQxWjBLMR0w
+GwYDVQQDDBRNYXR0ZXIgVGVzdCBEQUMgMDAzNTEUMBIGCisGAQQBgqJ8AgEMBEZG
+RjIxFDASBgorBgEEAYKifAICDAQ4MDA2MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+QgAERJYcrpmZIGzaRqDPJAl5lzK8qNMjFXds3Q7fMVjSGWW3k8XxzsSJcaEKpkxO
+B0BYYoppX+Zufj/fOJ+QYrcdgKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8E
+BAMCB4AwHQYDVR0OBBYEFPLAtodzQ0CFK+sZonuTxKJgWk00MB8GA1UdIwQYMBaA
+FDwohtAoVIcAUC+JS9oJgrnZcF6wMAoGCCqGSM49BAMCA0kAMEYCIQD11/6UAJPM
+G/RoNm2dMyBKHlTAEGmzjoBXXQIqjlXsFgIhAPsT5tZbKhMZOO8OdtlqMShiVa95
+JrRaXn1iH74iLYu5
+-----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0035-Val1SecBefore-Key.der b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0035-Val1SecBefore-Key.der
diff --git a/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0035-Val1SecBefore-Key.pem b/credentials/test/attestation/Chip-Test-DAC-FFF2-8006-0035-Val1SecBefore-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEILYvYU1p1HnE/ElKhV/xszupOFEk1OlVvmQAyXPKYB2YoAoGCCqGSM49
+AwEHoUQDQgAERJYcrpmZIGzaRqDPJAl5lzK8qNMjFXds3Q7fMVjSGWW3k8XxzsSJ
+caEKpkxOB0BYYoppX+Zufj/fOJ+QYrcdgA==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInFuture-Cert.der b/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInFuture-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInFuture-Cert.pem b/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInFuture-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvDCCAWKgAwIBAgIILwpSPtgBR+swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+MIIBvDCCAWKgAwIBAgIIUU31T4F/bycwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMjAeFw0zMTA2Mjgx
 NDIzNDNaFw0zMjA2MjcxNDIzNDJaMDAxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBB
 QTEUMBIGCisGAQQBgqJ8AgEMBEZGRjIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
-AARwez+NgUY9ex20OZ3z8mG7QrBgfvKXiltcpfu2UaKWmP0k295d5IxLgnw8k1Xo
-JNGuKZz7WfaHyskb4oq0+Bojo2YwZDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUacz2/b00Kj0pSJhJMtZ/OyIuJ5owHwYDVR0j
-BBgwFoAUacz2/b00Kj0pSJhJMtZ/OyIuJ5owCgYIKoZIzj0EAwIDSAAwRQIhAJxT
-R/FJl5GMA5p7/AIiHXIFOdqrQk/U5Koyyt/PjSe2AiB0iIyU98MbRza7b9EqXVEg
-fmAGpsmtK5sAG/0C6fc68g==
+AAQjYtkTW7E7w26mNn1LTLN/93IZp/xgOrAGP9ye/8bPC166EyCmbvTjSBvKu+HM
+UlUmt2r79bkb9Swzhg3GXxA5o2YwZDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUfx2q8kSYuYZoDqCPwYkh6EhInRcwHwYDVR0j
+BBgwFoAUfx2q8kSYuYZoDqCPwYkh6EhInRcwCgYIKoZIzj0EAwIDSAAwRQIgbBOM
+5XDzrA1cWOTHigR4go96aos4+W1pA8Irlj2LxRcCIQDje3+2Gvz7UW9rRkf8p/SG
+NbKsuLiNm8I5idctQg3eaw==
 -----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInFuture-Key.der b/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInFuture-Key.der
diff --git a/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInFuture-Key.pem b/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInFuture-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIC7cCynkx/x+B2ANXa98zWF01tBrVX3X8QUhSWF5aOTkoAoGCCqGSM49
-AwEHoUQDQgAEcHs/jYFGPXsdtDmd8/Jhu0KwYH7yl4pbXKX7tlGilpj9JNveXeSM
-S4J8PJNV6CTRrimc+1n2h8rJG+KKtPgaIw==
+MHcCAQEEIJegdWSzD1Rignh4niOaNldwPEryAF6EAoqa/qGmtIO0oAoGCCqGSM49
+AwEHoUQDQgAEI2LZE1uxO8NupjZ9S0yzf/dyGaf8YDqwBj/cnv/GzwteuhMgpm70
+40gbyrvhzFJVJrdq+/W5G/UsM4YNxl8QOQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInPast-Cert.der b/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInPast-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInPast-Cert.pem b/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInPast-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuzCCAWKgAwIBAgIIRbukFq18SzYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+MIIBvDCCAWKgAwIBAgIIAwFMXQkbuSQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMjAeFw0yMTA2Mjgx
 NDIzNDNaFw0yMjA2MjgxNDIzNDJaMDAxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBB
 QTEUMBIGCisGAQQBgqJ8AgEMBEZGRjIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
-AAShzyjrWGCY0fxjT8fS0b+wiWoXJQosc1Md3oywpB04CcT++YlylQdaIgBjpS5M
-X+Jbzf2J6wuSMW0lSBHhkt+Qo2YwZDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUf76mzdbMiyUwwvCOUNvkifH1PbUwHwYDVR0j
-BBgwFoAUf76mzdbMiyUwwvCOUNvkifH1PbUwCgYIKoZIzj0EAwIDRwAwRAIgOB+2
-LyuAf9WvcJ7NN1uBWca9/XdlGydgGCunJeTIznkCIBq738SAY23S/YMezIReJ8p5
-jcXJlhL0BlsVRzV/D5r+
+AAS3ChaWbeRtv7g4oICrIP92kJfHqKAh37RKtoeyBOARLTsQffxqcPdTKIHbdlbU
+kCTiECbFVfuSLYkJzG8MBbHKo2YwZDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUm7KZu6ZJfbWgTh4Yx8IOrsVMQukwHwYDVR0j
+BBgwFoAUm7KZu6ZJfbWgTh4Yx8IOrsVMQukwCgYIKoZIzj0EAwIDSAAwRQIgED1f
+neH8IHXIiGiNf/knk09MXh43Cqmj8tAWJGNqtGECIQCjqZb5p6tl5zLGr4d70sVO
+2GL5RcHKohx+qL0o57dAuQ==
 -----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInPast-Key.der b/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInPast-Key.der
diff --git a/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInPast-Key.pem b/credentials/test/attestation/Chip-Test-PAA-FFF2-ValInPast-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGbeXiLQIML9te6xkt3h9AEpZNlTvBiwN9eMlXMbq1BIoAoGCCqGSM49
-AwEHoUQDQgAEoc8o61hgmNH8Y0/H0tG/sIlqFyUKLHNTHd6MsKQdOAnE/vmJcpUH
-WiIAY6UuTF/iW839iesLkjFtJUgR4ZLfkA==
+MHcCAQEEIIiMH1c3TwPnUYwXGkHEpnTRqXFsVUoKdibGDvVWcCKaoAoGCCqGSM49
+AwEHoUQDQgAEtwoWlm3kbb+4OKCAqyD/dpCXx6igId+0SraHsgTgES07EH38anD3
+UyiB23ZW1JAk4hAmxVX7ki2JCcxvDAWxyg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-Val1SecBefore-Cert.der b/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-Val1SecBefore-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-Val1SecBefore-Cert.pem b/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-Val1SecBefore-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBvTCCAWKgAwIBAgIIHBhDUmdVORwwCgYIKoZIzj0EAwIwGjEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMB4XDTIxMDYyODE0MjM0MloXDTIyMDYyODE0MjM0MVow
+RjEYMBYGA1UEAwwPTWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZG
+MjEUMBIGCisGAQQBgqJ8AgIMBDgwMDUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
+AAQTP99TZEYf8sAr7X+IIFgdssX1aAg8jKNiNhwv93fRP+OAH+fha7jo5qCXJ7Bd
+D1YMWbhG5i3E6PKbhyZB8gzOo2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUsw6QU0JvAg0TkRsDy1eNy0qrmlIwHwYDVR0j
+BBgwFoAUeFznBbhrj05vx5OqYMtD6mlogtUwCgYIKoZIzj0EAwIDSQAwRgIhAMuM
+mTtul5AXHUd1iTlRqurNjmTOlK7YCC5IRUq1kLN4AiEA1M3ylDz8KJgBJLxnINcl
+9C4Mb8tHfZXH3Yz+IH06QHE=
+-----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-Val1SecBefore-Key.der b/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-Val1SecBefore-Key.der
diff --git a/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-Val1SecBefore-Key.pem b/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-Val1SecBefore-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIKbDej+9K9yJQ99Rf3ZrmYI6kYS5ftwLaiMRigDQmZByoAoGCCqGSM49
+AwEHoUQDQgAEEz/fU2RGH/LAK+1/iCBYHbLF9WgIPIyjYjYcL/d30T/jgB/n4Wu4
+6OaglyewXQ9WDFm4RuYtxOjym4cmQfIMzg==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-ValInFuture-Cert.der b/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-ValInFuture-Cert.der
diff --git a/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-ValInFuture-Cert.pem b/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-ValInFuture-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuzCCAWKgAwIBAgIIVyOL6GNKL40wCgYIKoZIzj0EAwIwGjEYMBYGA1UEAwwP
+MIIBvDCCAWKgAwIBAgIITV2py+BlGZswCgYIKoZIzj0EAwIwGjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFBMB4XDTMxMDYyODE0MjM0M1oXDTMyMDYyNzE0MjM0Mlow
 RjEYMBYGA1UEAwwPTWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZG
 MjEUMBIGCisGAQQBgqJ8AgIMBDgwMDUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
-AASGorQryzjephcJ24TBKH8BkjYFUdWEiYKAGqJ1lzGzcwm04pOad8IfGzpLrAUe
-KmRQRRtn+t2sYfjtPcLM9Liao2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUvxZ2kFJXJv6TXPXAnni9CWW2H9YwHwYDVR0j
-BBgwFoAUeFznBbhrj05vx5OqYMtD6mlogtUwCgYIKoZIzj0EAwIDRwAwRAIgXEES
-fS9Rp3vzXjZLIg3DFvXBMM87ruAgfla4QEVt3bICIEUIKMrBrQNRdkhqBmd6XaUW
-rAnLqBTk6i+vNRncTXHO
+AAQZmOkcr3L+Y/MH/eExvWaJquNJAWjowlXrHOksjMUH+DUFkxYzPFjsh2Yxx4LW
+bswLw0QxjDIlK+iPDsdz29Soo2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUKTi6x/Yj4YMmQ6Xrdiuv1ApiwCEwHwYDVR0j
+BBgwFoAUeFznBbhrj05vx5OqYMtD6mlogtUwCgYIKoZIzj0EAwIDSAAwRQIhAOmX
+MnEd8OUVPiDCpm6g3kAV1Z4oROR4xqsRCHDxQM/bAiAMLQQjSHqZQWJGthb24Fo7
+c1Hi6RmnklLtuza9/MJ0pQ==
 -----END CERTIFICATE-----
diff --git a/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-ValInFuture-Key.der b/credentials/test/attestation/Chip-Test-PAI-FFF2-8005-ValInFuture-Key.der