diff --git a/credentials/development/commissioner_dut/invalid_paa/cd.der b/credentials/development/commissioner_dut/invalid_paa/cd.der
index 3db6854627ab38..682967b07a0f9a 100644
Binary files a/credentials/development/commissioner_dut/invalid_paa/cd.der and b/credentials/development/commissioner_dut/invalid_paa/cd.der differ
diff --git a/credentials/development/commissioner_dut/invalid_paa/dac-Cert.der b/credentials/development/commissioner_dut/invalid_paa/dac-Cert.der
index 54646763f78aa9..ffff450b1ebfe6 100644
Binary files a/credentials/development/commissioner_dut/invalid_paa/dac-Cert.der and b/credentials/development/commissioner_dut/invalid_paa/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/invalid_paa/dac-Cert.pem b/credentials/development/commissioner_dut/invalid_paa/dac-Cert.pem
index 2f20de3ef87ed0..42c4d678f2a910 100644
--- a/credentials/development/commissioner_dut/invalid_paa/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/invalid_paa/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIWRRjypC2cxkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMTA2Mjgx
-NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
-REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ1lnUF27XW2SR0MYjYBm2BSgDGS3TT
-bi6A0tsHKjuB/8Y9bU3bAT5+gNnz6IIgXSt3949rRlcN4gN5Sux5Td8Fo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU3JVLDvstIQgd
-qOejQv2K2nz5m2IwHwYDVR0jBBgwFoAU44aqTINKlOXlPPM+5w93H6P7TAAwCgYI
-KoZIzj0EAwIDSAAwRQIhAJbqcL/1bbwLjHtzVz+BIVmUVwq7QXS7A6NsL7CgMiZy
-AiAyLK2B8V7wI2VPppLeWQuZt5Aso89n7+J/gJaIKnBKhw==
+MIIBzTCCAXKgAwIBAgIIVn1n+tVjKSwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAeFw0yMTA2Mjgx
+NDIzNDNaFw0yMjA2MjgxNDIzNDJaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IERB
+QzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQ4MDAwMFkw
+EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEPoTM+2Z6HVYiKQFZExJPhefGLW8Tk6IT
+J/s+TcTW56QlsA3HclCADAepAxG99PcN2Fpw7HaJpFqfBjwb0DUIx6NgMF4wDAYD
+VR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFM1RWIF8uoeYvy1M
+OCNAOniyam4sMB8GA1UdIwQYMBaAFGApn2Q5iX5vSG5fcjfNmKKXrUjhMAoGCCqG
+SM49BAMCA0kAMEYCIQCIoCRun6MxRHcQjWylS+XwhdSSgNxEP+NtcUKzX6dmHwIh
+AN62bVFbEKhePaVm/NrP1oCd+ZaSgdxsGKo6o5fRBZb+
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/invalid_paa/dac-Key.der b/credentials/development/commissioner_dut/invalid_paa/dac-Key.der
index de36dd959b8fd5..56ac2dbb1c658d 100644
Binary files a/credentials/development/commissioner_dut/invalid_paa/dac-Key.der and b/credentials/development/commissioner_dut/invalid_paa/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/invalid_paa/dac-Key.pem b/credentials/development/commissioner_dut/invalid_paa/dac-Key.pem
index 49efe8fff74910..e003d5416f0a00 100644
--- a/credentials/development/commissioner_dut/invalid_paa/dac-Key.pem
+++ b/credentials/development/commissioner_dut/invalid_paa/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJbEKXtKCVCXl0KbWX+6WlxDIcxH649NH1Nm33Prxqs6oAoGCCqGSM49
-AwEHoUQDQgAENZZ1Bdu11tkkdDGI2AZtgUoAxkt0024ugNLbByo7gf/GPW1N2wE+
-foDZ8+iCIF0rd/ePa0ZXDeIDeUrseU3fBQ==
+MHcCAQEEIDmI6v0r142AarwYxJY/kAF1R/Q3m4SGoHoghQ58m5k2oAoGCCqGSM49
+AwEHoUQDQgAEPoTM+2Z6HVYiKQFZExJPhefGLW8Tk6ITJ/s+TcTW56QlsA3HclCA
+DAepAxG99PcN2Fpw7HaJpFqfBjwb0DUIxw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/invalid_paa/paa-Cert.pem b/credentials/development/commissioner_dut/invalid_paa/paa-Cert.pem
index 093bb1080335bc..cdfd7fb8a42a36 100644
--- a/credentials/development/commissioner_dut/invalid_paa/paa-Cert.pem
+++ b/credentials/development/commissioner_dut/invalid_paa/paa-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0DCCAXagAwIBAgIIOOfO8k+viIgwCgYIKoZIzj0EAwIwOTE3MDUGA1UEAwwu
+MIIB0TCCAXagAwIBAgIIKcfrfBp8bhIwCgYIKoZIzj0EAwIwOTE3MDUGA1UEAwwu
 SW52YWxpZCAoTm90IFJlZ2lzdGVyZWQgaW4gdGhlIERDTCkgTWF0dGVyIFBBQTAg
 Fw0yMTA2MjgxNDIzNDNaGA85OTk5MTIzMTIzNTk1OVowOTE3MDUGA1UEAwwuSW52
 YWxpZCAoTm90IFJlZ2lzdGVyZWQgaW4gdGhlIERDTCkgTWF0dGVyIFBBQTBZMBMG
-ByqGSM49AgEGCCqGSM49AwEHA0IABPpJ2vGCmLL490OZuD1htkMjRuSOc5kCb3lx
-bFxwmk66gvXU8Yocg3BvqK+9WWC6JBlgzvviw93276bvpHGpMYajZjBkMBIGA1Ud
-EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQrDv6LP/qE
-lgvYk8SvEXFnR+BIpTAfBgNVHSMEGDAWgBQrDv6LP/qElgvYk8SvEXFnR+BIpTAK
-BggqhkjOPQQDAgNIADBFAiB/D0/Pz+Fz+SU6mNOjvPKcGlZIPe+FRDGI5uqI8rX2
-PwIhAOyShTFQMhNfy+1TnWRbwm/ShROaLr1Zcj7nLRczeGjD
+ByqGSM49AgEGCCqGSM49AwEHA0IABOoFP2NoulFuvRCRHJau3NCvVgHe7P6uyJ5O
+eMDikqnVidhuzQjPvzA5y8AliUEBf5sc3R/TTVwiKAje9CO6wj+jZjBkMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQTWtXG97lc
+Uk80bL8unBJNn71OLTAfBgNVHSMEGDAWgBQTWtXG97lcUk80bL8unBJNn71OLTAK
+BggqhkjOPQQDAgNJADBGAiEAnBLf9DV/FsRQFwaC6JykMrhTGWLhR0meAIKlojWN
+v/wCIQCVWWh0gz9OfvP4Iv+2yZKVGnNs6DaSy3mJ+MnrXm+BSA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/invalid_paa/paa-Key.pem b/credentials/development/commissioner_dut/invalid_paa/paa-Key.pem
index 1f464846ea9e77..bb4879c9c6cee6 100644
--- a/credentials/development/commissioner_dut/invalid_paa/paa-Key.pem
+++ b/credentials/development/commissioner_dut/invalid_paa/paa-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFY+k2145+Tfyl9Stq08M5H+SieAPCwwoOLg1NS8s2TqoAoGCCqGSM49
-AwEHoUQDQgAE+kna8YKYsvj3Q5m4PWG2QyNG5I5zmQJveXFsXHCaTrqC9dTxihyD
-cG+or71ZYLokGWDO++LD3fbvpu+kcakxhg==
+MHcCAQEEILjuGI+5zATSsyVZGKx989HIV45LTSM+NcLUpNmZKrWWoAoGCCqGSM49
+AwEHoUQDQgAE6gU/Y2i6UW69EJEclq7c0K9WAd7s/q7Ink54wOKSqdWJ2G7NCM+/
+MDnLwCWJQQF/mxzdH9NNXCIoCN70I7rCPw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/invalid_paa/pai-Cert.der b/credentials/development/commissioner_dut/invalid_paa/pai-Cert.der
index 28fa817118a07c..649fee8317b935 100644
Binary files a/credentials/development/commissioner_dut/invalid_paa/pai-Cert.der and b/credentials/development/commissioner_dut/invalid_paa/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/invalid_paa/pai-Cert.pem b/credentials/development/commissioner_dut/invalid_paa/pai-Cert.pem
index 7457aeecbade5c..e7b7b9fb6df180 100644
--- a/credentials/development/commissioner_dut/invalid_paa/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/invalid_paa/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByDCCAW2gAwIBAgIIVH5lccL+7gYwCgYIKoZIzj0EAwIwOTE3MDUGA1UEAwwu
-SW52YWxpZCAoTm90IFJlZ2lzdGVyZWQgaW4gdGhlIERDTCkgTWF0dGVyIFBBQTAg
-Fw0yMTA2MjgxNDIzNDNaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0
-dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEG
-CCqGSM49AwEHA0IABJTSFb4sA9AkXurgPmWCT2maCtyOp8AaqS6dlms2IehJKykQ
-j8u1lC4GM1u0iYwhj820yadRtGRmww0cNgjQrQejZjBkMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjhqpMg0qU5eU88z7nD3cf
-o/tMADAfBgNVHSMEGDAWgBQrDv6LP/qElgvYk8SvEXFnR+BIpTAKBggqhkjOPQQD
-AgNJADBGAiEA4CLir/Rmk9mDUS71Jrteov7tCIT9eXrFGUTPkoW+6zcCIQDEhmKi
-4hXiW6WC8eXcUxS6kYvEoAKI+kic9A00szhNkg==
+MIIBxTCCAWugAwIBAgIIeimk5q2MKXkwCgYIKoZIzj0EAwIwOTE3MDUGA1UEAwwu
+SW52YWxpZCAoTm90IFJlZ2lzdGVyZWQgaW4gdGhlIERDTCkgTWF0dGVyIFBBQTAe
+Fw0yMTA2MjgxNDIzNDNaFw0yMjA2MjgxNDIzNDJaMDAxGDAWBgNVBAMMD01hdHRl
+ciBUZXN0IFBBSTEUMBIGCisGAQQBgqJ8AgEMBEZGRjEwWTATBgcqhkjOPQIBBggq
+hkjOPQMBBwNCAARHJi2yODpRwQZMDxn/KBUmqKLTEYbybk6ZQ10A7S2DkYTb+pM7
+tp9dLv7BVVjTUwbZJF6Sb1mmn+MBi7fKY5KPo2YwZDASBgNVHRMBAf8ECDAGAQH/
+AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUYCmfZDmJfm9Ibl9yN82Yopet
+SOEwHwYDVR0jBBgwFoAUE1rVxve5XFJPNGy/LpwSTZ+9Ti0wCgYIKoZIzj0EAwID
+SAAwRQIhAPmlYJVOmLCz/2IRZnJ2ZNaJpB07TNEHw+h6kUWzOEqKAiBYa0rX9MLH
+wzPpzf49NwZdI4y3SY52KeIJZOUB9Ke+6g==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/invalid_paa/pai-Key.der b/credentials/development/commissioner_dut/invalid_paa/pai-Key.der
index 7b7536af4ab365..1324386cac1eb5 100644
Binary files a/credentials/development/commissioner_dut/invalid_paa/pai-Key.der and b/credentials/development/commissioner_dut/invalid_paa/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/invalid_paa/pai-Key.pem b/credentials/development/commissioner_dut/invalid_paa/pai-Key.pem
index d689531cecacbc..e377b3edd15760 100644
--- a/credentials/development/commissioner_dut/invalid_paa/pai-Key.pem
+++ b/credentials/development/commissioner_dut/invalid_paa/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHOVwVthXM49128hkyBUFt/P5rCpOxBikVZ1HyiTyV90oAoGCCqGSM49
-AwEHoUQDQgAElNIVviwD0CRe6uA+ZYJPaZoK3I6nwBqpLp2WazYh6EkrKRCPy7WU
-LgYzW7SJjCGPzbTJp1G0ZGbDDRw2CNCtBw==
+MHcCAQEEIEhpipt3AhHALvb5gHsd3unqjW26R6ONpUdQE26hESmcoAoGCCqGSM49
+AwEHoUQDQgAERyYtsjg6UcEGTA8Z/ygVJqii0xGG8m5OmUNdAO0tg5GE2/qTO7af
+XS7+wVVY01MG2SRekm9Zpp/jAYu3ymOSjw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/invalid_paa/test_case_vector.json b/credentials/development/commissioner_dut/invalid_paa/test_case_vector.json
index 74f9d24fe18c1f..8b504a8a1b8997 100644
--- a/credentials/development/commissioner_dut/invalid_paa/test_case_vector.json
+++ b/credentials/development/commissioner_dut/invalid_paa/test_case_vector.json
@@ -1,9 +1,9 @@
 {
-    "description": "PAI Test Vector: Invalid CMS Signature.",
+    "description": "PAA Test Vector: Use Invalid PAA (Not Registered in the DCL).",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208591463ca90b67319300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3231303632383134323334335a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000435967505dbb5d6d924743188d8066d814a00c64b74d36e2e80d2db072a3b81ffc63d6d4ddb013e7e80d9f3e882205d2b77f78f6b46570de203794aec794ddf05a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414dc954b0efb2d21081da8e7a342fd8ada7cf99b62301f0603551d23041830168014e386aa4c834a94e5e53cf33ee70f771fa3fb4c00300a06082a8648ce3d040302034800304502210096ea70bff56dbc0b8c7b73573f81215994570abb4174bb03a36c2fb0a03226720220322cad81f15ef023654fa692de590b99b7902ca3cf67efe27f8096882a704a87",
-    "pai_cert": "308201c83082016da0030201020208547e6571c2feee06300a06082a8648ce3d04030230393137303506035504030c2e496e76616c696420284e6f74205265676973746572656420696e207468652044434c29204d6174746572205041413020170d3231303632383134323334335a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000494d215be2c03d0245eeae03e65824f699a0adc8ea7c01aa92e9d966b3621e8492b29108fcbb5942e06335bb4898c218fcdb4c9a751b46466c30d1c3608d0ad07a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414e386aa4c834a94e5e53cf33ee70f771fa3fb4c00301f0603551d230418301680142b0efe8b3ffa84960bd893c4af11716747e048a5300a06082a8648ce3d0403020349003046022100e022e2aff46693d983512ef526bb5ea2feed0884fd797ac51944cf9285beeb37022100c48662a2e215e25ba582f1e5dc5314ba918bc4a00288fa489cf40d34b3384d92",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221009537f838ebfd9f8b1f26b4c207098ec082928254e8db72fc32f8a870ef97563a02203c59748c2c49d7222b58088c3689127a2df28aa8ae8320bd3c82fdcf01dd6044",
-    "dac_private_key": "96c4297b4a09509797429b597fba5a5c4321cc47eb8f4d1f5366df73ebc6ab3a",
-    "dac_public_key": "0435967505dbb5d6d924743188d8066d814a00c64b74d36e2e80d2db072a3b81ffc63d6d4ddb013e7e80d9f3e882205d2b77f78f6b46570de203794aec794ddf05"
+    "dac_cert": "308201cd30820172a0030201020208567d67fad563292c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c0446464631301e170d3231303632383134323334335a170d3232303632383134323334325a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043e84ccfb667a1d562229015913124f85e7c62d6f1393a21327fb3e4dc4d6e7a425b00dc77250800c07a90311bdf4f70dd85a70ec7689a45a9f063c1bd03508c7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cd5158817cba8798bf2d4c3823403a78b26a6e2c301f0603551d2304183016801460299f6439897e6f486e5f7237cd98a297ad48e1300a06082a8648ce3d040302034900304602210088a0246e9fa3314477108d6ca54be5f085d49280dc443fe36d7142b35fa7661f022100deb66d515b10a85e3da566fcdacfd6809df9969281dc6c18aa3aa397d10596fe",
+    "pai_cert": "308201c53082016ba00302010202087a29a4e6ad8c2979300a06082a8648ce3d04030230393137303506035504030c2e496e76616c696420284e6f74205265676973746572656420696e207468652044434c29204d617474657220504141301e170d3231303632383134323334335a170d3232303632383134323334325a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000447262db2383a51c1064c0f19ff281526a8a2d31186f26e4e99435d00ed2d839184dbfa933bb69f5d2efec15558d35306d9245e926f59a69fe3018bb7ca63928fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041460299f6439897e6f486e5f7237cd98a297ad48e1301f0603551d23041830168014135ad5c6f7b95c524f346cbf2e9c124d9fbd4e2d300a06082a8648ce3d0403020348003045022100f9a560954e98b0b3ff621166727664d689a41d3b4cd107c3e87a9145b3384a8a0220586b4ad7f4c2c7c333e9cdfe3d37065d238cb7498e7629e20964e501f4a7beea",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402202f6fdf1d3e5587c6e6f4d6f2015b1a2b69a22768efe10bfbbdcc7f7c53e81db202206f4bcc3fead88b2aebb9a1ece815b5f20fee350d96127e77150d9a7b024d073f",
+    "dac_private_key": "3988eafd2bd78d806abc18c4963f90017547f4379b8486a07a20850e7c9b9936",
+    "dac_public_key": "043e84ccfb667a1d562229015913124f85e7c62d6f1393a21327fb3e4dc4d6e7a425b00dc77250800c07a90311bdf4f70dd85a70ec7689a45a9f063c1bd03508c7"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/cd.der
index 759c4d4831647a..aa85ad9bc823cc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.der
index f7d0520d6e3a74..f12610c0c85ac7 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.pem
index ce041492264709..4922885f8b9082 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIcLZzJNOZdCMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIZt+8CJdskb4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-g0oUQN48dQ5KfjCnrEWLpmo1UcClyooPOviF9uWhe6cxm0vc8Rn+x73RoWqMZK/H
-4P1/u5Ud+ailIB5d8vIB/qNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFGED+3fjAwmr7LTg80ALYOmP61vmMB8GA1UdIwQYMBaAFAP3
-VqzDRhOGPY6lPTdia6Ujj3k6MAoGCCqGSM49BAMCA0gAMEUCIQD8dFapxcs/R87W
-Ly+wtW1HC64DNFGJYDu/WKfH2zUZ8gIgRO+864Qo9nq0873KSMJTiV2F7++evnLJ
-FIZTmUWVfhI=
+GPPxm9HHZthfxvP4Z3Oxs6JFxJKPsks0MClMfT9Dwmhmta7qx328isAHGVrA/6Z0
+EuY1dKNw7AJKvspfMKpJ+qNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFMFUzLci/xvJ7Z+Rqll+selwOescMB8GA1UdIwQYMBaAFAwF
+J8QDxt4Qpf3lxSG7vtTw+IcyMAoGCCqGSM49BAMCA0kAMEYCIQClWYxGqLmZHVxI
+gDDrbY5rvGlZd0usCDgGTSh8wcvkhQIhALvHup71R5hfSVb4plusun5uvWMX6tZe
+9ZeEiU5E2AnA
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.der
index 1ce770fdc4c4e3..11fa8b10b56259 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.pem
index 535c8d58d43078..2028d5578c7a71 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFkRqEET0o9sXIm7H1mDIguJ8pU1aBeFRnf9fOz+NCV9oAoGCCqGSM49
-AwEHoUQDQgAEg0oUQN48dQ5KfjCnrEWLpmo1UcClyooPOviF9uWhe6cxm0vc8Rn+
-x73RoWqMZK/H4P1/u5Ud+ailIB5d8vIB/g==
+MHcCAQEEIBDunHlJ/wEYuRD9iNY8kPIQA8y0zlvytRNvSlGKjr63oAoGCCqGSM49
+AwEHoUQDQgAEGPPxm9HHZthfxvP4Z3Oxs6JFxJKPsks0MClMfT9Dwmhmta7qx328
+isAHGVrA/6Z0EuY1dKNw7AJKvspfMKpJ+g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.der
index 018f8de165c3fb..72ef7eef9ac55c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.pem
index cd401e341c001a..152684a13ca29c 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIfm3eggiakfswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIXL/zkSiDR+8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ5F4O2t1nOj7D+y56ZmTGRT2AQB16P
-87gexd0Xog3M8bnsZ4mINkMpk3p+sN4MTm/0W71rrfuunZ4NKJKy9QFVo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUA/dW
-rMNGE4Y9jqU9N2JrpSOPeTowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgT4guacQ825+4Eht8Bopviywsn7bgTV8TkRdq
-mWbqmlUCID/7eYXyV5NlttSvDE0CpSVUInH6RcTRAgGm7g7BLSYw
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASzYIFCg1IOy5+5xAV4CikwvHuDOuQQ
+arEln8bRd8VO311HJcMOQA9ULKhl9/LXSzFeD/e0OAQPdf4RKBQsa8Pao2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUDAUn
+xAPG3hCl/eXFIbu+1PD4hzIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAKujz1s4X6cF/x4rSaBn1hQMWReX+t/YgV5S
+kYp3sJxDAiEAlDSxkCxDBsEwAiQVLPBPVtNTvG15UwBaXt+a/vlBZPc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.der
index dea4c2eadf0a64..a423976c3dde78 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.pem
index 7e6ddfc73ee476..1fbdf43a402620 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFb8ZQbqebrWSCzBU2Yqw80UDKEtesajUfT9Pnzk20v4oAoGCCqGSM49
-AwEHoUQDQgAEOReDtrdZzo+w/suemZkxkU9gEAdej/O4HsXdF6INzPG57GeJiDZD
-KZN6frDeDE5v9Fu9a637rp2eDSiSsvUBVQ==
+MHcCAQEEIAQasOuc3Rq1n4/KbWuMbx2J0IT1opsVohbO+S+PRx3WoAoGCCqGSM49
+AwEHoUQDQgAEs2CBQoNSDsufucQFeAopMLx7gzrkEGqxJZ/G0XfFTt9dRyXDDkAP
+VCyoZffy10sxXg/3tDgED3X+ESgULGvD2g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/test_case_vector.json
index 6ec5be0b5e483b..df138046c675f3 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains one valid PAA which is authorized to sign the PAI.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020870b67324d3997423300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004834a1440de3c750e4a7e30a7ac458ba66a3551c0a5ca8a0f3af885f6e5a17ba7319b4bdcf119fec7bdd1a16a8c64afc7e0fd7fbb951df9a8a5201e5df2f201fea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146103fb77e30309abecb4e0f3400b60e98feb5be6301f0603551d2304183016801403f756acc34613863d8ea53d37626ba5238f793a300a06082a8648ce3d0403020348003045022100fc7456a9c5cb3f47ced62f2fb0b56d470bae03345189603bbf58a7c7db3519f2022044efbceb8428f67ab4f3bdca48c253895d85efef9ebe72c91486539945957e12",
-    "pai_cert": "308201d33082017aa00302010202087e6dde82089a91fb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004391783b6b759ce8fb0fecb9e999931914f6010075e8ff3b81ec5dd17a20dccf1b9ec678988364329937a7eb0de0c4e6ff45bbd6badfbae9d9e0d2892b2f50155a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041403f756acc34613863d8ea53d37626ba5238f793a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402204f882e69c43cdb9fb8121b7c068a6f8b2c2c9fb6e04d5f1391176a9966ea9a5502203ffb7985f2579365b6d4af0c4d02a525542271fa45c4d10201a6ee0ec12d2630",
-    "certification_declaration": "3081ec06092a864886f70d010702a081de3081db020103310d300b0609608648016503040201304806092a864886f70d010701a03b0439152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b1818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ac7febbe34655cf6e060681f2a5d178a6af556f0a00dca2e6a599cac1228149f02205c9f189911266e8d5d695c7499411dcf11249ff5e99483b293d8b44bd8cf8d62",
-    "dac_private_key": "5911a84113d28f6c5c89bb1f5983220b89f295356817854677fd7cecfe34257d",
-    "dac_public_key": "04834a1440de3c750e4a7e30a7ac458ba66a3551c0a5ca8a0f3af885f6e5a17ba7319b4bdcf119fec7bdd1a16a8c64afc7e0fd7fbb951df9a8a5201e5df2f201fe"
+    "dac_cert": "308201e53082018aa003020102020866dfbc08976c91be300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000418f3f19bd1c766d85fc6f3f86773b1b3a245c4928fb24b3430294c7d3f43c26866b5aeeac77dbc8ac007195ac0ffa67412e63574a370ec024abeca5f30aa49faa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c154ccb722ff1bc9ed9f91aa597eb1e97039eb1c301f0603551d230418301680140c0527c403c6de10a5fde5c521bbbed4f0f88732300a06082a8648ce3d0403020349003046022100a5598c46a8b9991d5c488030eb6d8e6bbc6959774bac0838064d287cc1cbe485022100bbc7ba9ef547985f4956f8a65bacba7e6ebd6317ead65ef59784894e44d809c0",
+    "pai_cert": "308201d53082017aa00302010202085cbff391288347ef300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b360814283520ecb9fb9c405780a2930bc7b833ae4106ab1259fc6d177c54edf5d4725c30e400f542ca865f7f2d74b315e0ff7b438040f75fe1128142c6bc3daa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604140c0527c403c6de10a5fde5c521bbbed4f0f88732301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100aba3cf5b385fa705ff1e2b49a067d6140c591797fadfd8815e52918a77b09c430221009434b1902c4306c1300224152cf04f56d353bc6d7953005a5edf9afef94164f7",
+    "certification_declaration": "3081ec06092a864886f70d010702a081de3081db020103310d300b0609608648016503040201304806092a864886f70d010701a03b0439152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b1818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203e95e0d9d4324d9fdbb38d6880285888828427759c03b8763bda4e43953fd290022100e030484f70e8f937175c28d1ce575bd612251a4b1d83a0365a2374c613933487",
+    "dac_private_key": "10ee9c7949ff0118b910fd88d63c90f21003ccb4ce5bf2b5136f4a518a8ebeb7",
+    "dac_public_key": "0418f3f19bd1c766d85fc6f3f86773b1b3a245c4928fb24b3430294c7d3f43c26866b5aeeac77dbc8ac007195ac0ffa67412e63574a370ec024abeca5f30aa49fa"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/cd.der
index c3116108b0690b..e6ba0b3b994e1d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.der
index 6f03a61d232230..d6f7a634aa62bc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.pem
index 45e6467e389bd2..031dba1d44d911 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIJkiozFuUL3IwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIYZ2XtSqb2LUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-mxN0vKmsU7qcBagXWnfg2sR/vqQuA+6ZaqBJrENuJiuDArPL0e33yF98NsMrtM/f
-+Kz/MkHaqUUbCMe3tVuCL6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFL04t1SWDjUexyYsYRmD4EajIGFwMB8GA1UdIwQYMBaAFEMY
-UYctih1brnzQCdqMXlEWJasMMAoGCCqGSM49BAMCA0gAMEUCIGaMB4BA4nmD97ao
-DmZM2A0UqAzg2FBds/6vXgy3qnXQAiEAlqh3AxC4C056hmt6mxtWWLWEu0CX5lRo
-MZE6F0le1O0=
+RO5j6ud+UUt08WoP/AVvXMfhW1C+NvqCD1PI+dtV86v2Oi2egBKUuohWqjuKiQMx
+Box+kSkAaZUfyLeHj2iaz6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFIPRrGmEV+ggDGQ/faxlQWTmsMZ2MB8GA1UdIwQYMBaAFEpd
+LGMErAwug3WVUGR9jS9FyysUMAoGCCqGSM49BAMCA0gAMEUCICSEtHXn2zvDWxVv
+tNSYf8qFIvSuKsQCm6KgdEHZ4iBzAiEAto1lb4sH2wgIbynRompTs0RnZ/eXu4sa
+vvXvGIQu6Qc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.der
index 877687b8370ff4..6b3acd53a94912 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.pem
index 3bc99e8168c416..809220358231f7 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAnMbelVOLMHAACTmra3m8jYftyJhnbH6LrMPykmwaX+oAoGCCqGSM49
-AwEHoUQDQgAEmxN0vKmsU7qcBagXWnfg2sR/vqQuA+6ZaqBJrENuJiuDArPL0e33
-yF98NsMrtM/f+Kz/MkHaqUUbCMe3tVuCLw==
+MHcCAQEEICwxtmASMM25JCSW94JeKEdfK6jcCAwWmLp9R4EbIXQwoAoGCCqGSM49
+AwEHoUQDQgAERO5j6ud+UUt08WoP/AVvXMfhW1C+NvqCD1PI+dtV86v2Oi2egBKU
+uohWqjuKiQMxBox+kSkAaZUfyLeHj2iazw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.der
index 08b98b81e8bfca..e3f9feedcd2409 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.pem
index 75555dd9a97e10..1982edc6fa3482 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIf1AvR3iy3tYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIB56T0HUw2/QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT3Jlc/ZGIrAMBtuRLOdBRSsyRTAwZN
-fEEO37ddScPSdG9f6vfGwUJlIXdUmQQuLvN5wRKBDfx0P2BtX/y/q8vbo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQxhR
-hy2KHVuufNAJ2oxeURYlqwwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAKm9CD49W72/2y39hPw4OzMSUQOddX07hmrM
-waB8U5xPAiEAskxvUHLcjNQ1SKXLjWC+w+MtIDcYX4SBDOwFyCo33zw=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR6cPmvcLub8rMC7L0O+GGT6/7RE2u2
+KpsRV5Kit/mrCpIP+o5/9fiKTfvyEcWgzwjXJlvDUTqr3yJCDN9JGPBeo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUSl0s
+YwSsDC6DdZVQZH2NL0XLKxQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKz9bpqxw1bmU59SCOYUZie+VvgM7U+zkhfi
+j7fCPQ9cAiAhS3XWGA1iyNSv19Mr6XayD8xAwbNil2tbpl2xOh2WIw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.der
index 9542b60f4c1717..53803c2cf687bf 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.pem
index 0cc03441af7ec6..3ef79dc4e839a3 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGzo+oDDHVQ3GJHFdznjt8c1iNl5QeRHj3cslvxbHVG8oAoGCCqGSM49
-AwEHoUQDQgAE9yZXP2RiKwDAbbkSznQUUrMkUwMGTXxBDt+3XUnD0nRvX+r3xsFC
-ZSF3VJkELi7zecESgQ38dD9gbV/8v6vL2w==
+MHcCAQEEIIK5TsjjrGaL0ICV4hf+whx8VIbJ8k8X1sXQnOtsSSBuoAoGCCqGSM49
+AwEHoUQDQgAEenD5r3C7m/KzAuy9Dvhhk+v+0RNrtiqbEVeSorf5qwqSD/qOf/X4
+ik378hHFoM8I1yZbw1E6q98iQgzfSRjwXg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/test_case_vector.json
index eb2f4511ee8308..f88b7b80090cb7 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains ten PAAs none of which is a valid PAA authorized to sign the PAI.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202082648a8cc5b942f72300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049b1374bca9ac53ba9c05a8175a77e0dac47fbea42e03ee996aa049ac436e262b8302b3cbd1edf7c85f7c36c32bb4cfdff8acff3241daa9451b08c7b7b55b822fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bd38b754960e351ec7262c611983e046a3206170301f0603551d23041830168014431851872d8a1d5bae7cd009da8c5e511625ab0c300a06082a8648ce3d04030203480030450220668c078040e27983f7b6a80e664cd80d14a80ce0d8505db3feaf5e0cb7aa75d002210096a8770310b80b4e7a866b7a9b1b5658b584bb4097e6546831913a17495ed4ed",
-    "pai_cert": "308201d53082017aa00302010202087f502f4778b2ded6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f726573f64622b00c06db912ce741452b3245303064d7c410edfb75d49c3d2746f5feaf7c6c1426521775499042e2ef379c112810dfc743f606d5ffcbfabcbdba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414431851872d8a1d5bae7cd009da8c5e511625ab0c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a9bd083e3d5bbdbfdb2dfd84fc383b331251039d757d3b866accc1a07c539c4f022100b24c6f5072dc8cd43548a5cb8d60bec3e32d2037185f84810cec05c82a37df3c",
-    "certification_declaration": "308201d106092a864886f70d010702a08201c2308201be020103310d300b06096086480165030402013082012806092a864886f70d010701a082011904820115152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe662010140bbbcabbc5016577aa8b44ffb90fcca140fe662010140bbb35bbc5016577aa8b44ffb90fcca140fe662010140bbb3544c5016577aa8b44ffb90fcca140fe662010140bbb35443a016577aa8b44ffb90fcca140fe662010140bbb35443afe6577aa8b44ffb90fcca140fe662010140bbb35443afe9a77aa8b44ffb90fcca140fe662010140bbb35443afe9a88aa8b44ffb90fcca140fe662010140bbb35443afe9a88558b44ffb90fcca140fe662010140bbb35443afe9a88557444ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221008ab7808cc2dce431af11785256dc9ed4cee7e365a6d8420ae344784da981fee60221008c2c865c2ca2a6e8304f3138ef7d88f9cf365552c64841113cc2fc33acf73664",
-    "dac_private_key": "09cc6de95538b3070000939ab6b79bc8d87edc898676c7e8bacc3f2926c1a5fe",
-    "dac_public_key": "049b1374bca9ac53ba9c05a8175a77e0dac47fbea42e03ee996aa049ac436e262b8302b3cbd1edf7c85f7c36c32bb4cfdff8acff3241daa9451b08c7b7b55b822f"
+    "dac_cert": "308201e43082018aa0030201020208619d97b52a9bd8b5300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000444ee63eae77e514b74f16a0ffc056f5cc7e15b50be36fa820f53c8f9db55f3abf63a2d9e801294ba8856aa3b8a890331068c7e91290069951fc8b7878f689acfa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041483d1ac698457e8200c643f7dac654164e6b0c676301f0603551d230418301680144a5d2c6304ac0c2e83759550647d8d2f45cb2b14300a06082a8648ce3d040302034800304502202484b475e7db3bc35b156fb4d4987fca8522f4ae2ac4029ba2a07441d9e22073022100b68d656f8b07db08086f29d1a26a53b3446767f797bb8b1abef5ef18842ee907",
+    "pai_cert": "308201d43082017aa0030201020208079e93d07530dbf4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047a70f9af70bb9bf2b302ecbd0ef86193ebfed1136bb62a9b115792a2b7f9ab0a920ffa8e7ff5f88a4dfbf211c5a0cf08d7265bc3513aabdf22420cdf4918f05ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144a5d2c6304ac0c2e83759550647d8d2f45cb2b14301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100acfd6e9ab1c356e6539f5208e6146627be56f80ced4fb39217e28fb7c23d0f5c0220214b75d6180d62c8d4afd7d32be976b20fcc40c1b362976b5ba65db13a1d9623",
+    "certification_declaration": "308201d006092a864886f70d010702a08201c1308201bd020103310d300b06096086480165030402013082012806092a864886f70d010701a082011904820115152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe662010140bbbcabbc5016577aa8b44ffb90fcca140fe662010140bbb35bbc5016577aa8b44ffb90fcca140fe662010140bbb3544c5016577aa8b44ffb90fcca140fe662010140bbb35443a016577aa8b44ffb90fcca140fe662010140bbb35443afe6577aa8b44ffb90fcca140fe662010140bbb35443afe9a77aa8b44ffb90fcca140fe662010140bbb35443afe9a88aa8b44ffb90fcca140fe662010140bbb35443afe9a88558b44ffb90fcca140fe662010140bbb35443afe9a88557444ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203d4581e769a71482498f4fe9df315e486ed838951af4aad8fa94dd8ef5bf3c63022100f24ac406238eb617e7a9c18b16938bfd4540a7aa106486d37468fc3b411855e3",
+    "dac_private_key": "2c31b6601230cdb9242496f7825e28475f2ba8dc080c1698ba7d47811b217430",
+    "dac_public_key": "0444ee63eae77e514b74f16a0ffc056f5cc7e15b50be36fa820f53c8f9db55f3abf63a2d9e801294ba8856aa3b8a890331068c7e91290069951fc8b7878f689acf"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/cd.der
index b3be1d20332fbe..8e15b9745384cc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.der
index ecfe041e9ce2ef..4ce72a5d961723 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.pem
index 42ac79bfdc2e06..9363fbdec6b9fe 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIGwYoGLddI3gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIFkwOdAykWCQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-asounqdQYyOLLe653F55bFxU2Rs0CrhvxquBOIlSG1c6P15BMa98ZExcurwBAKiI
-RKtLDas3kQla3ebE/ziGMKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFNyVXVNU/7SrmL/1sBeuNCAFH1OuMB8GA1UdIwQYMBaAFDjx
-ejkWk5X+4iCiapW4PkrgoXZUMAoGCCqGSM49BAMCA0gAMEUCIQCaHamOREc88xXS
-ucpwomQoPku6amSfyst2ASlIWF9JpgIgPGOZrEfpnQAAkg9cAyQr0TuyrXx+SxNu
-jwMUL7ZJf+s=
+Y6/3Wb3a7jD0W1tKSG1Pn7Mt5MaYcgBU0+lTM6bXHfsZ5AoE9cXrSlNQkOEC3wbi
+ro4CBmvAhoKfKJzJ87eRWqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFFabw72ZfcaCwccUFXwTlxCjh3bqMB8GA1UdIwQYMBaAFAen
+EKD/E9AN9jqeXIMlF0xfCMjQMAoGCCqGSM49BAMCA0gAMEUCIDo+ZGXyy2azph4r
+SkTPSkCE9KvHapdHHj/7REzPHzJGAiEA8eXLfwcapSIxpL2u4wnqM3K5iHWRDqFK
+7fdq0/ZyG8k=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.der
index 80a7841b794306..af7bf5377e0dd4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.pem
index 7eacf5cae37525..bf6203d2154211 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMZh9j4K3pmHFph6KBPoxvXP7h/tL6d2IdmtwAmc8eEmoAoGCCqGSM49
-AwEHoUQDQgAEasounqdQYyOLLe653F55bFxU2Rs0CrhvxquBOIlSG1c6P15BMa98
-ZExcurwBAKiIRKtLDas3kQla3ebE/ziGMA==
+MHcCAQEEIGompmOzYgQR5aCVXaTBBYVndvEtDPZXZaJzi0VMeudRoAoGCCqGSM49
+AwEHoUQDQgAEY6/3Wb3a7jD0W1tKSG1Pn7Mt5MaYcgBU0+lTM6bXHfsZ5AoE9cXr
+SlNQkOEC3wbiro4CBmvAhoKfKJzJ87eRWg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.der
index 7b029ad62996c8..ced741700c6dd3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.pem
index 3b7ef508178c0a..b3edc0010bad55 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIdNV0SXUqsWUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIT+rsmjfJOY4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASwumg2OCld9yDbJh2rgqFdc20k9Obo
-82OHGpAhiXDPKbMMuXrTjORqSrBs+XvR25OICM0mL8x23c73eUPhbGsCo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUOPF6
-ORaTlf7iIKJqlbg+SuChdlQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAOVfkkfMBn+SJ0M00z2eTgg+V9UyseH5rIN/
-cb9mACX4AiB6uPa2jrf8dYHrcoWl0z+RZfvRi+n7M/7uCxEPMThoXA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQULDHrwpo9a7BKGO8sxudkhjT9v507
+sskaU3mbn0WEVttkNymX/hcn7pXpWiOCwLQGbi352+94gp0rW22OeioWo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUB6cQ
+oP8T0A32Op5cgyUXTF8IyNAwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgfnXKvifeALsYSYPKVENBbnl2wd5fi4qC33BE
+Q3PULLUCIHekOvcuMg/HTcHXaoWdEMcAsv/lpJ7C0jdT8nvX8Zs0
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.der
index 33664539bc8228..3ffcc1be6765f2 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.pem
index 6f196115947b52..0c4eb1953096e3 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGMQaXPIOBP5k/xhKd8u+HFxtnlqWKDNQlL7TAGEmOSkoAoGCCqGSM49
-AwEHoUQDQgAEsLpoNjgpXfcg2yYdq4KhXXNtJPTm6PNjhxqQIYlwzymzDLl604zk
-akqwbPl70duTiAjNJi/Mdt3O93lD4WxrAg==
+MHcCAQEEIMDFE2W5NG2xilBluTVzmKlNe8Xlp+nXyaMgXuAkuDFpoAoGCCqGSM49
+AwEHoUQDQgAEFCwx68KaPWuwShjvLMbnZIY0/b+dO7LJGlN5m59FhFbbZDcpl/4X
+J+6V6VojgsC0Bm4t+dvveIKdK1ttjnoqFg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/test_case_vector.json
index 0aa6e96b81f893..679398c44cbc1e 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains ten PAAs one of which is valid PAA authorized to sign the PAI.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa00302010202081b062818b75d2378300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200046aca2e9ea75063238b2deeb9dc5e796c5c54d91b340ab86fc6ab813889521b573a3f5e4131af7c644c5cbabc0100a88844ab4b0dab3791095adde6c4ff388630a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414dc955d5354ffb4ab98bff5b017ae3420051f53ae301f0603551d2304183016801438f17a39169395fee220a26a95b83e4ae0a17654300a06082a8648ce3d04030203480030450221009a1da98e44473cf315d2b9ca70a264283e4bba6a649fcacb76012948585f49a602203c6399ac47e99d0000920f5c03242bd13bb2ad7c7e4b136e8f03142fb6497feb",
-    "pai_cert": "308201d43082017aa003020102020874d57449752ab165300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b0ba683638295df720db261dab82a15d736d24f4e6e8f363871a90218970cf29b30cb97ad38ce46a4ab06cf97bd1db938808cd262fcc76ddcef77943e16c6b02a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041438f17a39169395fee220a26a95b83e4ae0a17654301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100e55f9247cc067f92274334d33d9e4e083e57d532b1e1f9ac837f71bf660025f802207ab8f6b68eb7fc7581eb7285a5d33f9165fbd18be9fb33feee0b110f3138685c",
-    "certification_declaration": "308201d106092a864886f70d010702a08201c2308201be020103310d300b06096086480165030402013082012806092a864886f70d010701a082011904820115152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1014f4bbcabbc5016577aa8b44ffb90fcca140fe66201014f4bb35bbc5016577aa8b44ffb90fcca140fe66201014f4bb3544c5016577aa8b44ffb90fcca140fe66201014f4bb35443a016577aa8b44ffb90fcca140fe66201014f4bb35443afe6577aa8b44ffb90fcca140fe66201014f4bb35443afe9a77aa8b44ffb90fcca140fe66201014f4bb35443afe9a88aa8b44ffb90fcca140fe66201014f4bb35443afe9a88558b44ffb90fcca140fe66201014f4bb35443afe9a88557444ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100baa33a2b9363fc16483e5f87830d96871af61d38c87fd3ce3ecbee6d43ff15d80221009192020c3c7f82959208b73f84e2808240436d55c4ab2549e63ae06e86398263",
-    "dac_private_key": "c661f63e0ade998716987a2813e8c6f5cfee1fed2fa77621d9adc0099cf1e126",
-    "dac_public_key": "046aca2e9ea75063238b2deeb9dc5e796c5c54d91b340ab86fc6ab813889521b573a3f5e4131af7c644c5cbabc0100a88844ab4b0dab3791095adde6c4ff388630"
+    "dac_cert": "308201e43082018aa0030201020208164c0e740ca45824300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000463aff759bddaee30f45b5b4a486d4f9fb32de4c698720054d3e95333a6d71dfb19e40a04f5c5eb4a535090e102df06e2ae8e02066bc086829f289cc9f3b7915aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414569bc3bd997dc682c1c714157c139710a38776ea301f0603551d2304183016801407a710a0ff13d00df63a9e5c8325174c5f08c8d0300a06082a8648ce3d040302034800304502203a3e6465f2cb66b3a61e2b4a44cf4a4084f4abc76a97471e3ffb444ccf1f3246022100f1e5cb7f071aa52231a4bdaee309ea3372b98875910ea14aedf76ad3f6721bc9",
+    "pai_cert": "308201d33082017aa00302010202084feaec9a37c9398e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004142c31ebc29a3d6bb04a18ef2cc6e7648634fdbf9d3bb2c91a53799b9f458456db64372997fe1727ee95e95a2382c0b4066e2df9dbef78829d2b5b6d8e7a2a16a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041407a710a0ff13d00df63a9e5c8325174c5f08c8d0301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207e75cabe27de00bb184983ca5443416e7976c1de5f8b8a82df70444373d42cb5022077a43af72e320fc74dc1d76a859d10c700b2ffe5a49ec2d23753f27bd7f19b34",
+    "certification_declaration": "308201d006092a864886f70d010702a08201c1308201bd020103310d300b06096086480165030402013082012806092a864886f70d010701a082011904820115152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1014f4bbcabbc5016577aa8b44ffb90fcca140fe66201014f4bb35bbc5016577aa8b44ffb90fcca140fe66201014f4bb3544c5016577aa8b44ffb90fcca140fe66201014f4bb35443a016577aa8b44ffb90fcca140fe66201014f4bb35443afe6577aa8b44ffb90fcca140fe66201014f4bb35443afe9a77aa8b44ffb90fcca140fe66201014f4bb35443afe9a88aa8b44ffb90fcca140fe66201014f4bb35443afe9a88558b44ffb90fcca140fe66201014f4bb35443afe9a88557444ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201b10656798c6360de20e30e2ebd93fa776f78eb347bc178b92064470080cd972022100e6c798a2c4dd0486b927c99d40c9a01994fd8f5000037c26e5f2bf5f3492192e",
+    "dac_private_key": "6a26a663b3620411e5a0955da4c105856776f12d0cf65765a2738b454c7ae751",
+    "dac_public_key": "0463aff759bddaee30f45b5b4a486d4f9fb32de4c698720054d3e95333a6d71dfb19e40a04f5c5eb4a535090e102df06e2ae8e02066bc086829f289cc9f3b7915a"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/cd.der
index 6758e5ba4a4b58..bbef56b4509fe7 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.der
index 1469ca3bd71475..acb44ccb15df3d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.pem
index 329f4f5da8d068..d95bd03c625443 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIdNmZKNQCYWMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIDlFGxf5HugowCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-lHyn6BTU7jJky1sXvayobEIIC/UifDpDSEYyUMwrp4sxC5VjDwid/BvCIs3WRjdC
-SXsgDrGgrsfXiqu8QGo44KNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFBsbwvK0M49z3l/ILHy6l1xWZXu2MB8GA1UdIwQYMBaAFLOt
-0tb0sCTx9ppthyk4NdEN9j7cMAoGCCqGSM49BAMCA0gAMEUCIQC6jg4+m1bf6rH6
-tuILqO93F5X6GgEub9/N1duj8IzOCgIgFuaU5SSNhorqYtIaCAttCzbB9IWSxaaR
-XVdYjkS4Wmo=
+RH7/bFefPruAFIhuzSAx7SsiR2mGw11ds/FRb4M1qnhenl1bixul8K7jzz3Nn4T1
+Qx9rrioVoge0qB+wVApQ0KNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFMVEdexC+De3sR0YYjbGMpYHxcI/MB8GA1UdIwQYMBaAFApi
+C42eG42my28isnWkZOS0GTixMAoGCCqGSM49BAMCA0kAMEYCIQDexWklK83mL/k3
+8+tcMSxDfMHK13NrFFzFxV9+S+ssDgIhANedum7TscOVb291nyDxRyQV0JW+9Tq2
+XLoLPHQ9Fwmh
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.der
index 44083ab6aa3e50..aaed1b318ad364 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.pem
index 5d9a7ccfb3126e..026ee761ddc0ae 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMdUQLHKR6+i9GH0z3rYMW/9Uefw2XaJkkg5Be7zQim0oAoGCCqGSM49
-AwEHoUQDQgAElHyn6BTU7jJky1sXvayobEIIC/UifDpDSEYyUMwrp4sxC5VjDwid
-/BvCIs3WRjdCSXsgDrGgrsfXiqu8QGo44A==
+MHcCAQEEIPDHCAwHapCY/zcPsZR11KsGY6hY4BI6Wh0ex5Mh4A49oAoGCCqGSM49
+AwEHoUQDQgAERH7/bFefPruAFIhuzSAx7SsiR2mGw11ds/FRb4M1qnhenl1bixul
+8K7jzz3Nn4T1Qx9rrioVoge0qB+wVApQ0A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.der
index a8356045568dbc..50b6b70be125bd 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.pem
index b1550bc01f8c02..1004350697c9d3 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIVFUGBqrBvmkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIKkdKUbukHqEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATPAnkb0YNM15fIozq9uwwGUp1AVGup
-uyzZvnaIN+8b1L0yDOEd6bQODl41GffzTTF9bCGjN8zYIcPgIggHj3Yfo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUs63S
-1vSwJPH2mm2HKTg10Q32PtwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgNyhN/2mcUHnb8ME/zxVPTc733OR+med1DFcN
-xlWA4d0CIQCdSjpjOOpbNP3xCM5j67A+OIni7i1+F/9yrqA7crvMKA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQg/ZY+5cipeMW48r3nJiJ5v1UXI0+T
+5t3tPCO69OU8+4hq2DqCoHkbrUNNDXJWOBW6uaCkj78VSJdwznetq7oxo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUCmIL
+jZ4bjabLbyKydaRk5LQZOLEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAKhZB1rIdGHuqt5SOD2NQE9/LtQdC/NTXyKm
+cMe/OTtzAiEA6L42i0APasQG4Dw6hfkxOeBlMrI+hUe2euNQme9A+0g=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.der
index 0340c6532e8d89..14c1ac1d66ec89 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.pem
index e07394adadbf38..80572b65d3c5af 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKuVA2YM5OftMZgGQvN4E4ij1ibTiWtiMhMrd56pBmrIoAoGCCqGSM49
-AwEHoUQDQgAEzwJ5G9GDTNeXyKM6vbsMBlKdQFRrqbss2b52iDfvG9S9MgzhHem0
-Dg5eNRn3800xfWwhozfM2CHD4CIIB492Hw==
+MHcCAQEEIMizvPpB96V5rXUN+c2vtebe+zoffCqy3MWbP4uQHLbVoAoGCCqGSM49
+AwEHoUQDQgAEIP2WPuXIqXjFuPK95yYieb9VFyNPk+bd7TwjuvTlPPuIatg6gqB5
+G61DTQ1yVjgVurmgpI+/FUiXcM53rau6MQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/test_case_vector.json
index 0b2ce1a0a4d1db..87dca92b8aaf4f 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains one valid PAA which is authorized to sign the PAI.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa003020102020874d99928d4026163300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004947ca7e814d4ee3264cb5b17bdaca86c42080bf5227c3a4348463250cc2ba78b310b95630f089dfc1bc222cdd6463742497b200eb1a0aec7d78aabbc406a38e0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141b1bc2f2b4338f73de5fc82c7cba975c56657bb6301f0603551d23041830168014b3add2d6f4b024f1f69a6d87293835d10df63edc300a06082a8648ce3d0403020348003045022100ba8e0e3e9b56dfeab1fab6e20ba8ef771795fa1a012e6fdfcdd5dba3f08cce0a022016e694e5248d868aea62d21a080b6d0b36c1f48592c5a6915d57588e44b85a6a",
-    "pai_cert": "308201d43082017aa003020102020854550606aac1be69300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004cf02791bd1834cd797c8a33abdbb0c06529d40546ba9bb2cd9be768837ef1bd4bd320ce11de9b40e0e5e3519f7f34d317d6c21a337ccd821c3e02208078f761fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b3add2d6f4b024f1f69a6d87293835d10df63edc301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022037284dff699c5079dbf0c13fcf154f4dcef7dce47e99e7750c570dc65580e1dd0221009d4a3a6338ea5b34fdf108ce63ebb03e3889e2ee2d7e17ff72aea03b72bbcc28",
-    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022053886321101af891530f5961c3fe0ed2ea65806aa7301f8b8e0a5f863bbd82d6022055fd216de9938a02f50eefadbce6a7fdb6d2d98aff506c26d56035e6f0412961",
-    "dac_private_key": "c75440b1ca47afa2f461f4cf7ad8316ffd51e7f0d9768992483905eef34229b4",
-    "dac_public_key": "04947ca7e814d4ee3264cb5b17bdaca86c42080bf5227c3a4348463250cc2ba78b310b95630f089dfc1bc222cdd6463742497b200eb1a0aec7d78aabbc406a38e0"
+    "dac_cert": "308201e53082018aa00302010202080e5146c5fe47ba0a300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004447eff6c579f3ebb8014886ecd2031ed2b22476986c35d5db3f1516f8335aa785e9e5d5b8b1ba5f0aee3cf3dcd9f84f5431f6bae2a15a207b4a81fb0540a50d0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c54475ec42f837b7b11d186236c6329607c5c23f301f0603551d230418301680140a620b8d9e1b8da6cb6f22b275a464e4b41938b1300a06082a8648ce3d0403020349003046022100dec569252bcde62ff937f3eb5c312c437cc1cad7736b145cc5c55f7e4beb2c0e022100d79dba6ed3b1c3956f6f759f20f1472415d095bef53ab65cba0b3c743d1709a1",
+    "pai_cert": "308201d53082017aa00302010202082a474a51bba41ea1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000420fd963ee5c8a978c5b8f2bde7262279bf5517234f93e6dded3c23baf4e53cfb886ad83a82a0791bad434d0d72563815bab9a0a48fbf15489770ce77adabba31a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604140a620b8d9e1b8da6cb6f22b275a464e4b41938b1301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a859075ac87461eeaade52383d8d404f7f2ed41d0bf3535f22a670c7bf393b73022100e8be368b400f6ac406e03c3a85f93139e06532b23e8547b67ae35099ef40fb48",
+    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100bac36c9f830bcbd49e07dd670d042df0eaa4ae1cf5308d39434fb0e7851402e902210087e279dc232a5eb68c74f19aec946ad988edfc35ac4a420cce36a1ec49c76d50",
+    "dac_private_key": "f0c7080c076a9098ff370fb19475d4ab0663a858e0123a5a1d1ec79321e00e3d",
+    "dac_public_key": "04447eff6c579f3ebb8014886ecd2031ed2b22476986c35d5db3f1516f8335aa785e9e5d5b8b1ba5f0aee3cf3dcd9f84f5431f6bae2a15a207b4a81fb0540a50d0"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/cd.der
index 51b636e02e717d..7d94808d48dd8d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.der
index 94a0484251ccf7..748b2c70b75523 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.pem
index 9a85744620b91e..3dd7ddbbf97823 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIEqLB8RL8he0wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIILwNIS+wJQ9owCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-/vL1pWtjv89pKsbhAj3BEHHomk/jeepQcgdRmtDdgJsF8ZdxDuoNOdpF7E8No2/k
-VJP0wxqsgztHQc1XQstJgaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFFQfDidKime/iDRWT009y7kiMlWpMB8GA1UdIwQYMBaAFOWm
-UOmP0w+x9KIGN/qpz3cWvF1rMAoGCCqGSM49BAMCA0cAMEQCIE6H581SftxXACyp
-MevqOJgUJOvhmX31nnHt9HLeCF0HAiBJcCaBucV/7Qw6OKA9ejcOGG8lpDbTsNxa
-RMu3QKlHrA==
+LIeAT1zK1HmzqpODd6VKvfaJxzCV+DjL9D2p3qkiLp28wzWtccUXVmHCFgSrmHxZ
+A6Xb2LDEyiUQTll202yToqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFLWp1Q0h+Vb+NlRERuFX41YmOj2AMB8GA1UdIwQYMBaAFFvs
+JHii2kAYNaCBXLRlasS5KwrnMAoGCCqGSM49BAMCA0cAMEQCIBc04RTm9q4sfJCz
+rF90+yl6Nk/Ycb8f9NPngIinecTxAiBJmdrx8CozE1WgW7TXmmKScmuQ+kSO3hsN
+BSyj4K8dzg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.der
index 0d63b533f37ae2..6153cb38b7f2fe 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.pem
index db4f2ef457bda3..48bd20b381fbfc 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILJiPTolwyBDRdvTBoKGknmKNzQ+8HRE+d2uNx1TK9vooAoGCCqGSM49
-AwEHoUQDQgAE/vL1pWtjv89pKsbhAj3BEHHomk/jeepQcgdRmtDdgJsF8ZdxDuoN
-OdpF7E8No2/kVJP0wxqsgztHQc1XQstJgQ==
+MHcCAQEEIEYPIV3s26+uzxmnMEi8ixqw2m8mCt1n12M4qW9+iYiboAoGCCqGSM49
+AwEHoUQDQgAELIeAT1zK1HmzqpODd6VKvfaJxzCV+DjL9D2p3qkiLp28wzWtccUX
+VmHCFgSrmHxZA6Xb2LDEyiUQTll202yTog==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.der
index de9186d59137a3..0266db37a5918b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.pem
index 0b722cb8cc6d1c..c1e0b0b4fc8785 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIINySEY6V9jJQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIRmNHIQanYEQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAShS1YELdTRR6aI8ILwK6J1Ig2j6e+U
-P9pszA1GqsWFRCmUkWI93scA+K+L1Mcq5xbdNTSTKRHWzFLK4Z2NiONXo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU5aZQ
-6Y/TD7H0ogY3+qnPdxa8XWswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgIlVmQEYxbcmHHnuOIVjZnVqcM6sJ8vGp1t7t
-kzyLLMQCIC5kD2Xy7w9Vl7zg3PxH8KDQtlBydUL9I5sHgZwlHBRS
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4bg2mr5SSF/+N8yVzNuoGIcpTzFLk
+SiJwQeMt1XoTue5o8z4wwTGG0SMvD0TwsAS2/S2VMWXoQ2CKXFdQ8t7jo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUW+wk
+eKLaQBg1oIFctGVqxLkrCucwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgHDJFoOp0PZIrvT+wSWpKGHaUH7vdvtDT8aC2
+EGVamzwCIQCGQbW+hWY3Oeg1b6/MIFdHXCfOw3Qm4ucEF/af/mc7dA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.der
index c78a2f5a000891..48924c5340e166 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.pem
index 98e744ec036073..a729db66043cb7 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILiTIVBw+tq0rUz4BJ3fub+81Lz/kety3w6Q+Vg5Wn6eoAoGCCqGSM49
-AwEHoUQDQgAEoUtWBC3U0UemiPCC8CuidSINo+nvlD/abMwNRqrFhUQplJFiPd7H
-APivi9THKucW3TU0kykR1sxSyuGdjYjjVw==
+MHcCAQEEICOelniU9z60Lvpsqf2XsH0dqGhR1LuTJNG3Z5yX51yJoAoGCCqGSM49
+AwEHoUQDQgAEuG4Npq+Ukhf/jfMlczbqBiHKU8xS5EoicEHjLdV6E7nuaPM+MMEx
+htEjLw9E8LAEtv0tlTFl6ENgilxXUPLe4w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/test_case_vector.json
index 3d1a5c9897d1c1..6572e21fc6a121 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count2_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains two PAAs one of which is valid PAA authorized to sign the PAI.",
     "is_success_case": "true",
-    "dac_cert": "308201e33082018aa003020102020812a2c1f112fc85ed300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fef2f5a56b63bfcf692ac6e1023dc11071e89a4fe379ea507207519ad0dd809b05f197710eea0d39da45ec4f0da36fe45493f4c31aac833b4741cd5742cb4981a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414541f0e274a8a67bf8834564f4d3dcbb9223255a9301f0603551d23041830168014e5a650e98fd30fb1f4a20637faa9cf7716bc5d6b300a06082a8648ce3d040302034700304402204e87e7cd527edc57002ca931ebea38981424ebe1997df59e71edf472de085d07022049702681b9c57fed0c3a38a03d7a370e186f25a436d3b0dc5a44cbb740a947ac",
-    "pai_cert": "308201d33082017aa003020102020837248463a57d8c94300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a14b56042dd4d147a688f082f02ba275220da3e9ef943fda6ccc0d46aac58544299491623ddec700f8af8bd4c72ae716dd3534932911d6cc52cae19d8d88e357a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414e5a650e98fd30fb1f4a20637faa9cf7716bc5d6b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402202255664046316dc9871e7b8e2158d99d5a9c33ab09f2f1a9d6deed933c8b2cc402202e640f65f2ef0f5597bce0dcfc47f0a0d0b650727542fd239b07819c251c1452",
-    "certification_declaration": "3082011906092a864886f70d010702a082010a30820106020103310d300b0609608648016503040201307406092a864886f70d010701a0670465152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1014f4bbcabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402205036c90aca5885fda4fc51c7c5a0069dd87fba06a991877e30ea9713a63e092e02200d6fb45b507cb0f841146c6729484a284dc69003572da46dd8f16841d473787c",
-    "dac_private_key": "b2623d3a25c3204345dbd306828692798a37343ef07444f9ddae371d532bdbe8",
-    "dac_public_key": "04fef2f5a56b63bfcf692ac6e1023dc11071e89a4fe379ea507207519ad0dd809b05f197710eea0d39da45ec4f0da36fe45493f4c31aac833b4741cd5742cb4981"
+    "dac_cert": "308201e33082018aa00302010202082f03484bec0943da300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042c87804f5ccad479b3aa938377a54abdf689c73095f838cbf43da9dea9222e9dbcc335ad71c5175661c21604ab987c5903a5dbd8b0c4ca25104e5976d36c93a2a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b5a9d50d21f956fe36544446e157e356263a3d80301f0603551d230418301680145bec2478a2da401835a0815cb4656ac4b92b0ae7300a06082a8648ce3d040302034700304402201734e114e6f6ae2c7c90b3ac5f74fb297a364fd871bf1ff4d3e78088a779c4f102204999daf1f02a331355a05bb4d79a6292726b90fa448ede1b0d052ca3e0af1dce",
+    "pai_cert": "308201d43082017aa00302010202084663472106a76044300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b86e0da6af949217ff8df3257336ea0621ca53cc52e44a227041e32dd57a13b9ee68f33e30c13186d1232f0f44f0b004b6fd2d953165e843608a5c5750f2dee3a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145bec2478a2da401835a0815cb4656ac4b92b0ae7301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502201c3245a0ea743d922bbd3fb0496a4a1876941fbbddbed0d3f1a0b610655a9b3c0221008641b5be85663739e8356fafcc2057475c27cec37426e2e70417f69ffe673b74",
+    "certification_declaration": "3082011b06092a864886f70d010702a082010c30820108020103310d300b0609608648016503040201307406092a864886f70d010701a0670465152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10146afd22771f511fecbf1641976710dcdc31a1717e1014f4bbcabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b47d3b1973b72fd8be80ded8c656a3adbb98928c0d4d8f9a0bcd864a68a49d66022100de3806359f877fb51ab36e3620f873bfa07da372bc71c9d1f1407a84da6996d2",
+    "dac_private_key": "460f215decdbafaecf19a73048bc8b1ab0da6f260add67d76338a96f7e89889b",
+    "dac_public_key": "042c87804f5ccad479b3aa938377a54abdf689c73095f838cbf43da9dea9222e9dbcc335ad71c5175661c21604ab987c5903a5dbd8b0c4ca25104e5976d36c93a2"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/cd.der
index a477e606641e75..ac69db96ece1ab 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.der
index 40edf75a96fce2..3db8feb0096af4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.pem
index d536d0db77a540..081be0b2f79b70 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIPc6myJwo42YwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIXcs72/0xhJkwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-T0Uq1XUb2c4R91QlOxAV/f/Lad48pl8YZis8uy3R+o9PGYRiFUNR4+cINucG/ES2
-KxT1+rHI78vi++0us+EyFqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFNrZJxnzoqTOUQ07CMuwURsbREuxMB8GA1UdIwQYMBaAFHiI
-2HASDYJpr38+BN84oUvjspuyMAoGCCqGSM49BAMCA0gAMEUCIQDfo0nO4Lgd3riJ
-1hsiDi1ZOtUdZY/5pDKMD2U/MmsSxQIgdtAqUu5s3VDRxZ3MKHE3Q1OobYVodSw7
-vTZu3NDEAtY=
++l5dBP3wvYQmSV4759psmoO5UIpx9BT9QUUb3N3oaTCoX2Tt0KTsZuzZ6lC7Lh9a
+zZ8DsbjyxC5xCIazj0MtGKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFON47SMroNynzlQfhJG/IXyh1nQtMB8GA1UdIwQYMBaAFAV9
+wJeGktIpy2znMtv4NW/8/T7+MAoGCCqGSM49BAMCA0kAMEYCIQD/1l4bfDUq07Xb
+E3cMVSm4t6ZpNkKAHwe5K0nZVwCsdgIhAMIb9ZYXtEQxXfvTSzW7jrbPvLt94mgh
+DUv2nBVgl8EI
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.der
index cecf91fde03161..5b0a87ca03cf49 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.pem
index 479fdc9222cedb..c1dbc2bff6300b 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPxcpKYFQTEZ8UzNlCXx+870QFIP/aUYay7WxJ5FzmC5oAoGCCqGSM49
-AwEHoUQDQgAET0Uq1XUb2c4R91QlOxAV/f/Lad48pl8YZis8uy3R+o9PGYRiFUNR
-4+cINucG/ES2KxT1+rHI78vi++0us+EyFg==
+MHcCAQEEIM7RrgVlToJXY7CE08qDmyikchQRjAIPLW97CIooF5QxoAoGCCqGSM49
+AwEHoUQDQgAE+l5dBP3wvYQmSV4759psmoO5UIpx9BT9QUUb3N3oaTCoX2Tt0KTs
+ZuzZ6lC7Lh9azZ8DsbjyxC5xCIazj0MtGA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.der
index 4e4f027c0f1bb9..166fdc70fe0693 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.pem
index d0b72754cfea94..4251f9b19464af 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIILq0G3MIkSIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIEu3mLMhtOSwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARJaQB6ThZZCGIy2p5vR+jyRCuzephg
-KDnrNJfW9vqJefwEunRnqboNullf43KxMkMT4yw3ReyfscspUSjCk4z7o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUeIjY
-cBINgmmvfz4E3zihS+Oym7IwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgCq3FrHs6ULv732atHLbE2fxm39c30YQtR53B
-asvqPiwCIQCgBVl8I5hWFZnLrjX+8+Ov5qReAKt5rCsiUM+dZQLYvQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQWGCC92pX3EeD+3TqNBg8nPDb5oD/3
+sQX/lvp+ffCy+VH4Ai+GlXD84hnI8+RmiButiYtiZaj4osbFv/MGdhtxo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUBX3A
+l4aS0inLbOcy2/g1b/z9Pv4wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKy2mFsTLRGSn3iziGi+i3uQrHP9J7ZRkwaG
+tELUyRpqAiAcxLVPdTcDvP42608pjLGItKiBS0T6hy0FhMz7RkmziQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.der
index 72f1df7459e1c3..b5a543870aea03 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.pem
index 948ce8981bc8c2..3cfbe78ba6df20 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGzfCxVa9BuJYacxJz6fwz8ApySjzWW+JJ2hI8p6l33uoAoGCCqGSM49
-AwEHoUQDQgAESWkAek4WWQhiMtqeb0fo8kQrs3qYYCg56zSX1vb6iXn8BLp0Z6m6
-DbpZX+NysTJDE+MsN0Xsn7HLKVEowpOM+w==
+MHcCAQEEIKOMYO1X7hW93jvEwy39I7VCpzlZndjbvDH2KURG19auoAoGCCqGSM49
+AwEHoUQDQgAEFhggvdqV9xHg/t06jQYPJzw2+aA/97EF/5b6fn3wsvlR+AIvhpVw
+/OIZyPPkZogbrYmLYmWo+KLGxb/zBnYbcQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/test_case_vector.json
index bf7755519e58cb..633ca150855dec 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The authorized_paa_list contains three PAAs none of which is a valid PAA authorized to sign the PAI.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202083dcea6c89c28e366300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044f452ad5751bd9ce11f754253b1015fdffcb69de3ca65f18662b3cbb2dd1fa8f4f198462154351e3e70836e706fc44b62b14f5fab1c8efcbe2fbed2eb3e13216a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414dad92719f3a2a4ce510d3b08cbb0511b1b444bb1301f0603551d230418301680147888d870120d8269af7f3e04df38a14be3b29bb2300a06082a8648ce3d0403020348003045022100dfa349cee0b81ddeb889d61b220e2d593ad51d658ff9a4328c0f653f326b12c5022076d02a52ee6cdd50d1c59dcc2871374353a86d8568752c3bbd366edcd0c402d6",
-    "pai_cert": "308201d43082017aa003020102020820bab41b73089122300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044969007a4e1659086232da9e6f47e8f2442bb37a98602839eb3497d6f6fa8979fc04ba7467a9ba0dba595fe372b1324313e32c3745ec9fb1cb295128c2938cfba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147888d870120d8269af7f3e04df38a14be3b29bb2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502200aadc5ac7b3a50bbfbdf66ad1cb6c4d9fc66dfd737d1842d479dc16acbea3e2c022100a005597c2398561599cbae35fef3e3afe6a45e00ab79ac2b2250cf9d6502d8bd",
-    "certification_declaration": "3082013106092a864886f70d010702a08201223082011e020103310d300b060960864801650304020130818a06092a864886f70d010701a07d047b152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe662010140bbbcabbc5016577aa8b44ffb90fcca140fe662010140bbb35bbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502200377dd745c729b6785752d4c5ac1ca068a920c32e04c6f9973ea0da636f3b51a022100cc0699fd6c9a999ecf37dfb23b6c32fb339c802725b0dac9fb83205f5280495d",
-    "dac_private_key": "fc5ca4a605413119f14ccd9425f1fbcef440520ffda5186b2ed6c49e45ce60b9",
-    "dac_public_key": "044f452ad5751bd9ce11f754253b1015fdffcb69de3ca65f18662b3cbb2dd1fa8f4f198462154351e3e70836e706fc44b62b14f5fab1c8efcbe2fbed2eb3e13216"
+    "dac_cert": "308201e53082018aa00302010202085dcb3bdbfd318499300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fa5e5d04fdf0bd8426495e3be7da6c9a83b9508a71f414fd41451bdcdde86930a85f64edd0a4ec66ecd9ea50bb2e1f5acd9f03b1b8f2c42e710886b38f432d18a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e378ed232ba0dca7ce541f8491bf217ca1d6742d301f0603551d23041830168014057dc0978692d229cb6ce732dbf8356ffcfd3efe300a06082a8648ce3d0403020349003046022100ffd65e1b7c352ad3b5db13770c5529b8b7a6693642801f07b92b49d95700ac76022100c21bf59617b444315dfbd34b35bb8eb6cfbcbb7de268210d4bf69c156097c108",
+    "pai_cert": "308201d43082017aa003020102020812ede62cc86d392c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004161820bdda95f711e0fedd3a8d060f273c36f9a03ff7b105ff96fa7e7df0b2f951f8022f869570fce219c8f3e466881bad898b6265a8f8a2c6c5bff306761b71a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414057dc0978692d229cb6ce732dbf8356ffcfd3efe301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100acb6985b132d11929f78b38868be8b7b90ac73fd27b651930686b442d4c91a6a02201cc4b54f753703bcfe36eb4f298cb188b4a8814b44fa872d0584ccfb4649b389",
+    "certification_declaration": "3082013106092a864886f70d010702a08201223082011e020103310d300b060960864801650304020130818a06092a864886f70d010701a07d047b152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe662010140bbbcabbc5016577aa8b44ffb90fcca140fe662010140bbb35bbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221009358856426dce2550347c9c5f52c0c028193de36adeaa73afc14708e01805be302206c29d9e9926df3f0dca2e794d6a1fc5de880e94626b7be1edfcae8996af22479",
+    "dac_private_key": "ced1ae05654e825763b084d3ca839b28a47214118c020f2d6f7b088a28179431",
+    "dac_public_key": "04fa5e5d04fdf0bd8426495e3be7da6c9a83b9508a71f414fd41451bdcdde86930a85f64edd0a4ec66ecd9ea50bb2e1f5acd9f03b1b8f2c42e710886b38f432d18"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/cd.der
index 18d86ba6227c5e..170e9ff9a5c5fb 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.der
index f0416ff4c47830..f813f825c879b7 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.pem
index 241f043561e42e..aa79be95d1a757 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIQms4STrnqFwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIa5JpMH7CLxYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-2MCKse/tfP/MOznSBNh+4DenB1/AKV1qdaZ1vXbXn2RgdSHD6GsiTpY590BE8/A+
-o4m2AGIDO2mpXbXU/3v9h6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFDVaPUbefo+lauAtnQ6tcRtD/dzmMB8GA1UdIwQYMBaAFCcw
-uzWh3CQmeYS3Wy4L4a97bUaSMAoGCCqGSM49BAMCA0gAMEUCIQDDYRdEg603p8Wm
-8pggq8r0JiogV3U4SJtbqX0UzM/Y7gIgcYcP7Zhn+CjPAcW1+vlZq8vCf/nf7Zm1
-2C5mQkC2FVM=
+Yk3A9iJ0FJrwIeStB6RWNa7tdv9FbYN0cxUd5l7SF4lilo+OlEpJb4azMABkrjLU
+CDpfyNMlNv6DY5s8iEruuqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFBswRKvgiOo6pW21stZsWgV+j7UiMB8GA1UdIwQYMBaAFPDt
+MQapO4QgKNqyM6c7eWkxUpMEMAoGCCqGSM49BAMCA0kAMEYCIQC0hWyfDs3jVy6A
+en/8oJjP0h6AiTnkOIDXp/PtoomH2QIhANhl4jsS6DWzhhni/KuR7cRvXW/3uKfP
++Y+uTM8Gapzu
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.der
index bd16bf21401e82..920c80bbb1e266 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.pem
index 4aeca65160ba9b..fff5ab4db37f66 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIbh0k5+GXFxBkaqq4PzltZ+bSHSbxxj0rhmenAAcu+noAoGCCqGSM49
-AwEHoUQDQgAE2MCKse/tfP/MOznSBNh+4DenB1/AKV1qdaZ1vXbXn2RgdSHD6Gsi
-TpY590BE8/A+o4m2AGIDO2mpXbXU/3v9hw==
+MHcCAQEEIBbiR9fywNMHvCcIrEEn2oEqlgXWAnokHvRskySlD8kToAoGCCqGSM49
+AwEHoUQDQgAEYk3A9iJ0FJrwIeStB6RWNa7tdv9FbYN0cxUd5l7SF4lilo+OlEpJ
+b4azMABkrjLUCDpfyNMlNv6DY5s8iEruug==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.der
index 473ddc2de96095..91737b36299c8e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.pem
index b0a5b7d4225757..0720a059eeec04 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIfhvC58nKbpIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIRz34gDce0lUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATJ4KsdXFk8NKBg1zXjp9kW2o4Ugeam
-1SQMYuCASZPSi2sBkkogReIc9DV+plFZQpe5sV1tZnmWYTl58idyvUwto2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUJzC7
-NaHcJCZ5hLdbLgvhr3ttRpIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhALLLvlnzzRN+4lPsiq0/N6Fx0NEGVgWdfLZ9
-czBFe7erAiEAhlcXJnkOSU9MHjGg5pNJmt3Rs3WfnIXW4WbRQk7hUX4=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR8gpTKo4RxbCI1+o5iA67oJnzZercj
+I0pm3dzvmtz++aNBsA+5IfhmyRI4HCoZ/iQdbwZeO/OlrQrhedEGAX2Fo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU8O0x
+Bqk7hCAo2rIzpzt5aTFSkwQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKDoliqIkB4qrBuluwTYeplH6naD7DM545Rp
++IuhyDX3AiAckprud+SMWs5KdhC/UmUy+Oq2etGSfRnpaufqDj4FQQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.der
index 5c427c2beeb768..f05829675f9632 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.pem
index b58d82a6650237..c6159adcc28174 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMJmNbGya4KPkWptWQV2pCpaoJTgb+BsKr1A0J4dKqzNoAoGCCqGSM49
-AwEHoUQDQgAEyeCrHVxZPDSgYNc146fZFtqOFIHmptUkDGLggEmT0otrAZJKIEXi
-HPQ1fqZRWUKXubFdbWZ5lmE5efIncr1MLQ==
+MHcCAQEEINlMQcXJqM2qmUpzSbwVwwbNOtyzMK03BD76HYhXfw2CoAoGCCqGSM49
+AwEHoUQDQgAEfIKUyqOEcWwiNfqOYgOu6CZ82Xq3IyNKZt3c75rc/vmjQbAPuSH4
+ZskSOBwqGf4kHW8GXjvzpa0K4XnRBgF9hQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/test_case_vector.json
index e8815b2d57bc0a..1ac95989ce5e59 100644
--- a/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The optional authorized_paa_list field is not present.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa0030201020208426b38493ae7a85c300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d8c08ab1efed7cffcc3b39d204d87ee037a7075fc0295d6a75a675bd76d79f64607521c3e86b224e9639f74044f3f03ea389b60062033b69a95db5d4ff7bfd87a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414355a3d46de7e8fa56ae02d9d0ead711b43fddce6301f0603551d230418301680142730bb35a1dc24267984b75b2e0be1af7b6d4692300a06082a8648ce3d0403020348003045022100c361174483ad37a7c5a6f29820abcaf4262a20577538489b5ba97d14cccfd8ee022071870fed9867f828cf01c5b5faf959abcbc27ff9dfed99b5d82e664240b61553",
-    "pai_cert": "308201d53082017aa00302010202087e1bc2e7c9ca6e92300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c9e0ab1d5c593c34a060d735e3a7d916da8e1481e6a6d5240c62e0804993d28b6b01924a2045e21cf4357ea651594297b9b15d6d667996613979f22772bd4c2da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604142730bb35a1dc24267984b75b2e0be1af7b6d4692301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b2cbbe59f3cd137ee253ec8aad3f37a171d0d10656059d7cb67d7330457bb7ab02210086571726790e494f4c1e31a0e693499addd1b3759f9c85d6e166d1424ee1517e",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220600400539d3b287082cddc61d39be3800027d7abdf6ca1a3ace28b405117dab3022100c43de458625e47d3f8e878335ebc4609023d0496d8e26989c20fc3f3eed72ac9",
-    "dac_private_key": "86e1d24e7e1971710646aaab83f396d67e6d21d26f1c63d2b8667a700072efa7",
-    "dac_public_key": "04d8c08ab1efed7cffcc3b39d204d87ee037a7075fc0295d6a75a675bd76d79f64607521c3e86b224e9639f74044f3f03ea389b60062033b69a95db5d4ff7bfd87"
+    "dac_cert": "308201e53082018aa00302010202086b9269307ec22f16300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004624dc0f62274149af021e4ad07a45635aeed76ff456d837473151de65ed2178962968f8e944a496f86b3300064ae32d4083a5fc8d32536fe83639b3c884aeebaa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141b3044abe088ea3aa56db5b2d66c5a057e8fb522301f0603551d23041830168014f0ed3106a93b842028dab233a73b796931529304300a06082a8648ce3d0403020349003046022100b4856c9f0ecde3572e807a7ffca098cfd21e808939e43880d7a7f3eda28987d9022100d865e23b12e835b38619e2fcab91edc46f5d6ff7b8a7cff98fae4ccf066a9cee",
+    "pai_cert": "308201d43082017aa0030201020208473df880371ed255300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047c8294caa384716c2235fa8e6203aee8267cd97ab723234a66dddcef9adcfef9a341b00fb921f866c912381c2a19fe241d6f065e3bf3a5ad0ae179d106017d85a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f0ed3106a93b842028dab233a73b796931529304301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a0e8962a88901e2aac1ba5bb04d87a9947ea7683ec3339e39469f88ba1c835f702201c929aee77e48c5ace4a7610bf526532f8eab67ad1927d19e96ae7ea0e3e0541",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220763d8156ca34e8b88c06570e73192f4a424eb7db57cddae2fcc88b3921b57364022100ceb7da4b891c5044ac391fa251f093a6488164ffa745397005ba36a935121457",
+    "dac_private_key": "16e247d7f2c0d307bc2708ac4127da812a9605d6027a241ef46c9324a50fc913",
+    "dac_public_key": "04624dc0f62274149af021e4ad07a45635aeed76ff456d837473151de65ed2178962968f8e944a496f86b3300064ae32d4083a5fc8d32536fe83639b3c884aeeba"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/cd.der b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/cd.der
index 0966dd7bc4a7b0..0639574c4f0095 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/cd.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.der
index b694ab4910c81b..1f411d02629de1 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.pem
index 6a288ee8cfa645..4ec4f399157397 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIXVOXr/aOFGcwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIINhn8znpUJU8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-2TaccSRRawA/i2TdbRyK27mHZfU+i9yJPqmcmeGnX3WBH1Cj9BsESPCxUGpeBDGi
-7wGeLZ4MymjMxq578Z7NmqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFHJtfAOZqMWkeyPhLrH3Q+hl9IchMB8GA1UdIwQYMBaAFEDH
-pCdFc6xbSiE1IKHu4Emj5U85MAoGCCqGSM49BAMCA0gAMEUCIBpgTQm7STvNKhGQ
-nbFSDUUSTNuR2jGHHcuOE5f19Mt0AiEA0W+EMwR2uz1s0LL6xj8Vpx1cbY5GZC6c
-KlCK6SKkIyg=
+pICQQQoO5IrBmM7t4QzSwuLA7gqyu60oEIMO2WcdrGEbCCevWEo0dOuosB+bcN07
+puvUb2xXmiewwrCY+EcjK6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFMolBngt3tOGhMEwkOYbky2mIlXNMB8GA1UdIwQYMBaAFB1F
+QoouLGDrrhlgT5vmzJFUowRgMAoGCCqGSM49BAMCA0kAMEYCIQCgv+tGJUTcZTWc
+wcd0AEq3BXVm5zc466msG4WCklYMwwIhALd7+AFdyv5TnfUgcgN80SHjvVHTaMJG
+5VKjSyMhRs8/
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.der
index 99cb9c092295c8..50b3943270af4c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.pem
index bad57815db7bcf..873ebcbb354669 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINjzBs0ABnaVgvAOYeE2/PkLhi21fvR7RsltuJyUrEKWoAoGCCqGSM49
-AwEHoUQDQgAE2TaccSRRawA/i2TdbRyK27mHZfU+i9yJPqmcmeGnX3WBH1Cj9BsE
-SPCxUGpeBDGi7wGeLZ4MymjMxq578Z7Nmg==
+MHcCAQEEIJAB/qM4ZMqgmn+3nrr2uGdVL7Fv3SsJlpb67UNOYvHwoAoGCCqGSM49
+AwEHoUQDQgAEpICQQQoO5IrBmM7t4QzSwuLA7gqyu60oEIMO2WcdrGEbCCevWEo0
+dOuosB+bcN07puvUb2xXmiewwrCY+EcjKw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.der
index 464475bb073b6f..504a49544a0aca 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.pem
index f1cc985754e1de..1b1cffee6f2b1f 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIMT5MMy0KGPcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIISVpDS87wOG4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR4rZmC3pAIo4gW6P0brfANqcRJ+wrP
-GpFj2drbcaRpwwuDWej38KOyLnONt7Pbw9stnBgjxEgjuqah+5gGyarPo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQMek
-J0VzrFtKITUgoe7gSaPlTzkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgWgTMoGN/mq+N3vaO75Pf72DXB6r2rf6C7t6s
-JPDGL4oCIQDapgNBztWsiAX9vFikYENGuPcG1KjcQrr7qMxTTBFQ9w==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASBYohi88nnSSw7bIBfAvHw39AJfHlK
+zlVN0ZUAPb7hpH5ePxq1YN/py15TI8hNc+J14ymzbMOUSqvDVOd6/P6io2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUHUVC
+ii4sYOuuGWBPm+bMkVSjBGAwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgcyeP9aScuK3i0RuBBmbxWmHz7aRnBGOpMihP
+4H8YvMsCICQc+9Z2ydxXUh5cZzbBlec+zqYa2sOaxfbLq6S8lHSD
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.der
index d75a499bd927f0..57225b12d1db14 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.pem
index 4c97d4f9dedb8e..94210b210b01df 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIR7XSzcJ8zOiW58eTSy/viZ/RKat4EVBJI3Gt5kQs0NoAoGCCqGSM49
-AwEHoUQDQgAEeK2Zgt6QCKOIFuj9G63wDanESfsKzxqRY9na23GkacMLg1no9/Cj
-si5zjbez28PbLZwYI8RII7qmofuYBsmqzw==
+MHcCAQEEID34G96Zh9Lf+jb/ZUr3X5AioAsh0NUSAkLPrUu6RNKQoAoGCCqGSM49
+AwEHoUQDQgAEgWKIYvPJ50ksO2yAXwLx8N/QCXx5Ss5VTdGVAD2+4aR+Xj8atWDf
+6cteUyPITXPideMps2zDlEqrw1Tnevz+og==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/test_case_vector.json
index 4edf553d19773a..a9942fc7b01fc6 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The certificate_id field has wrong length.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202085d5397aff68e1467300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d9369c7124516b003f8b64dd6d1c8adbb98765f53e8bdc893ea99c99e1a75f75811f50a3f41b0448f0b1506a5e0431a2ef019e2d9e0cca68ccc6ae7bf19ecd9aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414726d7c0399a8c5a47b23e12eb1f743e865f48721301f0603551d2304183016801440c7a4274573ac5b4a213520a1eee049a3e54f39300a06082a8648ce3d040302034800304502201a604d09bb493bcd2a11909db1520d45124cdb91da31871dcb8e1397f5f4cb74022100d16f84330476bb3d6cd0b2fac63f15a71d5c6d8e46642e9c2a508ae922a42328",
-    "pai_cert": "308201d43082017aa0030201020208313e4c332d0a18f7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000478ad9982de9008a38816e8fd1badf00da9c449fb0acf1a9163d9dadb71a469c30b8359e8f7f0a3b22e738db7b3dbc3db2d9c1823c44823baa6a1fb9806c9aacfa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041440c7a4274573ac5b4a213520a1eee049a3e54f39301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205a04cca0637f9aaf8ddef68eef93dfef60d707aaf6adfe82eedeac24f0c62f8a022100daa60341ced5ac8805fdbc58a4604346b8f706d4a8dc42bafba8cc534c1150f7",
-    "certification_declaration": "3082010506092a864886f70d010702a081f73081f4020103310d300b0609608648016503040201306206092a864886f70d010701a0550453152000012501f1ff360205008018250334122c04175a494732303134315a423333303030312d32343132333424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022052d7e30b120a81160cd6ed795091196759de0286c029cbb9614cefe25d4669fd0220225fa6ec012986aa6e2e7aa512d33a5fd958d55b40681f19ae45175645cdf19f",
-    "dac_private_key": "d8f306cd0006769582f00e61e136fcf90b862db57ef47b46c96db89c94ac4296",
-    "dac_public_key": "04d9369c7124516b003f8b64dd6d1c8adbb98765f53e8bdc893ea99c99e1a75f75811f50a3f41b0448f0b1506a5e0431a2ef019e2d9e0cca68ccc6ae7bf19ecd9a"
+    "dac_cert": "308201e53082018aa00302010202083619fcce7a54254f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a48090410a0ee48ac198ceede10cd2c2e2c0ee0ab2bbad2810830ed9671dac611b0827af584a3474eba8b01f9b70dd3ba6ebd46f6c579a27b0c2b098f847232ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ca2506782dded38684c13090e61b932da62255cd301f0603551d230418301680141d45428a2e2c60ebae19604f9be6cc9154a30460300a06082a8648ce3d0403020349003046022100a0bfeb462544dc65359cc1c774004ab7057566e73738eba9ac1b858292560cc3022100b77bf8015dcafe539df52072037cd121e3bd51d368c246e552a34b232146cf3f",
+    "pai_cert": "308201d33082017aa0030201020208495a434bcef0386e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000481628862f3c9e7492c3b6c805f02f1f0dfd0097c794ace554dd195003dbee1a47e5e3f1ab560dfe9cb5e5323c84d73e275e329b36cc3944aabc354e77afcfea2a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141d45428a2e2c60ebae19604f9be6cc9154a30460301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022073278ff5a49cb8ade2d11b810666f15a61f3eda4670463a932284fe07f18bccb0220241cfbd676c9dc57521e5c6736c195e73ecea61adac39ac5f6cbaba4bc947483",
+    "certification_declaration": "3081ed06092a864886f70d010702a081df3081dc020103310d300b0609608648016503040201304906092a864886f70d010701a03c043a152400012501f1ff360205008018250334122c04175a494732303134315a423333303030312d3234313233342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ea14f344941e870353931995ed58dc2d168033d62ad0959373e2da6df7b3101d0220040391e1aa30f7212ddffc046faa4bdccfa7eb85de1d9bb497946ace6f68ea6d",
+    "dac_private_key": "9001fea33864caa09a7fb79ebaf6b867552fb16fdd2b099696faed434e62f1f0",
+    "dac_public_key": "04a48090410a0ee48ac198ceede10cd2c2e2c0ee0ab2bbad2810830ed9671dac611b0827af584a3474eba8b01f9b70dd3ba6ebd46f6c579a27b0c2b098f847232b"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/cd.der
index 5e3d7ec741aa2c..c7bac85d230624 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.der
index d24fb0d5af27f4..8c08d95dda66a0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.pem
index bce0074c4e7d5e..c0f95e52c7b991 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIZ4HmaDpeyU8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIKuFzguE6cRkwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-AhBU4SDORsW3huPapYTERe0bLqfu3T+36iwVAFA5Qrf6dpOfpOc2DE47hB29KxF6
-887U1iagHC83Yl26dUkkC6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFFC0+vHGlsLa4BXeO8K/GALlodrfMB8GA1UdIwQYMBaAFG8f
-0dZgM8MPq6/lNo2aGgqpLNqiMAoGCCqGSM49BAMCA0gAMEUCIGAK8PJ6pFeCE1uk
-AspIspiYnS3J3xhrs7ZGyYNcfaFnAiEA8Kw0vJKI4N37cE0mCVSqhTSmr1WjU/F3
-XB0dzAqcMnw=
+ZPUwa5T/3xLXp2N6InEw404X5guVbnKKKOZVQLQOPNpBzBEFoe8x/RAqO1upJEb3
+lmfLZbcnSb7VP5ZC0ipytKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFLsK1IS0q5LkFek9jQnnQQXUW7z5MB8GA1UdIwQYMBaAFJ7D
+eKdqAq7p6FnUPD+qmvDL858MMAoGCCqGSM49BAMCA0gAMEUCIEEq0WpIVCXIho9M
+GWU8kwbt/iwDm8dvIUSuOslyKcetAiEAv87jC3jNesT+tij5m8s8Ur3RYDWzS9Qt
+vZBOXhzPC4E=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.der
index 66ddde4bb19453..fa001c5a881c64 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.pem
index 5ab7b5c76f8284..e7d797ee16378b 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICloF+XV6xh5iXphMCSoSDqIY7WjmdwLU0uvuiza0f1GoAoGCCqGSM49
-AwEHoUQDQgAEAhBU4SDORsW3huPapYTERe0bLqfu3T+36iwVAFA5Qrf6dpOfpOc2
-DE47hB29KxF6887U1iagHC83Yl26dUkkCw==
+MHcCAQEEIPGvpbfQtltBtjFUmldYnESFbJZVdqJ7BEsGYP58GLW6oAoGCCqGSM49
+AwEHoUQDQgAEZPUwa5T/3xLXp2N6InEw404X5guVbnKKKOZVQLQOPNpBzBEFoe8x
+/RAqO1upJEb3lmfLZbcnSb7VP5ZC0ipytA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.der
index fbdb9849f26e3f..a2d86ffc28a438 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.pem
index aa3cc38f3c9e59..00b2a5a02d3106 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIfRjqqXCQT4IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIdP9/WiFhjn8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQKv0D+XLAyvBsgzGfwT6tO/eJOSMw3
-2p8uQdWUyK7sI10EtkrlPMbEoOOzeQ3QS8rxOdI8UkZHzZuSY62f2U56o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUbx/R
-1mAzww+rr+U2jZoaCqks2qIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAN+kERUWuyNQkHDlWqLGkPNZBd5p6IBxBf2y
-mDIvM9woAiAFX4oFcMwV1NN5wVaas6qePx2naEi9CpV2U745X5sCxw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATxzVczQNPfOWfk3Rw3jGSyzwuFN962
+cEmwuUqLHTD4TnAbPa1dkYTi6GkEl2vL7alJlqw057JAUfQbujl7p18Ko2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUnsN4
+p2oCrunoWdQ8P6qa8MvznwwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgQdP0CyweIvQb/V1ubTJh6sQqYHK6r2YYMQ7D
+OxBbdZYCIGxFo7MWkiQ/3Btq0Rv6x4NMw4hTWvkU+ifANBSUzX8r
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.der
index aeb2c4da0e1115..a0e970684695fd 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.pem
index 6fe0ecaa36cabe..1fc102cdfc6798 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMkU6/b2gaoDxKLduzKLw+cAj/E8gQiuPJrmgwc5pWiGoAoGCCqGSM49
-AwEHoUQDQgAECr9A/lywMrwbIMxn8E+rTv3iTkjMN9qfLkHVlMiu7CNdBLZK5TzG
-xKDjs3kN0EvK8TnSPFJGR82bkmOtn9lOeg==
+MHcCAQEEILYYe9OE0QyYn3YcVf4tcM+4eJAJgmQ/pSpZEyXfAUDQoAoGCCqGSM49
+AwEHoUQDQgAE8c1XM0DT3zln5N0cN4xkss8LhTfetnBJsLlKix0w+E5wGz2tXZGE
+4uhpBJdry+2pSZasNOeyQFH0G7o5e6dfCg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/test_case_vector.json
index f718edc1177b10..bd6dad51a51a48 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The certificate_id field doesn't contain a globally unique serial number allocated by the CSA for this CD.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202086781e6683a5ec94f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004021054e120ce46c5b786e3daa584c445ed1b2ea7eedd3fb7ea2c1500503942b7fa76939fa4e7360c4e3b841dbd2b117af3ced4d626a01c2f37625dba7549240ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041450b4faf1c696c2dae015de3bc2bf1802e5a1dadf301f0603551d230418301680146f1fd1d66033c30fabafe5368d9a1a0aa92cdaa2300a06082a8648ce3d04030203480030450220600af0f27aa45782135ba402ca48b298989d2dc9df186bb3b646c9835c7da167022100f0ac34bc9288e0ddfb704d260954aa8534a6af55a353f1775c1d1dcc0a9c327c",
-    "pai_cert": "308201d43082017aa00302010202087d18eaa970904f82300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040abf40fe5cb032bc1b20cc67f04fab4efde24e48cc37da9f2e41d594c8aeec235d04b64ae53cc6c4a0e3b3790dd04bcaf139d23c524647cd9b9263ad9fd94e7aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146f1fd1d66033c30fabafe5368d9a1a0aa92cdaa2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100dfa4111516bb23509070e55aa2c690f35905de69e8807105fdb298322f33dc280220055f8a0570cc15d4d379c1569ab3aa9e3f1da76848bd0a957653be395f9b02c7",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c0413494e5632303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201a65b8b75d451a236f57f0b9e72d1ff31912753052c6a74efb3148b7a04d9c83022100ab03902b380b47152e9afc60797f5c00da02c4184b44b3cb1bdefcaeb143c48d",
-    "dac_private_key": "296817e5d5eb1879897a613024a8483a8863b5a399dc0b534bafba2cdad1fd46",
-    "dac_public_key": "04021054e120ce46c5b786e3daa584c445ed1b2ea7eedd3fb7ea2c1500503942b7fa76939fa4e7360c4e3b841dbd2b117af3ced4d626a01c2f37625dba7549240b"
+    "dac_cert": "308201e43082018aa00302010202082ae17382e13a7119300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000464f5306b94ffdf12d7a7637a227130e34e17e60b956e728a28e65540b40e3cda41cc1105a1ef31fd102a3b5ba92446f79667cb65b72749bed53f9642d22a72b4a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bb0ad484b4ab92e415e93d8d09e74105d45bbcf9301f0603551d230418301680149ec378a76a02aee9e859d43c3faa9af0cbf39f0c300a06082a8648ce3d04030203480030450220412ad16a485425c8868f4c19653c9306edfe2c039bc76f2144ae3ac97229c7ad022100bfcee30b78cd7ac4feb628f99bcb3c52bdd16035b34bd42dbd904e5e1ccf0b81",
+    "pai_cert": "308201d33082017aa003020102020874ff7f5a21618e7f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f1cd573340d3df3967e4dd1c378c64b2cf0b8537deb67049b0b94a8b1d30f84e701b3dad5d9184e2e86904976bcbeda94996ac34e7b24051f41bba397ba75f0aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604149ec378a76a02aee9e859d43c3faa9af0cbf39f0c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022041d3f40b2c1e22f41bfd5d6e6d3261eac42a6072baaf6618310ec33b105b759602206c45a3b31692243fdc1b6ad11bfac7834cc388535af914fa27c0341494cd7f2b",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c0413494e5632303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402203e409fc0be4e30cbe2c02a022519e2ee602a986df2f35c03e0b1ef0e076b3f62022069f6216057ae3319b80c4d56f5b6bd550f3506ac1252fbac7554542ecb1a2fd6",
+    "dac_private_key": "f1afa5b7d0b65b41b631549a57589c44856c965576a27b044b0660fe7c18b5ba",
+    "dac_public_key": "0464f5306b94ffdf12d7a7637a227130e34e17e60b956e728a28e65540b40e3cda41cc1105a1ef31fd102a3b5ba92446f79667cb65b72749bed53f9642d22a72b4"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/cd.der
index d2a30326b0ca00..35f1adc24a7764 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.der
index 0e5c28396d76af..cc100b1274fa9d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.pem
index 725e5075e1ab88..cca5051fe55799 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIICMn7tKjYE+gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIfqaz5jrpcXcwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-l3/1azs3ab+miXmCqYbAJ9UIZ7TGFeu86FXfvoA3Wc4RcHpagKuvcEW9lNoUjWbT
-qqVhFadlI4PVYQPoeRj5OqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFKTY5AHlpCyq/lAdB8PejdoJitreMB8GA1UdIwQYMBaAFP/i
-DQIJ+kbfR1SNzvgScCFHrKU5MAoGCCqGSM49BAMCA0cAMEQCIAvZufoG8Mqy+Pjt
-1BnKJM7+sNS/FrkE2RoCjlz6TxJYAiAQj1EMC/fojXgJg8DIWDFs1onUgOOTbOiV
-mD2NxkGOcA==
+KXLlvvimB8dCabdYi/iY7t3jvM3DmSaRpw5EpiadyqrASlLoK4EmbIRzg1iUIYa0
+LiNISBUPrITo7qs8+BgWPaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFChTsiJ/eatUKiZiQNrz/aGdiTNxMB8GA1UdIwQYMBaAFKtz
+Cn6bc+fmWr8Ye25CnYoIaUbxMAoGCCqGSM49BAMCA0cAMEQCIHaXjE0a4mNrjZNh
+Yq2tmllvAL6FVQavrFVkq8A2OqHhAiBqwo9JZMFo1QAQqSbOpqIAr+A5QKfZjhpw
+xsVcH7jA1A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.der
index 341e6a65f27778..1f5b51d714e300 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.pem
index 2f3a71da77c7b9..c93248f22617ef 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJzLho7kwA5+8J3uV4gTtgUsJcUKUWGz9cx5btUc0L37oAoGCCqGSM49
-AwEHoUQDQgAEl3/1azs3ab+miXmCqYbAJ9UIZ7TGFeu86FXfvoA3Wc4RcHpagKuv
-cEW9lNoUjWbTqqVhFadlI4PVYQPoeRj5Og==
+MHcCAQEEIOTD9ZJ+MbcpvaTa2y76nYXBJTVB4iUPvGae7Or1Gr3goAoGCCqGSM49
+AwEHoUQDQgAEKXLlvvimB8dCabdYi/iY7t3jvM3DmSaRpw5EpiadyqrASlLoK4Em
+bIRzg1iUIYa0LiNISBUPrITo7qs8+BgWPQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.der
index ebd7403d278aa6..956ba7b36fbaaa 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.pem
index 0b5a9a6fdd6849..11281bc546812e 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIL69Jy/an4rQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIYt4Z3Z5zCQUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASsByeiDawMAgmgKer11mSqwBwJh+h7
-afRtK2xtNCQ2LP9FLQeu8TN+M/C/B9WWMuB6gp0cPyZmIMAUVFRhS0UZo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU/+IN
-Agn6Rt9HVI3O+BJwIUespTkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAKDKZRWg6qkzz+brGUo6kLEfOXMlyJ7Xcju5
-OdZsOpE5AiEAzRmkLIU6NNxEpzkXkiPGglMmnJVKhK2kpXREl1eLKH4=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATF21S7NYQL55NUJvRvrL+3RyvhXDDx
+or5snDG1H4+BU1S5SjVqmejiVuIdtiI2UIazRYBK6R40tcDNl/DxyZOMo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUq3MK
+fptz5+Zavxh7bkKdighpRvEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKtyjyj+57ly+5sKUQHI+ytB4u+rgl+R31SK
+C4kXhfQNAiA5QnzO5F52t6wt/DX34boEJgUJVYaUeqEP0jFmZykDiQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.der
index cbc73d6705ed03..9ab4326c3e077b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.pem
index a8821766d31473..f308f73b9ed650 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEID6S4QMHk3yNPEX1hDhWNHY9DQhLVxabYHkLMb5ByOcgoAoGCCqGSM49
-AwEHoUQDQgAErAcnog2sDAIJoCnq9dZkqsAcCYfoe2n0bStsbTQkNiz/RS0HrvEz
-fjPwvwfVljLgeoKdHD8mZiDAFFRUYUtFGQ==
+MHcCAQEEIBLIX8CvhpPZShwswpe2aBl7pv/AKg3LmwiBK8b8GRIDoAoGCCqGSM49
+AwEHoUQDQgAExdtUuzWEC+eTVCb0b6y/t0cr4Vww8aK+bJwxtR+PgVNUuUo1apno
+4lbiHbYiNlCGs0WASukeNLXAzZfw8cmTjA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/test_case_vector.json
index 040eda54d7c636..cd13f02d943510 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_id_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cert_id_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The certificate_id field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa003020102020808c9fbb4a8d813e8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004977ff56b3b3769bfa6897982a986c027d50867b4c615ebbce855dfbe803759ce11707a5a80abaf7045bd94da148d66d3aaa56115a7652383d56103e87918f93aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a4d8e401e5a42caafe501d07c3de8dda098adade301f0603551d23041830168014ffe20d0209fa46df47548dcef812702147aca539300a06082a8648ce3d040302034700304402200bd9b9fa06f0cab2f8f8edd419ca24cefeb0d4bf16b904d91a028e5cfa4f12580220108f510c0bf7e88d780983c0c858316cd689d480e3936ce895983d8dc6418e70",
-    "pai_cert": "308201d53082017aa00302010202082faf49cbf6a7e2b4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ac0727a20dac0c0209a029eaf5d664aac01c0987e87b69f46d2b6c6d3424362cff452d07aef1337e33f0bf07d59632e07a829d1c3f266620c0145454614b4519a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ffe20d0209fa46df47548dcef812702147aca539301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a0ca6515a0eaa933cfe6eb194a3a90b11f397325c89ed7723bb939d66c3a9139022100cd19a42c853a34dc44a739179223c68253269c954a84ada4a5744497578b287e",
-    "certification_declaration": "3081ec06092a864886f70d010702a081de3081db020103310d300b0609608648016503040201304806092a864886f70d010701a03b0439152000012501f1ff3602050080182503341224050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022019ca0856a34f33902e880d26b28b234eb866a7fca5c56d500fa0b50822235f8d022100b58b48d72a5c7570864b6774764ec2d5f2183302a1cf72c623fbed3ed6f06dcd",
-    "dac_private_key": "9ccb868ee4c00e7ef09dee578813b6052c25c50a5161b3f5cc796ed51cd0bdfb",
-    "dac_public_key": "04977ff56b3b3769bfa6897982a986c027d50867b4c615ebbce855dfbe803759ce11707a5a80abaf7045bd94da148d66d3aaa56115a7652383d56103e87918f93a"
+    "dac_cert": "308201e33082018aa00302010202087ea6b3e63ae97177300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042972e5bef8a607c74269b7588bf898eedde3bccdc3992691a70e44a6269dcaaac04a52e82b81266c84738358942186b42e234848150fac84e8eeab3cf818163da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604142853b2227f79ab542a266240daf3fda19d893371301f0603551d23041830168014ab730a7e9b73e7e65abf187b6e429d8a086946f1300a06082a8648ce3d0403020347003044022076978c4d1ae2636b8d936162adad9a596f00be855506afac5564abc0363aa1e102206ac28f4964c168d50010a926cea6a200afe03940a7d98e1a70c6c55c1fb8c0d4",
+    "pai_cert": "308201d43082017aa003020102020862de19dd9e730905300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c5db54bb35840be7935426f46facbfb7472be15c30f1a2be6c9c31b51f8f815354b94a356a99e8e256e21db622365086b345804ae91e34b5c0cd97f0f1c9938ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ab730a7e9b73e7e65abf187b6e429d8a086946f1301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ab728f28fee7b972fb9b0a5101c8fb2b41e2efab825f91df548a0b891785f40d022039427ccee45e76b7ac2dfc35f7e1ba042605095586947aa10fd2316667290389",
+    "certification_declaration": "3081d206092a864886f70d010702a081c43081c1020103310d300b0609608648016503040201302f06092a864886f70d010701a0220420152400012501f1ff360205008018250334122405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022056ff620b0fd9551f2f66c49370768b42a4784cb291b95a7890e8ff8f8633977202200ebe80082d30d6e1e9c83b7e370a0f1f8fe5974d26e3cf9aa392e96b139973aa",
+    "dac_private_key": "e4c3f5927e31b729bda4dadb2efa9d85c1253541e2250fbc669eeceaf51abde0",
+    "dac_public_key": "042972e5bef8a607c74269b7588bf898eedde3bccdc3992691a70e44a6269dcaaac04a52e82b81266c84738358942186b42e234848150fac84e8eeab3cf818163d"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/cd.der
index 69438cbfa06fc6..12dc1c3a2e4e3b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.der
index 66fe4cba8f25f1..43ad2383ae522a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.pem
index 05fb399087efb6..9de34f479c31bd 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIdMFTkU3cd40wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIICDT1H4myEsYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-Qxkf0c2eprbM1bZkSD1okhhSr7Jrd+lFS5qvzxy72G+ph3sRwXMjGIsIS+S3GviG
-YBvHmaVgIziMMQACHhL5kqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFNNyjOO9nQLddsT30V2au0GzxhhxMB8GA1UdIwQYMBaAFEHJ
-pPr668toRRTDjmU9OEhizfpdMAoGCCqGSM49BAMCA0kAMEYCIQCLzfbkUfMKPjeN
-rrUNkq6pmSDDV+husvKQiIGvw7TMngIhAKzDZZ/3ipx934+0nfOF3hR/9cySrNVw
-NKbhPP2o+/s8
+HqB1o/QIzBcrpKp8TR6peqPtxYNckKjFN10PD0SVh6m/Ib1W9WMmDLVUnVRqKww5
+T2UPhzC3865pzQh3rSNdzqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFHmGYN+M7BfornZ+aA2DFTPICB62MB8GA1UdIwQYMBaAFGze
+XduTGdTmDCDo0sZvGg9i4dAUMAoGCCqGSM49BAMCA0gAMEUCIAvkohebXuXRl3og
+zxyzVN8gRWdbdoAy/3o+TuBnnTZkAiEA9lS7XbqC9Dsn15H8HvIo4f7AuCw1L4Mh
+8BE15UNc6Vg=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.der
index df6205d96b0882..1e6ada03f45920 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.pem
index 99c35159770b74..65ece54a2660d9 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOCqQXk0IURvJqiwjZE7rWMuMqfquPCyXPk+I2xQx73joAoGCCqGSM49
-AwEHoUQDQgAEQxkf0c2eprbM1bZkSD1okhhSr7Jrd+lFS5qvzxy72G+ph3sRwXMj
-GIsIS+S3GviGYBvHmaVgIziMMQACHhL5kg==
+MHcCAQEEILZlw6571G6iL8zegTpOpQMUAzLovKZksiZIdC9IwLONoAoGCCqGSM49
+AwEHoUQDQgAEHqB1o/QIzBcrpKp8TR6peqPtxYNckKjFN10PD0SVh6m/Ib1W9WMm
+DLVUnVRqKww5T2UPhzC3865pzQh3rSNdzg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.der
index 4bf83d1a6d985d..d80f745095c55b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.pem
index 945bf9a05b5be8..719c6ae81c0f70 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIZI0sZe6Cv0YwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIQPCQjJNJVWUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQc7GJZjrX8i+qndSyWY3xqsiuMMUky
-AzXa0NepBg9uHAEMU7/QfzM+5jNcQkAQNcbYxh8eC3dXv8yGBE0qmsRno2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQcmk
-+vrry2hFFMOOZT04SGLN+l0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgZm5e9JSlm18FWbXSXwho3i2ye1E/rXTeos42
-wksgmzMCIQDTMPnrHnJZYAhik2LpfabLS3sFT0n2EJLLgt6IQVeLvA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASMXt6oIAjhT9fY2a9c7AjWU9mQEgs4
+FPuDb+PbJi/RtdrqOic6eZt9ypkMqeNTg6dRQFIhsNel5ilUiBJiV3xSo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUbN5d
+25MZ1OYMIOjSxm8aD2Lh0BQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgMk3p3jggUrKqKq5elrMqyQwBAi/mQrP6F74y
+7+RNFf0CIQCeQbi6LcJHEBLIBLY6zIBxjHev3NKgtw1YMFZOtm5znQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.der
index 68abb6165b6087..301f63f17edf90 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.pem
index 6e7575f424af4b..e934bd5b99f6fc 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEvPrIQYFWEJ9EuUmi7T93iLGPBngLMjmEvL2IWRD0DPoAoGCCqGSM49
-AwEHoUQDQgAEHOxiWY61/Ivqp3UslmN8arIrjDFJMgM12tDXqQYPbhwBDFO/0H8z
-PuYzXEJAEDXG2MYfHgt3V7/MhgRNKprEZw==
+MHcCAQEEIJdpyZBzxIL8eDHqfZ4vUfJ8q4yT2YPs5BrhkCAXMdDNoAoGCCqGSM49
+AwEHoUQDQgAEjF7eqCAI4U/X2NmvXOwI1lPZkBILOBT7g2/j2yYv0bXa6jonOnmb
+fcqZDKnjU4OnUUBSIbDXpeYpVIgSYld8Ug==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/test_case_vector.json
index b35bbbe55e3092..4f2a4fb4e91575 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The certification_type field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa003020102020874c153914ddc778d300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000443191fd1cd9ea6b6ccd5b664483d68921852afb26b77e9454b9aafcf1cbbd86fa9877b11c17323188b084be4b71af886601bc799a56023388c3100021e12f992a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d3728ce3bd9d02dd76c4f7d15d9abb41b3c61871301f0603551d2304183016801441c9a4fafaebcb684514c38e653d384862cdfa5d300a06082a8648ce3d04030203490030460221008bcdf6e451f30a3e378daeb50d92aea99920c357e86eb2f2908881afc3b4cc9e022100acc3659ff78a9c7ddf8fb49df385de147ff5cc92acd57034a6e13cfda8fbfb3c",
-    "pai_cert": "308201d43082017aa0030201020208648d2c65ee82bf46300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041cec62598eb5fc8beaa7752c96637c6ab22b8c3149320335dad0d7a9060f6e1c010c53bfd07f333ee6335c42401035c6d8c61f1e0b7757bfcc86044d2a9ac467a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041441c9a4fafaebcb684514c38e653d384862cdfa5d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220666e5ef494a59b5f0559b5d25f0868de2db27b513fad74dea2ce36c24b209b33022100d330f9eb1e72596008629362e97da6cb4b7b054f49f61092cb82de8841578bbc",
-    "certification_declaration": "3081fe06092a864886f70d010702a081f03081ed020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220026b2621f8587114476b1274bb00d4b7008b7f5c0357ae757742734300533d3c02203f242d6ba80a89211ff18b3a0787f8ce3bdc58b26dc99d3d565ccdb01446c3de",
-    "dac_private_key": "e0aa41793421446f26a8b08d913bad632e32a7eab8f0b25cf93e236c50c7bde3",
-    "dac_public_key": "0443191fd1cd9ea6b6ccd5b664483d68921852afb26b77e9454b9aafcf1cbbd86fa9877b11c17323188b084be4b71af886601bc799a56023388c3100021e12f992"
+    "dac_cert": "308201e43082018aa00302010202080834f51f89b212c6300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041ea075a3f408cc172ba4aa7c4d1ea97aa3edc5835c90a8c5375d0f0f449587a9bf21bd56f563260cb5549d546a2b0c394f650f8730b7f3ae69cd0877ad235dcea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414798660df8cec17e8ae767e680d831533c8081eb6301f0603551d230418301680146cde5ddb9319d4e60c20e8d2c66f1a0f62e1d014300a06082a8648ce3d040302034800304502200be4a2179b5ee5d1977a20cf1cb354df2045675b768032ff7a3e4ee0679d3664022100f654bb5dba82f43b27d791fc1ef228e1fec0b82c352f8321f01135e5435ce958",
+    "pai_cert": "308201d43082017aa003020102020840f0908c93495565300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048c5edea82008e14fd7d8d9af5cec08d653d990120b3814fb836fe3db262fd1b5daea3a273a799b7dca990ca9e35383a751405221b0d7a5e62954881262577c52a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146cde5ddb9319d4e60c20e8d2c66f1a0f62e1d014301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220324de9de382052b2aa2aae5e96b32ac90c01022fe642b3fa17be32efe44d15fd0221009e41b8ba2dc2471012c804b63acc80718c77afdcd2a0b70d5830564eb66e739d",
+    "certification_declaration": "3081e606092a864886f70d010702a081d83081d5020103310d300b0609608648016503040201304206092a864886f70d010701a0350433152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022036136361524f160beacdd64b6eee06d1032448bd1ee371bf65afd46bc3ab1d3c022100d22617af7d9eff14c59a416577e1418e6f3ece0260207af0fe9e1c853ab82576",
+    "dac_private_key": "b665c3ae7bd46ea22fccde813a4ea503140332e8bca664b22648742f48c0b38d",
+    "dac_public_key": "041ea075a3f408cc172ba4aa7c4d1ea97aa3edc5835c90a8c5375d0f0f449587a9bf21bd56f563260cb5549d546a2b0c394f650f8730b7f3ae69cd0877ad235dce"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/cd.der b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/cd.der
index 8e4c350d46c83a..de8aba972ed635 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/cd.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.der
index 5ac03972b2c71f..9d5034f5d3e7f8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.pem
index 7875f93839a748..cb8b86c5f4e392 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIC9d0jKyav0gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIICUnwjm5BTQUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-wj/V33C0LTTDruuEEElQ5h/bCA4do4aIxYiI54ilu+mm3OTAze/R3ySgXjDuhlW/
-vi1k1A9E2+D+x6LL5OZ8fqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFCY3QYBeLelCRA79dJFAaiKnoLFiMB8GA1UdIwQYMBaAFPQI
-cXl6OcxZ+4PaIpOxgKTwKMeQMAoGCCqGSM49BAMCA0gAMEUCIQDsA+nqWq6vX+ke
-J69DtBr7tyu/V6MQ9fCQKQ0uke5g0gIgLSpLdMUP1GMYc12wDTO77XF62fg2T3Bz
-KnCNYysYgnk=
+A9Q0sfIJ2ukLQybupL+Wbm0H+xNVApKFL3mFDqkErYbSn5cAUp44AyDzmN5bSd79
+iIscGvtDHOmNyEOsEV+8wKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFO33odNnpc6CnkhorezhJg7wJE2cMB8GA1UdIwQYMBaAFAaX
+2ArVFNsapvOe1GVkEeyFfX2NMAoGCCqGSM49BAMCA0gAMEUCIQC8pDOIce3nIKUX
+aat1jOzggDMNiFl5B6KgIGR/d29pEgIgFqXJfUlBzP2jKr+ioFX2WPQqZElSsSPU
+UFaP9rnQjaY=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.der
index 7f1c1124cbf6c8..9d9850ddceb8a3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.pem
index e49cde88106660..dd8df2c51419e2 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP2HDXIzm+FatCYZCiMsNRUXBdvHukPK/7fJoX2FlUb1oAoGCCqGSM49
-AwEHoUQDQgAEwj/V33C0LTTDruuEEElQ5h/bCA4do4aIxYiI54ilu+mm3OTAze/R
-3ySgXjDuhlW/vi1k1A9E2+D+x6LL5OZ8fg==
+MHcCAQEEIGeTGTmDDeCOzlm8pnAjdSZ5TYTSYSMLV8bgckWFG5uzoAoGCCqGSM49
+AwEHoUQDQgAEA9Q0sfIJ2ukLQybupL+Wbm0H+xNVApKFL3mFDqkErYbSn5cAUp44
+AyDzmN5bSd79iIscGvtDHOmNyEOsEV+8wA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.der
index 46243cc01ea273..28e8a67facdb59 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.pem
index 33cdf7b9c9f584..8ba483cadc77aa 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIISVRM2vIIKX0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIQ0e3AL7e7BIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASEcqZ5heS/+y7bOH4snDBeLSod9lTM
-HyYdacLxDXRLu6eaOq9oP/oW13tYunx1ctuIXT8lz4Mem24WnVIN+lsto2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU9Ahx
-eXo5zFn7g9oik7GApPAox5AwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJftZV+BZ1nW/0L21F3AJKfHC/CKM8ba0VUw
-S7tek0DsAiA8zrbdWJn56mlc28vwNL3pmyiuiWEBIuK2CQHQcBJl4Q==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATvAD+1Aoaa+ZgAu4b2KURsITXFdrC0
+eafw5zcOveSR+u8362o9yW93Kt0o35fmuQQqMxsiP47DDVPicOuYRqSPo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUBpfY
+CtUU2xqm857UZWQR7IV9fY0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgDT0HPdI3d4VJyX9vrD1FnFLtgp2fH6U/6NxN
+WzwJRZ8CIHNUsTTqT1vVi5YQIT6u4PASAXjrGfSiA4ErdMizF21l
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.der
index c52381d59a60b0..ad6ab07d9349ee 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.pem
index 2a5bf11d964864..12224b4a526710 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILKpEQtdoi9kKjgktd5ZyUQumKIm5b9kei6Kx7zc8HYioAoGCCqGSM49
-AwEHoUQDQgAEhHKmeYXkv/su2zh+LJwwXi0qHfZUzB8mHWnC8Q10S7unmjqvaD/6
-Ftd7WLp8dXLbiF0/Jc+DHptuFp1SDfpbLQ==
+MHcCAQEEIJW3AFP7jmNBb3FTZ3td03CyE6TCP9+jAgmO/54mDDKBoAoGCCqGSM49
+AwEHoUQDQgAE7wA/tQKGmvmYALuG9ilEbCE1xXawtHmn8Oc3Dr3kkfrvN+tqPclv
+dyrdKN+X5rkEKjMbIj+Oww1T4nDrmEakjw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/test_case_vector.json
index ecdcb40be3f66e..3d26c2b7eabeaa 100644
--- a/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The certification_type field is set to invalid value.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202080bd7748cac9abf48300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c23fd5df70b42d34c3aeeb84104950e61fdb080e1da38688c58888e788a5bbe9a6dce4c0cdefd1df24a05e30ee8655bfbe2d64d40f44dbe0fec7a2cbe4e67c7ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414263741805e2de942440efd7491406a22a7a0b162301f0603551d23041830168014f40871797a39cc59fb83da2293b180a4f028c790300a06082a8648ce3d0403020348003045022100ec03e9ea5aaeaf5fe91e27af43b41afbb72bbf57a310f5f090290d2e91ee60d202202d2a4b74c50fd46318735db00d33bbed717ad9f8364f70732a708d632b188279",
-    "pai_cert": "308201d43082017aa003020102020849544cdaf208297d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048472a67985e4bffb2edb387e2c9c305e2d2a1df654cc1f261d69c2f10d744bbba79a3aaf683ffa16d77b58ba7c7572db885d3f25cf831e9b6e169d520dfa5b2da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f40871797a39cc59fb83da2293b180a4f028c790301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210097ed655f816759d6ff42f6d45dc024a7c70bf08a33c6dad155304bbb5e9340ec02203cceb6dd5899f9ea695cdbcbf034bde99b28ae89610122e2b60901d0701265e1",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ade26d9e024856a06bcc2eb905a7781d45c5fe582577b207b1db32b413b5621e022016bf78e30d5e4a1c1790f6811517c7e401a390166d00ea280d9cc7b4f2c81fed",
-    "dac_private_key": "fd870d72339be15ab426190a232c35151705dbc7ba43caffb7c9a17d859546f5",
-    "dac_public_key": "04c23fd5df70b42d34c3aeeb84104950e61fdb080e1da38688c58888e788a5bbe9a6dce4c0cdefd1df24a05e30ee8655bfbe2d64d40f44dbe0fec7a2cbe4e67c7e"
+    "dac_cert": "308201e43082018aa00302010202080949f08e6e414d05300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000403d434b1f209dae90b4326eea4bf966e6d07fb13550292852f79850ea904ad86d29f9700529e380320f398de5b49defd888b1c1afb431ce98dc843ac115fbcc0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414edf7a1d367a5ce829e4868adece1260ef0244d9c301f0603551d230418301680140697d80ad514db1aa6f39ed4656411ec857d7d8d300a06082a8648ce3d0403020348003045022100bca4338871ede720a51769ab758cece080330d88597907a2a020647f776f6912022016a5c97d4941ccfda32abfa2a055f658f42a644952b123d450568ff6b9d08da6",
+    "pai_cert": "308201d33082017aa00302010202084347b700bedeec12300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ef003fb502869af99800bb86f629446c2135c576b0b479a7f0e7370ebde491faef37eb6a3dc96f772add28df97e6b9042a331b223f8ec30d53e270eb9846a48fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604140697d80ad514db1aa6f39ed4656411ec857d7d8d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402200d3d073dd237778549c97f6fac3d459c52ed829d9f1fa53fe8dc4d5b3c09459f02207354b134ea4f5bd58b9610213eaee0f0120178eb19f4a203812b74c8b3176d65",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408ff18317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221008a550a3a379571c8f81f5b17e786e4bfdfbcba3c7075e01b5dd25c7b644422000220551e26c99143a3850628d4f1206bb5895d9b82b25330bb84cdcd6197e5cc9be4",
+    "dac_private_key": "67931939830de08ece59bca670237526794d84d261230b57c6e07245851b9bb3",
+    "dac_public_key": "0403d434b1f209dae90b4326eea4bf966e6d07fb13550292852f79850ea904ad86d29f9700529e380320f398de5b49defd888b1c1afb431ce98dc843ac115fbcc0"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/cd.der
index 9b3cb55bfb1418..03956539236c7c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.der
index ec27c17436f19d..eb9f89f4f04b2d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.pem
index 1f20aed9826a34..af2902d8a29c56 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIbm1Cyk2mUPIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIGNVnmoDEhb4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-qbb9dMhkxnZhqtDxoZsO1m0p5pDbXlDqafqnuyGqbRutQKGmlTjkUlYf+KrKXQBX
-ixaL6FTUs/DTfKJ/cdRvXKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFNVcipGRosRkgh4YTNnb6MsalqWIMB8GA1UdIwQYMBaAFB3N
-ZBg/4tDOJY96me7jh6zZu+0kMAoGCCqGSM49BAMCA0kAMEYCIQDCdxtCChgj7qpr
-FimoEyE7cj7EvJxAZonyzv9vyB22BQIhANnhAct75rZIsWv4MqydGtXQ456JvLu0
-4rvEVMUztXGq
+P1BKhSWDCBBdeJ+ti5aGs8H46UwlMQliW7HehFh942DdEqsvqXyRPbA+jzcZfozi
+OV8+mwMK2Ksd3uGk1ihxQqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFKX1feqdjc4WmVoHGphIXOjNWimjMB8GA1UdIwQYMBaAFIZ5
+eWlYRFXdSVXo3jHdLjvwuHhtMAoGCCqGSM49BAMCA0cAMEQCIFd4fcGhrgYK+eLb
+m0RyyeOoCz/GWaGBddiqSq/UvyXBAiAEXsRNEEUxlhkEvMzylntDdwj72PZsGxV5
+oY0l6XhbTQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.der
index 941071441ebf3a..b794e0d9a148b6 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.pem
index 470bc511d74534..8f7582d2adbfa4 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMQATNqqXWIsKRvjcNuoVUas7wrkG693beAkceZc0aKOoAoGCCqGSM49
-AwEHoUQDQgAEqbb9dMhkxnZhqtDxoZsO1m0p5pDbXlDqafqnuyGqbRutQKGmlTjk
-UlYf+KrKXQBXixaL6FTUs/DTfKJ/cdRvXA==
+MHcCAQEEIE64BQjMV6NpuiD3fgyfUah5qM+du69YD6pis8xnZ6LeoAoGCCqGSM49
+AwEHoUQDQgAEP1BKhSWDCBBdeJ+ti5aGs8H46UwlMQliW7HehFh942DdEqsvqXyR
+PbA+jzcZfoziOV8+mwMK2Ksd3uGk1ihxQg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.der
index 256060bc59fedf..7d851a4e4d877e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.pem
index 221b6686b59868..dcfe331c7fee80 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIZSgLZhd5Yu0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIKLFerVbSbc0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASp65LHyfx1jeip9Bl5VLuyBPpweVAb
-mAtcW8ScBmJNzt2as8H7tslXPEtQa8UF6tk0sudvC82bDzDpKDcOjsfVo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUHc1k
-GD/i0M4lj3qZ7uOHrNm77SQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgPVSUJV1iAxS7FhgLNN1pX36ERqSfYZKE5jnv
-Svt7wpICIB2KHyX095mTSZ2JmLSac8oUnlJ9bC77FDQI19OHs+a7
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQuusk16eph5/g+KonVWu045Xr75bZE
+jRy0FEycxeZbEPVfbSuYHr6f5+iURfrsEfSZQ5jt1hww6P/2WasaVWupo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUhnl5
+aVhEVd1JVejeMd0uO/C4eG0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgOuhcBBznZs45PZQtHM6MQSfOyOYe4HQnR7B6
+TsvnFj4CIG4rgaAU6E2BjbOf956HAfex/OJLYVjCDfnl3Ze5EpIK
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.der
index c0eb4f5869695b..460373b00e5c02 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.pem
index b32d5e1ad20e03..77168f9ea7e0ce 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM0GPHOtYsjnggsG8edYpGGa3esicz4vZzswzoO3IGx1oAoGCCqGSM49
-AwEHoUQDQgAEqeuSx8n8dY3oqfQZeVS7sgT6cHlQG5gLXFvEnAZiTc7dmrPB+7bJ
-VzxLUGvFBerZNLLnbwvNmw8w6Sg3Do7H1Q==
+MHcCAQEEIM7cIa6y2JlVXFLYiAFnWUSUKrKuBIw2MR5kLbdPAKw1oAoGCCqGSM49
+AwEHoUQDQgAELrrJNenqYef4PiqJ1VrtOOV6++W2RI0ctBRMnMXmWxD1X20rmB6+
+n+folEX67BH0mUOY7dYcMOj/9lmrGlVrqQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/test_case_vector.json
index 50816286f29ead..74100bfacfc7ed 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid CMS digest algorithm SHA1.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa00302010202086e6d42ca4da650f2300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a9b6fd74c864c67661aad0f1a19b0ed66d29e690db5e50ea69faa7bb21aa6d1bad40a1a69538e452561ff8aaca5d00578b168be854d4b3f0d37ca27f71d46f5ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d55c8a9191a2c464821e184cd9dbe8cb1a96a588301f0603551d230418301680141dcd64183fe2d0ce258f7a99eee387acd9bbed24300a06082a8648ce3d0403020349003046022100c2771b420a1823eeaa6b1629a813213b723ec4bc9c406689f2ceff6fc81db605022100d9e101cb7be6b648b16bf832ac9d1ad5d0e39e89bcbbb4e2bbc454c533b571aa",
-    "pai_cert": "308201d33082017aa003020102020865280b66177962ed300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a9eb92c7c9fc758de8a9f4197954bbb204fa7079501b980b5c5bc49c06624dcedd9ab3c1fbb6c9573c4b506bc505ead934b2e76f0bcd9b0f30e928370e8ec7d5a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141dcd64183fe2d0ce258f7a99eee387acd9bbed24301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402203d5494255d620314bb16180b34dd695f7e8446a49f619284e639ef4afb7bc29202201d8a1f25f4f79993499d8998b49a73ca149e527d6c2efb143408d7d387b3e6bb",
-    "certification_declaration": "3081fe06092a864886f70d010702a081f03081ed0201033109300706052b0e03021a305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100cc6d9e30253e6de04c586eea69a587a71cd6f0936aea09fd2ef5b53e93b5278702201ed54646c500db8d7aea993fd81f729a22a86957b094db142eda2d5e68a6d00b",
-    "dac_private_key": "c4004cdaaa5d622c291be370dba85546acef0ae41baf776de02471e65cd1a28e",
-    "dac_public_key": "04a9b6fd74c864c67661aad0f1a19b0ed66d29e690db5e50ea69faa7bb21aa6d1bad40a1a69538e452561ff8aaca5d00578b168be854d4b3f0d37ca27f71d46f5c"
+    "dac_cert": "308201e33082018aa003020102020818d5679a80c485be300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043f504a85258308105d789fad8b9686b3c1f8e94c253109625bb1de84587de360dd12ab2fa97c913db03e8f37197e8ce2395f3e9b030ad8ab1ddee1a4d6287142a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a5f57dea9d8dce16995a071a98485ce8cd5a29a3301f0603551d2304183016801486797969584455dd4955e8de31dd2e3bf0b8786d300a06082a8648ce3d0403020347003044022057787dc1a1ae060af9e2db9b4472c9e3a80b3fc659a18175d8aa4aafd4bf25c10220045ec44d104531961904bcccf2967b437708fbd8f66c1b1579a18d25e9785b4d",
+    "pai_cert": "308201d33082017aa003020102020828b15ead56d26dcd300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042ebac935e9ea61e7f83e2a89d55aed38e57afbe5b6448d1cb4144c9cc5e65b10f55f6d2b981ebe9fe7e89445faec11f4994398edd61c30e8fff659ab1a556ba9a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041486797969584455dd4955e8de31dd2e3bf0b8786d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402203ae85c041ce766ce393d942d1cce8c4127cec8e61ee0742747b07a4ecbe7163e02206e2b81a014e84d818db39ff79e8701f7b1fce24b6158c20df9e5dd97b912920a",
+    "certification_declaration": "3081e606092a864886f70d010702a081d83081d50201033109300706052b0e03021a304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ca28ee68583948a3197e804cdd8db6cde1298938b157af05d52436ca87e8f1bd022100c3a8e7b678ab18cba8d0d861ec9900b09d881f306b379f4acf76ef5b47555d74",
+    "dac_private_key": "4eb80508cc57a369ba20f77e0c9f51a879a8cf9dbbaf580faa62b3cc6767a2de",
+    "dac_public_key": "043f504a85258308105d789fad8b9686b3c1f8e94c253109625bb1de84587de360dd12ab2fa97c913db03e8f37197e8ce2395f3e9b030ad8ab1ddee1a4d6287142"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/cd.der
index 475e2320453b13..bcce187088a959 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.der
index a5dd30714dac30..348a126db03310 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.pem
index 7f4824c302def2..d90f208ccb23ef 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIISKU4M8BWiB4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIII92aftCfi8owCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-dqqHm6oQEjtRk02BqnDueNw9IMoeDny1PkEdvSV5MTkQ5Ben6/Zp6+VloZ8MZA2/
-gIxY4CMu0DvvE9/wJFB4/6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFI8ovkl7pVxNprHkyeqn5AJSxhlhMB8GA1UdIwQYMBaAFL1L
-VQW/LTZJKIJUOJBDW0tBkT+GMAoGCCqGSM49BAMCA0kAMEYCIQDFpPxV428batig
-pjdgk7tgNmqUXfNPRJk1aDw2G+YDMwIhAOmrmjPc3K9qe/nFAoX7KNhdK4XP5+JM
-BHamHnljyJlF
+ClIP2AVz9ajmnUa1qMxYdOEOFXSDxf1MyioS8ldCPzjk/q3/kqNGuL0DVO/jewYB
+OCQ0kVcQKo3o9NIvB881RKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFCUP6M+BPiHqKIKYCf004AHDkvHyMB8GA1UdIwQYMBaAFH7X
+SnXb8bRDwDyQQ6JyPLiti3syMAoGCCqGSM49BAMCA0cAMEQCIEPBURktuoOUTmFb
+IoSAkb2cpLySmIUS0mCZmP4NfTPlAiBOhT57w3gORS21WXTUl5j0y4Y5kTxlYslz
+q/PAP3P4cw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.der
index c346570bb00587..55f236932a1176 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.pem
index 3573c6164f28c4..76eaa5e657b6e5 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOK6NPP0m2OJCcYd3rFdoaZlVeAhOiOm9ZbtS5dNYWZ9oAoGCCqGSM49
-AwEHoUQDQgAEdqqHm6oQEjtRk02BqnDueNw9IMoeDny1PkEdvSV5MTkQ5Ben6/Zp
-6+VloZ8MZA2/gIxY4CMu0DvvE9/wJFB4/w==
+MHcCAQEEIP+cL8AopHVhB/kQRqLrktxMlTIjlY3yPoQw337zZvYhoAoGCCqGSM49
+AwEHoUQDQgAEClIP2AVz9ajmnUa1qMxYdOEOFXSDxf1MyioS8ldCPzjk/q3/kqNG
+uL0DVO/jewYBOCQ0kVcQKo3o9NIvB881RA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.der
index 3e319cf12e99f4..7ae15b868b2a1e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.pem
index d12e6013c58864..575e72b9cd938e 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIITG3VmD3G9QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIBujXHy9UzuIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQtwnbAQX9fhAzJNi0x9yaqJxma+m+5
-+/guG2fbSSCg12AVRBSEMopDQko/XaFvGt0Ivl0qFlbTHr3c1jlPC3VYo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUvUtV
-Bb8tNkkoglQ4kENbS0GRP4YwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhALe5Yy7GcrPD/K7WDgHWTPxr0u0Tn/OV36tX
-jj19+KMOAiBCqxCu1rMKYbL9/Ju7L2PsG+csiIpSfNUiQvf3htprzA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQDllkTmb1eCgNcrKSbZ8TEFRbPaxYS
+hxC9sZn1qvtz0cR7O664Fx4ur7K8c4ZCj4UK2PhoUrbVuTp4SU9HEA9eo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUftdK
+ddvxtEPAPJBDonI8uK2LezIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAPWBvyCppR411mYSdAtqks6OR+0aMKAFOzYW
+BIolUPI3AiBRu1Ed14/pc1E8QiEGEenZgWimWyBnsNWDM8TFTfQq6A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.der
index 02a042a58c6a68..f5b8db1cc5bd96 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.pem
index 389a170b4f684f..f533de0587e0e3 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMeqqc2505KlX/H5wA5VRj4PdggDn1oovmWACOa6s+fyoAoGCCqGSM49
-AwEHoUQDQgAELcJ2wEF/X4QMyTYtMfcmqicZmvpvufv4Lhtn20kgoNdgFUQUhDKK
-Q0JKP12hbxrdCL5dKhZW0x693NY5Twt1WA==
+MHcCAQEEIDem8u8PhPzQ1vfo+9fnYsQF8gsPZFaVgKqtHdWYNldPoAoGCCqGSM49
+AwEHoUQDQgAEA5ZZE5m9XgoDXKykm2fExBUWz2sWEocQvbGZ9ar7c9HEezuuuBce
+Lq+yvHOGQo+FCtj4aFK21bk6eElPRxAPXg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/test_case_vector.json
index bac15927e1a0c0..2ff179954db243 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Valid CMS digest algorithm SHA256.",
     "is_success_case": "true",
-    "dac_cert": "308201e53082018aa003020102020848a53833c056881e300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000476aa879baa10123b51934d81aa70ee78dc3d20ca1e0e7cb53e411dbd2579313910e417a7ebf669ebe565a19f0c640dbf808c58e0232ed03bef13dff0245078ffa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148f28be497ba55c4da6b1e4c9eaa7e40252c61961301f0603551d23041830168014bd4b5505bf2d36492882543890435b4b41913f86300a06082a8648ce3d0403020349003046022100c5a4fc55e36f1b6ad8a0a6376093bb60366a945df34f449935683c361be60333022100e9ab9a33dcdcaf6a7bf9c50285fb28d85d2b85cfe7e24c0476a61e7963c89945",
-    "pai_cert": "308201d43082017aa00302010202082131b75660f71bd4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042dc276c0417f5f840cc9362d31f726aa27199afa6fb9fbf82e1b67db4920a0d76015441484328a43424a3f5da16f1add08be5d2a1656d31ebddcd6394f0b7558a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414bd4b5505bf2d36492882543890435b4b41913f86301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100b7b9632ec672b3c3fcaed60e01d64cfc6bd2ed139ff395dfab578e3d7df8a30e022042ab10aed6b30a61b2fdfc9bbb2f63ec1be72c888a527cd52242f7f786da6bcc",
-    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d934e704af35d291bce12c7354a62be19849735e8efec88d59bb28fe5f657df5022100bbacda2cbeda18eb656e404d3a970978506024449ea8cd68fb8f769d67ad73de",
-    "dac_private_key": "e2ba34f3f49b638909c61ddeb15da1a66555e0213a23a6f596ed4b974d61667d",
-    "dac_public_key": "0476aa879baa10123b51934d81aa70ee78dc3d20ca1e0e7cb53e411dbd2579313910e417a7ebf669ebe565a19f0c640dbf808c58e0232ed03bef13dff0245078ff"
+    "dac_cert": "308201e33082018aa003020102020823dd9a7ed09f8bca300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040a520fd80573f5a8e69d46b5a8cc5874e10e157483c5fd4cca2a12f257423f38e4feadff92a346b8bd0354efe37b06013824349157102a8de8f4d22f07cf3544a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414250fe8cf813e21ea28829809fd34e001c392f1f2301f0603551d230418301680147ed74a75dbf1b443c03c9043a2723cb8ad8b7b32300a06082a8648ce3d0403020347003044022043c151192dba83944e615b22848091bd9ca4bc92988512d2609998fe0d7d33e502204e853e7bc3780e452db55974d49798f4cb8639913c6562c973abf3c03f73f873",
+    "pai_cert": "308201d43082017aa003020102020806e8d71f2f54cee2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040396591399bd5e0a035caca49b67c4c41516cf6b16128710bdb199f5aafb73d1c47b3baeb8171e2eafb2bc7386428f850ad8f86852b6d5b93a78494f47100f5ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147ed74a75dbf1b443c03c9043a2723cb8ad8b7b32301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100f581bf20a9a51e35d66612740b6a92ce8e47ed1a30a0053b3616048a2550f237022051bb511dd78fe973513c42210611e9d98168a65b2067b0d58333c4c54df42ae8",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221008433a32e83d025d8463a54b34e6d99f96bc2bfda0c8c2c24d8b2d6f365995d5f0220116b9124447deefee2e09457b871be791e2bbbd1eb5f7abf75916e379bf71418",
+    "dac_private_key": "ff9c2fc028a4756107f91046a2eb92dc4c953223958df23e8430df7ef366f621",
+    "dac_public_key": "040a520fd80573f5a8e69d46b5a8cc5874e10e157483c5fd4cca2a12f257423f38e4feadff92a346b8bd0354efe37b06013824349157102a8de8f4d22f07cf3544"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/cd.der
index dffc045be1177f..546928c272842e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.der
index 31d1e0e77f0b4f..6b14ef513c97f0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.pem
index 32d323d8d0404c..57511be93e3b75 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIaazjpdp9GlUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIISIUWhG5x3VcwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-uRQnH/yQQzVCF2wpAIpRUFfLHGEidUWYpU/MWIbjSjwQnqz7Q0PgibBTPs8H5S5/
-cSP1bp9iCTqA/fz+CuCrvKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFFrbZzlwxWTb+4ABPlRwbFFPaoT7MB8GA1UdIwQYMBaAFIr1
-oy+jsBNYxUGNwpcjMM+ZuWSLMAoGCCqGSM49BAMCA0gAMEUCIHhM7WPf4MY+7/Nc
-/wXWCZxZ+5Gqicqs6SNU5JFl9zkqAiEAybT4Leql+aKVKZLmCOqmXFLhiCmPF4qf
-Y2lF/NrjbqU=
+qidXmIxyIl7w/EtvjruToQ78Gpq1uEbw8eOaf/8LSwnkeJ/9QnE/r10zwmu3hRGL
+RwVzlpaBtdwkvcMlMYyiPKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFI82OIXidp23BuszMoPha/Mqfg8lMB8GA1UdIwQYMBaAFHPz
+EZtU56Kqz0aYE7KlyTCM61ITMAoGCCqGSM49BAMCA0kAMEYCIQDeG7tM7scOeRwl
+dsZpCBTjUjz4ZWoUD/ighDslRvrclQIhAIGeUGFejlsIZ5S0tfh5pVBW4U/SU2HD
+jC2/jnuUVwe8
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.der
index 3236797a5bfd30..b224d7ec9c1654 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.pem
index 7c69c6b0a55ff5..ef9a0c38dd2389 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIL+r+uRByApNudYfV1lzHa9/0P77f2VYXlEg1YFcZYPoAoGCCqGSM49
-AwEHoUQDQgAEuRQnH/yQQzVCF2wpAIpRUFfLHGEidUWYpU/MWIbjSjwQnqz7Q0Pg
-ibBTPs8H5S5/cSP1bp9iCTqA/fz+CuCrvA==
+MHcCAQEEIDKTwPNPQpLnlblPIA98hdvk46YD7Uuuots8qPT/OKmHoAoGCCqGSM49
+AwEHoUQDQgAEqidXmIxyIl7w/EtvjruToQ78Gpq1uEbw8eOaf/8LSwnkeJ/9QnE/
+r10zwmu3hRGLRwVzlpaBtdwkvcMlMYyiPA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.der
index 50d44ba7697988..e7ee2529483c11 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.pem
index 975c9e8d4de97f..1c4705c141f229 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIUk5HAkGBwVswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIejFfWvoMkmQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCx+PkqubkGCox/frM8m0VSQZfnGp
-TWS+NxnKbySmRNaf5rlspqETBgLRGaTvBfe0ufKvolS+vZCcSk4UqSMYo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUivWj
-L6OwE1jFQY3ClyMwz5m5ZIswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhANa76pQpBvjOjUMZxs/IzrMoZ7jUrXf2SzLW
-t1QMdl79AiEAyvn5GkwlbUP/qt+YHvY+DGx8LmUgErlZ228kyKBRyW4=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQzTfHfXak+LXVQ1FbDgOUUV9KHBd0a
+B7Z92uPo2f/iqzNKtL8l+TQi86Yf5Yj9bihYhiJLBtZgAjByTeEeXDbwo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUc/MR
+m1TnoqrPRpgTsqXJMIzrUhMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJDiCyRYyW86dbQzgvUWsj3NUchlpI0nIqJ8
+nE7l9hl7AiBDlUY4aXjBWGNR8Y8RSSTXSwACWLQEcPltSsGZ1lq8BQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.der
index c1eb28fad71d70..5e13359761719d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.pem
index 411d7bdc9c45b7..22a5833f6b6ccb 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMVws14K7CCWVihcGsakKSLK05AKZ9WER1LNRkBSU4OUoAoGCCqGSM49
-AwEHoUQDQgAE2wsfj5Krm5BgqMf36zPJtFUkGX5xqU1kvjcZym8kpkTWn+a5bKah
-EwYC0Rmk7wX3tLnyr6JUvr2QnEpOFKkjGA==
+MHcCAQEEIC1oFciTYxhSe51EzmpCRsjwjq9DNh8QMi8qdkorJYTYoAoGCCqGSM49
+AwEHoUQDQgAEM03x312pPi11UNRWw4DlFFfShwXdGge2fdrj6Nn/4qszSrS/Jfk0
+IvOmH+WI/W4oWIYiSwbWYAIwck3hHlw28A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/test_case_vector.json
index 46ec5639c57fcc..4c0dc45cf7f2e6 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid CMS eContentType is set to Microsoft Authenticode [MSAC] OID = { 1.3.6.1.4.1.311.2.1.4 }.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020869ace3a5da7d1a55300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b914271ffc90433542176c29008a515057cb1c6122754598a54fcc5886e34a3c109eacfb4343e089b0533ecf07e52e7f7123f56e9f62093a80fdfcfe0ae0abbca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604145adb673970c564dbfb80013e54706c514f6a84fb301f0603551d230418301680148af5a32fa3b01358c5418dc2972330cf99b9648b300a06082a8648ce3d04030203480030450220784ced63dfe0c63eeff35cff05d6099c59fb91aa89caace92354e49165f7392a022100c9b4f82deaa5f9a2952992e608eaa65c52e188298f178a9f636945fcdae36ea5",
-    "pai_cert": "308201d53082017aa0030201020208524e47024181c15b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004db0b1f8f92ab9b9060a8c7f7eb33c9b45524197e71a94d64be3719ca6f24a644d69fe6b96ca6a1130602d119a4ef05f7b4b9f2afa254bebd909c4a4e14a92318a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148af5a32fa3b01358c5418dc2972330cf99b9648b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100d6bbea942906f8ce8d4319c6cfc8ceb32867b8d4ad77f64b32d6b7540c765efd022100caf9f91a4c256d43ffaadf981ef63e0c6c7c2e652012b959db6f24c8a051c96e",
-    "certification_declaration": "3082010506092a864886f70d010702a081f73081f4020103310d300b06096086480165030402013061060c060a2b060104018237020104a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022060f76293c68c5ba66807336606c0952eb9d822a719ff4d141fb8e4b0c1229576022100ca79502edac5331d966e42eb23d2916d9d79482de9d32858c4bb3468ae90f77c",
-    "dac_private_key": "82feafeb9107202936e7587d5d65cc76bdff43fbedfd9561794483560571960f",
-    "dac_public_key": "04b914271ffc90433542176c29008a515057cb1c6122754598a54fcc5886e34a3c109eacfb4343e089b0533ecf07e52e7f7123f56e9f62093a80fdfcfe0ae0abbc"
+    "dac_cert": "308201e53082018aa0030201020208488516846e71dd57300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004aa2757988c72225ef0fc4b6f8ebb93a10efc1a9ab5b846f0f1e39a7fff0b4b09e4789ffd42713faf5d33c26bb785118b470573969681b5dc24bdc325318ca23ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148f363885e2769db706eb333283e16bf32a7e0f25301f0603551d2304183016801473f3119b54e7a2aacf469813b2a5c9308ceb5213300a06082a8648ce3d0403020349003046022100de1bbb4ceec70e791c2576c6690814e3523cf8656a140ff8a0843b2546fadc95022100819e50615e8e5b086794b4b5f879a55056e14fd25361c38c2dbf8e7b945707bc",
+    "pai_cert": "308201d43082017aa00302010202087a315f5afa0c9264300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004334df1df5da93e2d7550d456c380e51457d28705dd1a07b67ddae3e8d9ffe2ab334ab4bf25f93422f3a61fe588fd6e285886224b06d6600230724de11e5c36f0a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041473f3119b54e7a2aacf469813b2a5c9308ceb5213301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210090e20b2458c96f3a75b43382f516b23dcd51c865a48d2722a27c9c4ee5f6197b0220439546386978c1586351f18f114924d74b000258b40470f96d4ac199d65abc05",
+    "certification_declaration": "3081ec06092a864886f70d010702a081de3081db020103310d300b06096086480165030402013048060c060a2b060104018237020104a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022024af5a9a1b5a67ad88ca2f457651c20a77d610d246727b14fb120e81ec044fc3022100867566c3b058593b135a2cb076c28bbf59bfe711caa2c38462abf0ebf1091d0a",
+    "dac_private_key": "3293c0f34f4292e795b94f200f7c85dbe4e3a603ed4baea2db3ca8f4ff38a987",
+    "dac_public_key": "04aa2757988c72225ef0fc4b6f8ebb93a10efc1a9ab5b846f0f1e39a7fff0b4b09e4789ffd42713faf5d33c26bb785118b470573969681b5dc24bdc325318ca23c"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/cd.der
index e4febc48721b5e..6855f7f0344bad 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.der
index 17a2c412a79827..d098ea97953d7e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.pem
index cdc6a08ab94256..ee79bc06bd0752 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIII8f2dsMKtOQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIPkxzWhmu6Y0wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-IIhcUMf6Uiyb7dMFrWrpL20yfnrVOQ6qQ+JoE3Ywp3dvSR4HB/e8jpcIrrq6WPSQ
-6w8FnZQgTF8/BYN1tJhyu6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFHXlAz5nm1QOc7VTjKJPhh9RzllXMB8GA1UdIwQYMBaAFNFs
-uoOFh/8nd1XG1P6SQNyPci7kMAoGCCqGSM49BAMCA0gAMEUCIBnqSp0QMzsorz+3
-mTAJqqhEKdUQ3yciI9aeVI6i3Q5SAiEAs6gImdOLNL+9pP30jMJA0WbZUHmvrO6U
-uyA2WTdwwmo=
+FJC+8WBJse/GpPzJNJeglUxOWtwpFniRmrIoSAUkYuLx2BHfuQuc0rbrIGmisK+A
+FnjxTqABrMrDgygjJz7UIqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFPM3owjb2LwurtraySYQI0Ho5FQUMB8GA1UdIwQYMBaAFIqn
+KNo+F4SrnC+SIvEv+dKQOR6cMAoGCCqGSM49BAMCA0cAMEQCIB8Wb2xG7BYXO4/Z
+5VFQyER97h8mO03pR/VXalWXRE9rAiAu6unQMzCLmiidTSVuomCi/tWxab6v0Y5o
+4tWfNwJyaw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.der
index cebe3b5580e651..8e2304b3d4382a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.pem
index 032e1067ffb3ec..8bdd11b6f94656 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOQQdgxUj4Gak8WZXTlPUQPorgIybsKoW5G9pz1OjbsuoAoGCCqGSM49
-AwEHoUQDQgAEIIhcUMf6Uiyb7dMFrWrpL20yfnrVOQ6qQ+JoE3Ywp3dvSR4HB/e8
-jpcIrrq6WPSQ6w8FnZQgTF8/BYN1tJhyuw==
+MHcCAQEEIMzCUn3e1eecgyVzBR0v4X/olr2msOLuMxD8fROUa33QoAoGCCqGSM49
+AwEHoUQDQgAEFJC+8WBJse/GpPzJNJeglUxOWtwpFniRmrIoSAUkYuLx2BHfuQuc
+0rbrIGmisK+AFnjxTqABrMrDgygjJz7UIg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.der
index 65c9b4d3b49234..5ec2568bcd897e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.pem
index 0d7d7472b25078..bcee5bc9ec2748 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIKzJhyani0/cwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIOxGW9n3jyrMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQH7IWQkm2ybCC+iwNOOqeSiEy0OyLh
-x2Qpd7uLRsmMX7QFiq53sexlHJYSyU8mnEim05uD4U3iLtIFl4w3FNmSo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU0Wy6
-g4WH/yd3VcbU/pJA3I9yLuQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAKtUne/gtPNiAtpbQq/gLKgoDaBLTBvhyaa7
-v4y9PPZtAiEAq+d+9LA+0BRV92/5ZoyXW71xXCCMUGQcCZK+HcDa3+k=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQqiXVkAkC0e+d9kNaBtbmSh9hQFphi
+i6DQlH8LZGEF7omwQg7nPbjL2xEs/H7y15tmt+aRmXxr9zKMK5xrgRDao2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiqco
+2j4XhKucL5Ii8S/50pA5HpwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAL7W7hJKVzl9A2evOW9UM873YZGmuM+8DmJo
+e7j1pKXtAiEA6BQDFLN2hScAsF6uly83an04y75c68I7M3wtIEvFcww=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.der
index 9fa0571af76195..5f0500304e2b8b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.pem
index 134e08335b466c..d1aa950eba0b17 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEUTf3EIxcJR2kdie5K116J+LfXPJlnAAOWJogsE0yxAoAoGCCqGSM49
-AwEHoUQDQgAEB+yFkJJtsmwgvosDTjqnkohMtDsi4cdkKXe7i0bJjF+0BYqud7Hs
-ZRyWEslPJpxIptObg+FN4i7SBZeMNxTZkg==
+MHcCAQEEIJzyoGT1S6SMKJU/5pL3gMccDCSuXmM2v/xO0SuTu4G2oAoGCCqGSM49
+AwEHoUQDQgAEKol1ZAJAtHvnfZDWgbW5kofYUBaYYoug0JR/C2RhBe6JsEIO5z24
+y9sRLPx+8tebZrfmkZl8a/cyjCuca4EQ2g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/test_case_vector.json
index 6663786a4a2920..2980c02f17585e 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Valid CMS eContentType pkcs7-data.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa003020102020823c7f676c30ab4e4300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000420885c50c7fa522c9bedd305ad6ae92f6d327e7ad5390eaa43e268137630a7776f491e0707f7bc8e9708aebaba58f490eb0f059d94204c5f3f058375b49872bba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041475e5033e679b540e73b5538ca24f861f51ce5957301f0603551d23041830168014d16cba838587ff277755c6d4fe9240dc8f722ee4300a06082a8648ce3d0403020348003045022019ea4a9d10333b28af3fb7993009aaa84429d510df272223d69e548ea2dd0e52022100b3a80899d38b34bfbda4fdf48cc240d166d95079afacee94bb2036593770c26a",
-    "pai_cert": "308201d53082017aa00302010202082b3261c9a9e2d3f7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000407ec8590926db26c20be8b034e3aa792884cb43b22e1c7642977bb8b46c98c5fb4058aae77b1ec651c9612c94f269c48a6d39b83e14de22ed205978c3714d992a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d16cba838587ff277755c6d4fe9240dc8f722ee4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100ab549defe0b4f36202da5b42afe02ca8280da04b4c1be1c9a6bbbf8cbd3cf66d022100abe77ef4b03ed01455f76ff9668c975bbd715c208c50641c0992be1dc0dadfe9",
-    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c56193c26339204622c3362e7d38c546cff314c33026eb2bef1be2ac647a21a902210087f25223fb20425a824923d862e2863cc20b3a21fbfb98ed46bd7cf3e88cbbc7",
-    "dac_private_key": "e410760c548f819a93c5995d394f5103e8ae02326ec2a85b91bda73d4e8dbb2e",
-    "dac_public_key": "0420885c50c7fa522c9bedd305ad6ae92f6d327e7ad5390eaa43e268137630a7776f491e0707f7bc8e9708aebaba58f490eb0f059d94204c5f3f058375b49872bb"
+    "dac_cert": "308201e33082018aa00302010202083e4c735a19aee98d300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041490bef16049b1efc6a4fcc93497a0954c4e5adc291678919ab22848052462e2f1d811dfb90b9cd2b6eb2069a2b0af801678f14ea001accac3832823273ed422a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f337a308dbd8bc2eaedadac926102341e8e45414301f0603551d230418301680148aa728da3e1784ab9c2f9222f12ff9d290391e9c300a06082a8648ce3d040302034700304402201f166f6c46ec16173b8fd9e55150c8447dee1f263b4de947f5576a5597444f6b02202eeae9d033308b9a289d4d256ea260a2fed5b169beafd18e68e2d59f3702726b",
+    "pai_cert": "308201d53082017aa00302010202083b1196f67de3cab3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042a8975640240b47be77d90d681b5b99287d8501698628ba0d0947f0b646105ee89b0420ee73db8cbdb112cfc7ef2d79b66b7e691997c6bf7328c2b9c6b8110daa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148aa728da3e1784ab9c2f9222f12ff9d290391e9c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100bed6ee124a57397d0367af396f5433cef76191a6b8cfbc0e62687bb8f5a4a5ed022100e8140314b376852700b05eae972f376a7d38cbbe5cebc23b337c2d204bc5730c",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100adf29a65c3a84a1a19e2968b997ca529fe579de5c8250a2bbd091c201dad44c80220797e85e16cb511d67a52b185a742257f9a81e7fde48fe6555adc85a2d467d649",
+    "dac_private_key": "ccc2527dded5e79c832573051d2fe17fe896bda6b0e2ee3310fc7d13946b7dd0",
+    "dac_public_key": "041490bef16049b1efc6a4fcc93497a0954c4e5adc291678919ab22848052462e2f1d811dfb90b9cd2b6eb2069a2b0af801678f14ea001accac3832823273ed422"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/cd.der
index 52e1d8b2b29c80..6d41ec2ffab39e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.der
index 99fd898cdce70b..3a659e7c0418e7 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.pem
index 449b0cda1961e8..bac4e8920cefab 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIBetDoiGQoM4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIbg6e+/HZYZswCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-7WYn3XVSsq/wT9Eq8YCgfYONqxiO5huLEJoNnCUmcuOZLALHHM6HG/UmlcQvKX9F
-nhoIB2kc58YPuU4M4OdUy6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFE3NXV+43iNuxiuN/7w9sZcp5FUvMB8GA1UdIwQYMBaAFNXO
-TfbMKamgTcdNlbgxEGQYddVfMAoGCCqGSM49BAMCA0cAMEQCIFfqWM0v3GMtc8nB
-9EZNYrUbOjS262tV169YtihLxzEtAiA5WWqy4i2FMu91XI7loHSVGoD2QcyVeQTj
-YZmGXHtMqQ==
+7IwAbJTMAy/DHefsin8N02kXXrSYyxQxdF/HNew0AJEuAAdRL3PApycCtjczBuXH
+fbtRsPuifLbmT00cY/9Tz6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFORVrKOZVgzg/gY0Coc6jd/qpYKTMB8GA1UdIwQYMBaAFF+2
+0pFjrigdEfx9idiv+dqC2g46MAoGCCqGSM49BAMCA0kAMEYCIQDlX0m8vrkZB/2x
+/OQZJgm7Qq1TykrC33LKVQt6OAF1uQIhAJRhkWiAEQ69zHZyLJeOXMb1/6CzI6ZO
+ktd9ayThwISN
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.der
index b7a31e7a1e2d5c..4615015309b43f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.pem
index 446c478aa64c5a..185754a1b2c52d 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP7gpLvwifggwOS0Jx7nJRNvuZR31c94v0XTNm2NiIJIoAoGCCqGSM49
-AwEHoUQDQgAE7WYn3XVSsq/wT9Eq8YCgfYONqxiO5huLEJoNnCUmcuOZLALHHM6H
-G/UmlcQvKX9FnhoIB2kc58YPuU4M4OdUyw==
+MHcCAQEEIDssgi1Nfu9sk1/cHw4fUOopzzmABEbFvWvDVSRAmOwloAoGCCqGSM49
+AwEHoUQDQgAE7IwAbJTMAy/DHefsin8N02kXXrSYyxQxdF/HNew0AJEuAAdRL3PA
+pycCtjczBuXHfbtRsPuifLbmT00cY/9Tzw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.der
index f585d45b9f9830..28fa81cfe720bc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.pem
index 8335d91fe0c5e3..cc5a7af0d75854 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIJi9kgBr37tQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIKXC610rP02gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARv+RUwomHntZS0sKQE2eMeG4Ns113K
-55cGe1DBfwBlokZt5mfDYcyTeF95rCPtmDByecrJvyEWna2VYKCx8CFVo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU1c5N
-9swpqaBNx02VuDEQZBh11V8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJJT7mZJLvmCCK12MU8MlerWxXfZHB77/V6l
-SL3ss5QFAiBg2gztHUkWpiw6mcSOOtqizmy7FfS+NDAgKrluOyMNjA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATOlMV9fTSX3xvilQhCVSzJ3d+YijKp
+tTEMHhCtPjZtKeyQT1qVEQJK2ePlOUIc6SIAF5mKfUPQwGc45kWb5X7do2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUX7bS
+kWOuKB0R/H2J2K/52oLaDjowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgdQI7sOpYSxo0KePhXQDKiTyHZ6BtTHZxH0mj
+qxgm1YYCIHaf/oq4vEaPGSJCOuioKAzy2djPqoJY237mmtqjOhQ5
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.der
index e8103a400af16d..672e6dcb479334 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.pem
index 8dfb6a9b7fc715..63529c74806b18 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIC9uFvpy4MFs8k8M4GkbhyPjMvuGgtYSWu+Cdp1C3sf+oAoGCCqGSM49
-AwEHoUQDQgAEb/kVMKJh57WUtLCkBNnjHhuDbNddyueXBntQwX8AZaJGbeZnw2HM
-k3hfeawj7ZgwcnnKyb8hFp2tlWCgsfAhVQ==
+MHcCAQEEIMx5xpDczQmT03yZEOpYR58vZGWvJCVOqkFhnGmGqXv1oAoGCCqGSM49
+AwEHoUQDQgAEzpTFfX00l98b4pUIQlUsyd3fmIoyqbUxDB4QrT42bSnskE9alREC
+Stnj5TlCHOkiABeZin1D0MBnOOZFm+V+3Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/test_case_vector.json
index cbef8ba2b1b94d..a137093200a2d1 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid CMS signature algorithm ECDSA_WITH_SHA1.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa003020102020805eb43a22190a0ce300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ed6627dd7552b2aff04fd12af180a07d838dab188ee61b8b109a0d9c252672e3992c02c71cce871bf52695c42f297f459e1a0807691ce7c60fb94e0ce0e754cba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144dcd5d5fb8de236ec62b8dffbc3db19729e4552f301f0603551d23041830168014d5ce4df6cc29a9a04dc74d95b83110641875d55f300a06082a8648ce3d0403020347003044022057ea58cd2fdc632d73c9c1f4464d62b51b3a34b6eb6b55d7af58b6284bc7312d022039596ab2e22d8532ef755c8ee5a074951a80f641cc957904e36199865c7b4ca9",
-    "pai_cert": "308201d43082017aa0030201020208262f64801af7eed4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200046ff91530a261e7b594b4b0a404d9e31e1b836cd75dcae797067b50c17f0065a2466de667c361cc93785f79ac23ed98307279cac9bf21169dad9560a0b1f02155a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d5ce4df6cc29a9a04dc74d95b83110641875d55f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009253ee66492ef98208ad76314f0c95ead6c577d91c1efbfd5ea548bdecb39405022060da0ced1d4916a62c3a99c48e3adaa2ce6cbb15f4be3430202ab96e3b230d8c",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300906072a8648ce3d0401044830460221008b344b948a2322356dff2b091859a4edd7deaafa61b336849af08656cf61828c022100a392c688e6177c5f8cfef6cc2849240097e1deb8213b4bdb95557d3ffacd183d",
-    "dac_private_key": "fee0a4bbf089f820c0e4b4271ee725136fb99477d5cf78bf45d3366d8d888248",
-    "dac_public_key": "04ed6627dd7552b2aff04fd12af180a07d838dab188ee61b8b109a0d9c252672e3992c02c71cce871bf52695c42f297f459e1a0807691ce7c60fb94e0ce0e754cb"
+    "dac_cert": "308201e53082018aa00302010202086e0e9efbf1d9619b300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ec8c006c94cc032fc31de7ec8a7f0dd369175eb498cb1431745fc735ec3400912e0007512f73c0a72702b6373306e5c77dbb51b0fba27cb6e64f4d1c63ff53cfa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e455aca399560ce0fe06340a873a8ddfeaa58293301f0603551d230418301680145fb6d29163ae281d11fc7d89d8aff9da82da0e3a300a06082a8648ce3d0403020349003046022100e55f49bcbeb91907fdb1fce4192609bb42ad53ca4ac2df72ca550b7a380175b90221009461916880110ebdcc76722c978e5cc6f5ffa0b323a64e92d77d6b24e1c0848d",
+    "pai_cert": "308201d33082017aa00302010202082970bad74acfd368300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ce94c57d7d3497df1be2950842552cc9dddf988a32a9b5310c1e10ad3e366d29ec904f5a9511024ad9e3e539421ce9220017998a7d43d0c06738e6459be57edda366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145fb6d29163ae281d11fc7d89d8aff9da82da0e3a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022075023bb0ea584b1a3429e3e15d00ca893c8767a06d4c76711f49a3ab1826d5860220769ffe8ab8bc468f1922423ae8a8280cf2d9d8cfaa8258db7ee69adaa33a1439",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300906072a8648ce3d04010447304502204cc9271c804ece5ea89f06e0c63843c795506a4c3a1d28f4a46d47c29c7db63b022100f461d4e5f10fea7f3f1ec0e74914c652a84cca9405391f77df497cb872bda61e",
+    "dac_private_key": "3b2c822d4d7eef6c935fdc1f0e1f50ea29cf39800446c5bd6bc355244098ec25",
+    "dac_public_key": "04ec8c006c94cc032fc31de7ec8a7f0dd369175eb498cb1431745fc735ec3400912e0007512f73c0a72702b6373306e5c77dbb51b0fba27cb6e64f4d1c63ff53cf"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/cd.der
index 5629f047d210d2..8f4df354f15406 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.der
index 68b2aeb3f5da5e..199c67a538e6b5 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.pem
index 09aa8e11f12dbe..2d66b2ec01ea52 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIHx/+qCnI3D8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIMvQyQYT+TiYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-uKnNfeXawCOf18CszNGtcOJCdFU/UyCLKHJE9+gx22KtpHGrFT4ig4SdTzjZzEGz
-DjiaXp6UtDjgR7dzoFGXJaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFIvUD50vX51LM7ZWiUhnPRK3m8XCMB8GA1UdIwQYMBaAFImh
-Lm1ABbKxXtfYUpBUKsgSMaivMAoGCCqGSM49BAMCA0gAMEUCIQC6gfPN9bb4kp+n
-xSRpgWUp69gudt57TBxy20r0zrxB/QIgTyUQxSWhQ+Z+lkgLHXwkO++eI1JJsXpE
-VMRA+jdxtR4=
+Cz+dvRIS+sAEbtrgSTnYUScOFlJ3/YyxIrM3OZ9mGZL8Duk7Uwr2+D8e1iVzFvhn
+73hpHRSyrlrsmFUa51hqBaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFAbu/Oc5FZAxlV3lnIiF9auKF7oQMB8GA1UdIwQYMBaAFF1C
+kLHIlb23cGrrDROR0hFcXGohMAoGCCqGSM49BAMCA0gAMEUCIQCsO7nGbS69lLev
+udH8JJxjcfTY4iuwNjb/aaytXLA9jQIgXOmR7+NoROrIPpIFyh7dNc6vQ0KwVH+W
+vRhjvj9pJgA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.der
index 7cd39bec3cc884..efd355dc9b2888 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.pem
index 2d0c3bc4df5b63..908cc31ce7fbcf 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIC5VyV5cJKdDW33DgAzfagP5bPs09qlf2bRl5detp6hcoAoGCCqGSM49
-AwEHoUQDQgAEuKnNfeXawCOf18CszNGtcOJCdFU/UyCLKHJE9+gx22KtpHGrFT4i
-g4SdTzjZzEGzDjiaXp6UtDjgR7dzoFGXJQ==
+MHcCAQEEID8brsD0aXA0+bwRr8xyCBYcSrJLaBV7/1kPoSE3mYYgoAoGCCqGSM49
+AwEHoUQDQgAECz+dvRIS+sAEbtrgSTnYUScOFlJ3/YyxIrM3OZ9mGZL8Duk7Uwr2
++D8e1iVzFvhn73hpHRSyrlrsmFUa51hqBQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.der
index a1191ea8bf1149..51c5adfc22e018 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.pem
index 9510cd58c5f429..ff659353ea6279 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIcGvX8CQYHIcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIGqedt6Hk7R0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS+A/77KY26MaMI6DhgQ0aqwlpke/hM
-6qpHd6lSd8RrW8GfMd/INjz7gJJ6OXNj5uT5RBU4k2jq584GBlWNKliEo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiaEu
-bUAFsrFe19hSkFQqyBIxqK8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAM/Q4Z2Ve4/TZTfUexB5Z5B/cvrDy91ebhje
-+D5b9SuTAiEAzFf4AEp2RccKhe6tsKdB8ElzLzrIYHpUS0wWE7uyTho=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARpAlL9eQiCvZzrXIWrhDrFxbQxYA9u
+2pRbQthNXR82TjXvYEeaGm2CRKvQvcVEjvVctZHBAo4nasfwRbF4vqBho2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUXUKQ
+sciVvbdwausNE5HSEVxcaiEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgInRft4Ewp5I4E+uGDHGSdw2C7cHCz+UxfCr+
+MUF2NYoCIAWC8NjHnJhuwXnscSaax+cv4QD8WybJObBauxnhPJlN
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.der
index 58fc538ba228d5..0d22efe39f4b72 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.pem
index fba4e6b59eb2b1..ff7f250352c170 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHOaPGmmli+hgLv42yoxuXW8EO9aY6RMuGokGXjT2rMIoAoGCCqGSM49
-AwEHoUQDQgAEvgP++ymNujGjCOg4YENGqsJaZHv4TOqqR3epUnfEa1vBnzHfyDY8
-+4CSejlzY+bk+UQVOJNo6ufOBgZVjSpYhA==
+MHcCAQEEILVt9IuMuo0UMF+pZNzbJnZmYJKGDv6BDUW6cQqL1Zr6oAoGCCqGSM49
+AwEHoUQDQgAEaQJS/XkIgr2c61yFq4Q6xcW0MWAPbtqUW0LYTV0fNk4172BHmhpt
+gkSr0L3FRI71XLWRwQKOJ2rH8EWxeL6gYQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/test_case_vector.json
index 324e771f040932..4a998f32779145 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha256/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Valid CMS signature algorithm ECDSA_WITH_SHA256.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa00302010202081f1ffea829c8dc3f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b8a9cd7de5dac0239fd7c0acccd1ad70e24274553f53208b287244f7e831db62ada471ab153e2283849d4f38d9cc41b30e389a5e9e94b438e047b773a0519725a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148bd40f9d2f5f9d4b33b6568948673d12b79bc5c2301f0603551d2304183016801489a12e6d4005b2b15ed7d85290542ac81231a8af300a06082a8648ce3d0403020348003045022100ba81f3cdf5b6f8929fa7c52469816529ebd82e76de7b4c1c72db4af4cebc41fd02204f2510c525a143e67e96480b1d7c243bef9e235249b17a4454c440fa3771b51e",
-    "pai_cert": "308201d53082017aa0030201020208706bd7f024181c87300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004be03fefb298dba31a308e838604346aac25a647bf84ceaaa4777a95277c46b5bc19f31dfc8363cfb80927a397363e6e4f94415389368eae7ce0606558d2a5884a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041489a12e6d4005b2b15ed7d85290542ac81231a8af301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100cfd0e19d957b8fd36537d47b107967907f72fac3cbdd5e6e18def83e5bf52b93022100cc57f8004a7645c70a85eeadb0a741f049732f3ac8607a544b4c1613bbb24e1a",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100f9f71dacadba36990cd390d9858873cf754972a638dff54bfe869de2f4943366022075a6f1b9b2bb86b5074f15b24999f019b28e580e15c0409fdbcc4c292328d342",
-    "dac_private_key": "2e55c95e5c24a7435b7dc3800cdf6a03f96cfb34f6a95fd9b465e5d7ada7a85c",
-    "dac_public_key": "04b8a9cd7de5dac0239fd7c0acccd1ad70e24274553f53208b287244f7e831db62ada471ab153e2283849d4f38d9cc41b30e389a5e9e94b438e047b773a0519725"
+    "dac_cert": "308201e43082018aa003020102020832f4324184fe4e26300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040b3f9dbd1212fac0046edae04939d851270e165277fd8cb122b337399f661992fc0ee93b530af6f83f1ed6257316f867ef78691d14b2ae5aec98551ae7586a05a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041406eefce739159031955de59c8885f5ab8a17ba10301f0603551d230418301680145d4290b1c895bdb7706aeb0d1391d2115c5c6a21300a06082a8648ce3d0403020348003045022100ac3bb9c66d2ebd94b7afb9d1fc249c6371f4d8e22bb03636ff69acad5cb03d8d02205ce991efe36844eac83e9205ca1edd35ceaf4342b0547f96bd1863be3f692600",
+    "pai_cert": "308201d33082017aa00302010202081aa79db7a1e4ed1d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004690252fd790882bd9ceb5c85ab843ac5c5b431600f6eda945b42d84d5d1f364e35ef60479a1a6d8244abd0bdc5448ef55cb591c1028e276ac7f045b178bea061a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145d4290b1c895bdb7706aeb0d1391d2115c5c6a21301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022022745fb78130a7923813eb860c7192770d82edc1c2cfe5317c2afe314176358a02200582f0d8c79c986ec179ec71269ac7e72fe100fc5b26c939b05abb19e13c994d",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220706cf8d088172ff3b477993f8e8c52a1ca8e55f9dc23d3945d8e1e8a4175d90002206f000bd775a4f8018cf0ed95eb2602f962c98d033addf86e84f350abcdf58e36",
+    "dac_private_key": "3f1baec0f4697034f9bc11afcc7208161c4ab24b68157bff590fa12137998620",
+    "dac_public_key": "040b3f9dbd1212fac0046edae04939d851270e165277fd8cb122b337399f661992fc0ee93b530af6f83f1ed6257316f867ef78691d14b2ae5aec98551ae7586a05"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_signature/cd.der
index a0c02537887c98..fd776a9955cff9 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_signature/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_signature/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.der
index c3f4436a81d0bb..3217e58e3d2a96 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.pem
index 0a7a11560403ad..a27ab2ebf18492 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIITodBibhaoAEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIDWHhFYPuTnEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-Dml60tber0B0bC4UOnwf3EXr92kg9iiO6XDkljevE9Sv7j4LWlYodNKZNBm46bNl
-MzvldG+Jdi70xw8+bROYfqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFM/bcX4oG2GonHl00T3mz6KLX4dxMB8GA1UdIwQYMBaAFOwJ
-lFqsH5sa6U4WQP5KBZ145OvtMAoGCCqGSM49BAMCA0kAMEYCIQD9lEVu68pczlhv
-UQnbiEzBS6oZ6feCWTXqA5NxjrIE3QIhAP/AdqK1yLdmBeGX7rmhYF9sNlu5Wn1h
-GYqvY/CUb5+O
+0F92o7I3zDc4rn96A8PZP6xt1Qd8HuGOEkzk1iKRTFhYs+yX0czhqxIHuH+oFHD5
+6i5wn2b0IGncT0g0A3FqIKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFK0k+rrN4yAFkSScwiAvMBQY9fT/MB8GA1UdIwQYMBaAFDGF
+2GezNAUahfe0Rq6mhGjJZ4vBMAoGCCqGSM49BAMCA0gAMEUCIQDnmqZ/BAh9lngP
+aOzUh0XtdCtXtsxYmJmIo7GIYMdOtwIgDXomXXHqD3ns25BmeHiXQvob+dbT2Z6N
+U7Yr+Nn3s0k=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.der
index 04ff5cf66d82fa..c6c06f8852437f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.pem
index b6ce1c16c0bfea..1e3fde598c28f2 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_signature/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKcP58Uz2uqUXUKqjzVPuecEaGDoZUKuyhGihkQE+1L3oAoGCCqGSM49
-AwEHoUQDQgAEDml60tber0B0bC4UOnwf3EXr92kg9iiO6XDkljevE9Sv7j4LWlYo
-dNKZNBm46bNlMzvldG+Jdi70xw8+bROYfg==
+MHcCAQEEINmiOCC0ow1aVmxCblRh2F1wfcxhdxIH/DEavOEhkegMoAoGCCqGSM49
+AwEHoUQDQgAE0F92o7I3zDc4rn96A8PZP6xt1Qd8HuGOEkzk1iKRTFhYs+yX0czh
+qxIHuH+oFHD56i5wn2b0IGncT0g0A3FqIA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.der
index e07cce6241b3c7..a16a21359937ed 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.pem
index f753c901fa206e..8547582436319b 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIZlhE88L24hkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIXfHDLSHA0OIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATDJ0DvKty0IOSjvoppJn1fFDWM+nyH
-/iI0XzUtDOBDP+WTJLyFzLYqU2NEKJwLWtsiXZYJorjQF0kKDtIGogtZo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7AmU
-WqwfmxrpThZA/koFnXjk6+0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhANjLZzb14B/jGMgdgHmyIP4hoEOxt6JHAOJR
-bCTRpAPYAiEArZjC09r6hLg80YGJzugkKyIKtsmpyVXvBftULE7wKFU=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQMx3pEMylCB0HcJu6VWoNh39IXSn6B
+5+03b/PJSJEQ/Y+KuEy73CHvNLBnNwrJTa3wHNKG2rtmgeqWAr3FTVP2o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUMYXY
+Z7M0BRqF97RGrqaEaMlni8EwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAPBbk/lbGBrKfTzVWnP19KVh/lL0CMUB34Qu
+uaYInMsiAiEAu46lRkOUKEMD10QV2sRf1OgUcdJWNa09Tgqd/af/JUU=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.der
index 321f91f97c4d7a..1b36967d8dddd0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.pem
index 7555fb7a732776..cd3e9b21db5846 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_signature/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAPrnEWEYOvBpG07XnZc92RdfvufXizdcVnZbMuRLESNoAoGCCqGSM49
-AwEHoUQDQgAEwydA7yrctCDko76KaSZ9XxQ1jPp8h/4iNF81LQzgQz/lkyS8hcy2
-KlNjRCicC1rbIl2WCaK40BdJCg7SBqILWQ==
+MHcCAQEEIBL7Sr/x44SY1g1K9eqNiuEl/r25MhOCC2u7j99OfYe3oAoGCCqGSM49
+AwEHoUQDQgAEDMd6RDMpQgdB3CbulVqDYd/SF0p+geftN2/zyUiREP2PirhMu9wh
+7zSwZzcKyU2t8BzShtq7ZoHqlgK9xU1T9g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_signature/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_signature/test_case_vector.json
index a5b1ba36d50678..b34880a9f677d5 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_signature/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_signature/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid CMS Signature.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa00302010202084e874189b85aa001300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040e697ad2d6deaf40746c2e143a7c1fdc45ebf76920f6288ee970e49637af13d4afee3e0b5a562874d2993419b8e9b365333be5746f89762ef4c70f3e6d13987ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cfdb717e281b61a89c7974d13de6cfa28b5f8771301f0603551d23041830168014ec09945aac1f9b1ae94e1640fe4a059d78e4ebed300a06082a8648ce3d0403020349003046022100fd94456eebca5cce586f5109db884cc14baa19e9f7825935ea0393718eb204dd022100ffc076a2b5c8b76605e197eeb9a1605f6c365bb95a7d61198aaf63f0946f9f8e",
-    "pai_cert": "308201d53082017aa0030201020208665844f3c2f6e219300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c32740ef2adcb420e4a3be8a69267d5f14358cfa7c87fe22345f352d0ce0433fe59324bc85ccb62a536344289c0b5adb225d9609a2b8d017490a0ed206a20b59a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ec09945aac1f9b1ae94e1640fe4a059d78e4ebed301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100d8cb6736f5e01fe318c81d8079b220fe21a043b1b7a24700e2516c24d1a403d8022100ad98c2d3dafa84b83cd18189cee8242b220ab6c9a9c955ef05fb542c4ef02855",
-    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d78b101a2f977e551c575ed5f355bb3feec9cd65cf39b69e431f74271cdf8c75022100c8da9da310a9b77784126617fe4a31a772819e661861498651541024f22ab066",
-    "dac_private_key": "a70fe7c533daea945d42aa8f354fb9e7046860e86542aeca11a2864404fb52f7",
-    "dac_public_key": "040e697ad2d6deaf40746c2e143a7c1fdc45ebf76920f6288ee970e49637af13d4afee3e0b5a562874d2993419b8e9b365333be5746f89762ef4c70f3e6d13987e"
+    "dac_cert": "308201e43082018aa00302010202080d61e11583ee4e71300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d05f76a3b237cc3738ae7f7a03c3d93fac6dd5077c1ee18e124ce4d622914c5858b3ec97d1cce1ab1207b87fa81470f9ea2e709f66f42069dc4f483403716a20a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ad24fabacde3200591249cc2202f301418f5f4ff301f0603551d230418301680143185d867b334051a85f7b446aea68468c9678bc1300a06082a8648ce3d0403020348003045022100e79aa67f04087d96780f68ecd48745ed742b57b6cc58989988a3b18860c74eb702200d7a265d71ea0f79ecdb906678789742fa1bf9d6d3d99e8d53b62bf8d9f7b349",
+    "pai_cert": "308201d53082017aa00302010202085df1c32d21c0d0e2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040cc77a443329420741dc26ee955a8361dfd2174a7e81e7ed376ff3c9489110fd8f8ab84cbbdc21ef34b067370ac94dadf01cd286dabb6681ea9602bdc54d53f6a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604143185d867b334051a85f7b446aea68468c9678bc1301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100f05b93f95b181aca7d3cd55a73f5f4a561fe52f408c501df842eb9a6089ccb22022100bb8ea5464394284303d74415dac45fd4e81471d25635ad3d4e0a9dfda7ff2545",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100bb2e93d0f26c24ace0c0cef10a0d81c0d84dcaa07d64589d62fb23147c24027a0220485ee2ba0a3e49fd2050e5d70c522e3dcb6484e03ca0439c2038d0d5d8f409a1",
+    "dac_private_key": "d9a23820b4a30d5a566c426e5461d85d707dcc61771207fc311abce12191e80c",
+    "dac_public_key": "04d05f76a3b237cc3738ae7f7a03c3d93fac6dd5077c1ee18e124ce4d622914c5858b3ec97d1cce1ab1207b87fa81470f9ea2e709f66f42069dc4f483403716a20"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_v2/cd.der
index a89a83ab121953..457f2737a7844f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v2/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_v2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.der
index 1719e845f1c116..aff9dbc1a72a86 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.pem
index 107a8467f67c6b..42f3611e3de35c 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIBnjr7G9ebzkwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIOtw8sUQYmqgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-uJcDCUisHQsDdpI4/WOlqVOuIYgwBN11PS4XfRIXblsx+11m1ZPdsn0eG8079OI3
-enPzfLH1c0Pc3rvc0hyUrqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFMLhLHfxZDcBGJKr9vXQLwIo+GupMB8GA1UdIwQYMBaAFEAN
-tiQG0VpJWZWszGb7wF21gjWJMAoGCCqGSM49BAMCA0kAMEYCIQCcWPT01sxKnNe/
-UDWhe3zmt/x1m2pqNcWVv7uttGGyUAIhAKq31bX8d7R5fjGdt5knmmM6WaT2uCBq
-Pxam9B71yHXq
+6emZo1jlYgnCKzjFEPs/72Skl+rkcxQ8VmlGFpygMaXjvkiryKvQmEWjkzbZirLK
+FO8r90utCs03ysSQ3rJiTaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFKWIi4NAwfe3yuuKpC+ZtxYGJA3HMB8GA1UdIwQYMBaAFEnJ
+YxIRw/jzDKS0hL7CqxEUthnNMAoGCCqGSM49BAMCA0kAMEYCIQCyvYoSggv69/m2
+tXv1snJRhKwtwXesbXFrYIzyD0xHswIhALExX6VqaSmqQSbr2tgGWN1ZwSR04wUa
+WtGO6JXep595
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.der
index e1e60cdc30ae4b..d809eb21669618 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.pem
index bac3a09a37e748..b7e647f1af2cb6 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILFi/V4koEHiGAN8NZ0Yeu53fQHrBILNAsOmQp1+bQ/2oAoGCCqGSM49
-AwEHoUQDQgAEuJcDCUisHQsDdpI4/WOlqVOuIYgwBN11PS4XfRIXblsx+11m1ZPd
-sn0eG8079OI3enPzfLH1c0Pc3rvc0hyUrg==
+MHcCAQEEIAMiv7qWtEXyrfKop3cfydVji77tRpw2kT84oTCWk8AdoAoGCCqGSM49
+AwEHoUQDQgAE6emZo1jlYgnCKzjFEPs/72Skl+rkcxQ8VmlGFpygMaXjvkiryKvQ
+mEWjkzbZirLKFO8r90utCs03ysSQ3rJiTQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.der
index 2c0184c5686590..fcd9fe590fad5f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.pem
index 46fa9cf3d961fd..32ef580a636415 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIINvg+dWL638MwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIITWEJgmP9FvowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATfDGYycYLdly5ZNtCZALecFS4K6N/x
-BSK1lGlknx0M/zjsgFoNcInlvsBpWZ3KNhh9zn6YmLXxU07iJ3KxwAggo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQA22
-JAbRWklZlazMZvvAXbWCNYkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKIpxdI5HmYxL9/WYtiVNLXvVFHZg1ynPuil
-EShV8kgNAiBMtB5k0MnCEP3MsCg5lpFoCv4dC0CMcbE+giwpjYQzmg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASNsCg4/yH5N8GRej5LGL5nXL27ZKaU
+pymJO490VSiI6N/kjg3GxAHmhMuKOeZI/yddYoyd/k6mSqu7GtZIsUt7o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUSclj
+EhHD+PMMpLSEvsKrERS2Gc0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgR2ge4pobJ/qFDBL5E8pga0ZGdwonBDhatP15
+lyzvMGkCIDztcTSAF06wuHDziLmAxkiMvOyZO6Fd/BrB1HNFtMYN
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.der
index 2ffe9060c507c1..ccfe219fde0183 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.pem
index 43e051863cb617..5d1a8ebcc09d3a 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIC1ScE4GhRwlsYx9mBl9cqiI8FIxixpdmeUB52LS2tbooAoGCCqGSM49
-AwEHoUQDQgAE3wxmMnGC3ZcuWTbQmQC3nBUuCujf8QUitZRpZJ8dDP847IBaDXCJ
-5b7AaVmdyjYYfc5+mJi18VNO4idyscAIIA==
+MHcCAQEEIPwv1gJm5mWoT+olXNxUqP3Er7Y++8p/gCBUX7MIiK+GoAoGCCqGSM49
+AwEHoUQDQgAEjbAoOP8h+TfBkXo+Sxi+Z1y9u2SmlKcpiTuPdFUoiOjf5I4NxsQB
+5oTLijnmSP8nXWKMnf5OpkqruxrWSLFLew==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v2/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_v2/test_case_vector.json
index d47b1d437b31ce..61d4d5141df782 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid CMS version set to v2.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa00302010202080678ebec6f5e6f39300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b897030948ac1d0b03769238fd63a5a953ae21883004dd753d2e177d12176e5b31fb5d66d593ddb27d1e1bcd3bf4e2377a73f37cb1f57343dcdebbdcd21c94aea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c2e12c77f16437011892abf6f5d02f0228f86ba9301f0603551d23041830168014400db62406d15a495995accc66fbc05db5823589300a06082a8648ce3d04030203490030460221009c58f4f4d6cc4a9cd7bf5035a17b7ce6b7fc759b6a6a35c595bfbbadb461b250022100aab7d5b5fc77b4797e319db799279a633a59a4f6b8206a3f16a6f41ef5c875ea",
-    "pai_cert": "308201d43082017aa003020102020836f83e7562fadfc3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004df0c66327182dd972e5936d09900b79c152e0ae8dff10522b59469649f1d0cff38ec805a0d7089e5bec069599dca36187dce7e9898b5f1534ee22772b1c00820a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414400db62406d15a495995accc66fbc05db5823589301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a229c5d2391e66312fdfd662d89534b5ef5451d9835ca73ee8a5112855f2480d02204cb41e64d0c9c210fdccb028399691680afe1d0b408c71b13e822c298d84339a",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020102310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207380d00c09bbbc2455d598f8242ad670a6ca351f255583ed23eb72ad1a36c41d022100a59ed7a414f5465872325942a2218edf15c4f00fb9ffef2d503540521d00c041",
-    "dac_private_key": "b162fd5e24a041e218037c359d187aee777d01eb0482cd02c3a6429d7e6d0ff6",
-    "dac_public_key": "04b897030948ac1d0b03769238fd63a5a953ae21883004dd753d2e177d12176e5b31fb5d66d593ddb27d1e1bcd3bf4e2377a73f37cb1f57343dcdebbdcd21c94ae"
+    "dac_cert": "308201e53082018aa00302010202083adc3cb144189aa8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e9e999a358e56209c22b38c510fb3fef64a497eae473143c566946169ca031a5e3be48abc8abd09845a39336d98ab2ca14ef2bf74bad0acd37cac490deb2624da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a5888b8340c1f7b7caeb8aa42f99b71606240dc7301f0603551d2304183016801449c9631211c3f8f30ca4b484bec2ab1114b619cd300a06082a8648ce3d0403020349003046022100b2bd8a12820bfaf7f9b6b57bf5b2725184ac2dc177ac6d716b608cf20f4c47b3022100b1315fa56a6929aa4126ebdad80658dd59c12474e3051a5ad18ee895dea79f79",
+    "pai_cert": "308201d33082017aa00302010202084d61098263fd16fa300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048db02838ff21f937c1917a3e4b18be675cbdbb64a694a729893b8f74552888e8dfe48e0dc6c401e684cb8a39e648ff275d628c9dfe4ea64aabbb1ad648b14b7ba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041449c9631211c3f8f30ca4b484bec2ab1114b619cd301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022047681ee29a1b27fa850c12f913ca606b4646770a2704385ab4fd79972cef306902203ced713480174eb0b870f388b980c6488cbcec993ba15dfc1ac1d47345b4c60d",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020102310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100eba961f6ebc6b94ff21c5b0e7b3c38c43e0b962bc2254478e707d5a19fee41d5022100b5891ea566ec4ff322c88ae42901537cbebd68cf8b9684d3be01dfc714f12aa6",
+    "dac_private_key": "0322bfba96b445f2adf2a8a7771fc9d5638bbeed469c36913f38a1309693c01d",
+    "dac_public_key": "04e9e999a358e56209c22b38c510fb3fef64a497eae473143c566946169ca031a5e3be48abc8abd09845a39336d98ab2ca14ef2bf74bad0acd37cac490deb2624d"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/cd.der b/credentials/development/commissioner_dut/struct_cd_cms_v3/cd.der
index 7f4b111ed2e187..fdb50778f3c24f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v3/cd.der and b/credentials/development/commissioner_dut/struct_cd_cms_v3/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.der
index f1daff9c6941f7..85375df24cd926 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.pem
index 89db9b1bcbfe5f..0ed5e2e4fa516e 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIAff8umNaPb4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIYJv1lX/tfVQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-dwJFiUCXGpJHgaKozoOkASn/fpFXNH0NNDap8EQha5q0aoWRsTks8/EG2ieR3til
-ND5W9a8knVw/i2xatIb0VqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFGgo+I0LleWWUsbkYBSUBuiNoJzfMB8GA1UdIwQYMBaAFPdG
-brQ62LAZk0LU47KQIVJzhEcxMAoGCCqGSM49BAMCA0gAMEUCIQDXNgtPm45wAgFf
-4tcEJvbNjX/Wfl/+BROeRFmRIuUBzQIgQbbMyUioRsxbZxd7fPIeEvY64nAorcg8
-81lrF6iS9uk=
+eJ3AX4SjiWQCTR7eeklvMjPH2mrZm4libKLREGeKb8Z1mwqaqc5M4pY65FQSRdYn
+wh6JuFRFubc2+v5VjiNBOKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFO5PuJnPWPzQCvcKXIlKNVjIkTy6MB8GA1UdIwQYMBaAFIHY
+DsuhJhjRS7J7bhGRBo4enhZdMAoGCCqGSM49BAMCA0cAMEQCID1jGWwH9CiiuGJW
+63eOIvdQ2GteZrZydzSE1JtwO08UAiBqR8cPG67/510PlcozUb007KUAsQE2JLsy
+LsPAIk9B0w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.der
index 9091f28d36db14..a4f8453410ef8d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.pem
index 5acd7bb499b167..d0c512d94fbca0 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v3/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEII1FUwgyDxZP+nJouH2WS3rOXgFNRT83GSkykhrxyekZoAoGCCqGSM49
-AwEHoUQDQgAEdwJFiUCXGpJHgaKozoOkASn/fpFXNH0NNDap8EQha5q0aoWRsTks
-8/EG2ieR3tilND5W9a8knVw/i2xatIb0Vg==
+MHcCAQEEIDRfNwGd9mFso6dQAWcxrOuR/9AEz0LtdyowTOh4PQ97oAoGCCqGSM49
+AwEHoUQDQgAEeJ3AX4SjiWQCTR7eeklvMjPH2mrZm4libKLREGeKb8Z1mwqaqc5M
+4pY65FQSRdYnwh6JuFRFubc2+v5VjiNBOA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.der
index a967702a3fe7d8..da36593c0189e1 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.pem
index 6bfbf2324ece0f..92c0aa19d61722 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIJkLJQne7zuswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIPPHEnu4tr1wwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQkz8bDSMVHPBEC43N6cjqB4tX7Lf1U
-i10dgfq78eB+AzTiX+jSGx1Y1JSxwBjk3wtkTKugxkDsD3RuqUbwjOuio2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU90Zu
-tDrYsBmTQtTjspAhUnOERzEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgSLADi3ZBrWkwmDI+c/erG1GmfFfyS3J+O01x
-iY4TUkMCIQDzhxWuBfNDKbFkBMuuyIrWLIJ44C3DcyVFVDOHZKjDlQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASxxf692cH1qJCVAb74gklI7t5cgHBO
+6caEbTZ/UGqAMvHHLy7S/gYcQGXY4q6uROQQfYVEqBRtFgujy+xjbdATo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUgdgO
+y6EmGNFLsntuEZEGjh6eFl0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgB+iUOD2tcW7d7J2lYmEFVxeKKI0vspFV/sZU
+PjwK0lkCIQDWcyTouSBV3Qf7mT8AKVAaTpHrNdW6GXrtqil8EUrzWA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.der
index ae3dbbf6e74d75..a8fc085a738eed 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.pem
index 073fb359d7fc87..2dc365c8df16ed 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v3/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM7eDm0ywOnTpS9a/VsROt2eKbgSKJVVA7ZyilSdesT3oAoGCCqGSM49
-AwEHoUQDQgAEJM/Gw0jFRzwRAuNzenI6geLV+y39VItdHYH6u/HgfgM04l/o0hsd
-WNSUscAY5N8LZEyroMZA7A90bqlG8Izrog==
+MHcCAQEEICF2yxxhlViko1gRRf0ds0mnHA37Ki/ED/q/8vtO8mq+oAoGCCqGSM49
+AwEHoUQDQgAEscX+vdnB9aiQlQG++IJJSO7eXIBwTunGhG02f1BqgDLxxy8u0v4G
+HEBl2OKurkTkEH2FRKgUbRYLo8vsY23QEw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_cms_v3/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_cms_v3/test_case_vector.json
index 4069d357a84679..42a211632e8c8e 100644
--- a/credentials/development/commissioner_dut/struct_cd_cms_v3/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_cms_v3/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Valid CMS version set to v3.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa003020102020801f7fcba635a3dbe300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047702458940971a924781a2a8ce83a40129ff7e9157347d0d3436a9f044216b9ab46a8591b1392cf3f106da2791ded8a5343e56f5af249d5c3f8b6c5ab486f456a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146828f88d0b95e59652c6e460149406e88da09cdf301f0603551d23041830168014f7466eb43ad8b0199342d4e3b290215273844731300a06082a8648ce3d0403020348003045022100d7360b4f9b8e7002015fe2d70426f6cd8d7fd67e5ffe05139e44599122e501cd022041b6ccc948a846cc5b67177b7cf21e12f63ae27028adc83cf3596b17a892f6e9",
-    "pai_cert": "308201d43082017aa00302010202082642c94277bbceeb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000424cfc6c348c5473c1102e3737a723a81e2d5fb2dfd548b5d1d81fabbf1e07e0334e25fe8d21b1d58d494b1c018e4df0b644caba0c640ec0f746ea946f08ceba2a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f7466eb43ad8b0199342d4e3b290215273844731301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022048b0038b7641ad693098323e73f7ab1b51a67c57f24b727e3b4d71898e135243022100f38715ae05f34329b16404cbaec88ad62c8278e02dc373254554338764a8c395",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022056ada9b84252bcd38a9a3416fdcd94f2bc58cb7f4e96b8c351b2d09c227e110c022100960f812ce9699e273a05b29d63c7baddb4224c16e9eaa43d0666b75ebc41c807",
-    "dac_private_key": "8d455308320f164ffa7268b87d964b7ace5e014d453f37192932921af1c9e919",
-    "dac_public_key": "047702458940971a924781a2a8ce83a40129ff7e9157347d0d3436a9f044216b9ab46a8591b1392cf3f106da2791ded8a5343e56f5af249d5c3f8b6c5ab486f456"
+    "dac_cert": "308201e33082018aa0030201020208609bf5957fed7d54300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004789dc05f84a38964024d1ede7a496f3233c7da6ad99b89626ca2d110678a6fc6759b0a9aa9ce4ce2963ae4541245d627c21e89b85445b9b736fafe558e234138a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ee4fb899cf58fcd00af70a5c894a3558c8913cba301f0603551d2304183016801481d80ecba12618d14bb27b6e1191068e1e9e165d300a06082a8648ce3d040302034700304402203d63196c07f428a2b86256eb778e22f750d86b5e66b672773484d49b703b4f1402206a47c70f1baeffe75d0f95ca3351bd34eca500b1013624bb322ec3c0224f41d3",
+    "pai_cert": "308201d43082017aa00302010202083cf1c49eee2daf5c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b1c5febdd9c1f5a8909501bef8824948eede5c80704ee9c6846d367f506a8032f1c72f2ed2fe061c4065d8e2aeae44e4107d8544a8146d160ba3cbec636dd013a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041481d80ecba12618d14bb27b6e1191068e1e9e165d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022007e894383dad716eddec9da562610557178a288d2fb29155fec6543e3c0ad259022100d67324e8b92055dd07fb993f0029501a4e91eb35d5ba197aedaa297c114af358",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210099df8a735ec4a09649c1221afe848abf3880d6ee5f398d9fd9f6f59da1250d2c022100b229ca249649a3faa81a1cd7b011e80437a65abf34e2c314820df31245bbe437",
+    "dac_private_key": "345f37019df6616ca3a750016731aceb91ffd004cf42ed772a304ce8783d0f7b",
+    "dac_public_key": "04789dc05f84a38964024d1ede7a496f3233c7da6ad99b89626ca2d110678a6fc6759b0a9aa9ce4ce2963ae4541245d627c21e89b85445b9b736fafe558e234138"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/cd.der
index 946d9fc2a32dee..439cff58b1a20c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.der
index 1503c715e4df1a..44ca5fe803cae2 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.pem
index a6386314f10f02..cb1f6ff69cf49f 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIN5c+V6/YlLwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIb8qDBTeaUcgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-E9aREPEQ6Ded8EKoejog9kh7qJ38vDa5+7hWpEeuy/csJ+JRdNNhedRWH9TXeDR+
-12GmbgRfWoR1XX7dN6btPaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFG+oPy7NjCXTyZOKRbrEx3hmPJptMB8GA1UdIwQYMBaAFA4K
-GGG0T3oxsx7moZWk/EmYKmFhMAoGCCqGSM49BAMCA0kAMEYCIQDffBxPYWlXfDNV
-5sm0duyGGL2nexiLkbyj6pV02e6OmAIhAIfoiSU6SbA7TE5Y4yB6sdVh1NJIQy2Z
-9mK1gwe67cvE
+j56BxTPaBPpl9ki2ilHjDnnNJSE/4OEkCN4sFhQ6mWOxhb4jsUmE6qhQcYAfx/TH
+PXnHxXZMZGbVS+3w2DnCtaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFJqdod5QNVMM+ErpgozOBog91MjGMB8GA1UdIwQYMBaAFGHN
+WMgCOEyNKwLaSD30v9y9clH+MAoGCCqGSM49BAMCA0gAMEUCIQC9HL8Z9sT4dV5r
+SjXliWBfcDzDOmIKaNTqtoA8bUasTAIgchHv4zVXkPrfhFI61nQlNk+5o/5LnYyg
+FoI5jnYe4AY=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.der
index 33f25f58012bc2..bff3f8407acae9 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.pem
index ec138ddc2591aa..38b59219c91d3f 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINhJAVcujwL/wE9efTdlKYHJqyfOvmCGY78ztqPOyS93oAoGCCqGSM49
-AwEHoUQDQgAEE9aREPEQ6Ded8EKoejog9kh7qJ38vDa5+7hWpEeuy/csJ+JRdNNh
-edRWH9TXeDR+12GmbgRfWoR1XX7dN6btPQ==
+MHcCAQEEIJIZGCuXjB1iquIiP5btqmMTFipwfk781wqUkJwhx+OXoAoGCCqGSM49
+AwEHoUQDQgAEj56BxTPaBPpl9ki2ilHjDnnNJSE/4OEkCN4sFhQ6mWOxhb4jsUmE
+6qhQcYAfx/THPXnHxXZMZGbVS+3w2DnCtQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.der
index 2325d8f0854bd1..efd279f9426a7f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.pem
index 19810aae42a67f..7d31976aeeef74 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIN8PbZJOFO4EwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIID5zIGacYPnQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQTkCR1ErcpIEeww8hoFOIs1nN7nIa3
-v4FTemkoYXRiYhXRhqPq2Ya/GAE5R8cSwFqQthweR9k6MPhgQIhKDZP1o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUDgoY
-YbRPejGzHuahlaT8SZgqYWEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgNI4iI7gLrLg7N8b1cHJgXD4RcUujR6sOClMx
-rYSUgYQCIBNEtXNqHbO1lJSj2alGHuOLTWY9rrN5RrvBDjtMMwbT
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARsSchUWv9hbnM2Gqr9PsBuNLroGrE9
+wLdEMaG9pGIfTdml1PZ7T6xbVGPp8Cb0FyvyOFcZ3QAuVHvS8fg0qLpLo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUYc1Y
+yAI4TI0rAtpIPfS/3L1yUf4wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgf8d/WabKkiwCsyMRWM7G1EsmREEWZGv7wHXQ
+nbAQ90QCIENfkloSUXTx2PtYw/RBhiRnInljVu/yr742K2X0mAHD
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.der
index acdd77ef738d6e..cfd9ad454fd183 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.pem
index 2d6da788a156b3..7ac7c06bb1c063 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKgIKaU8yo8RcqZdYPrufk5Cuz5bvuRr1QdRdA4ZvVHLoAoGCCqGSM49
-AwEHoUQDQgAEE5AkdRK3KSBHsMPIaBTiLNZze5yGt7+BU3ppKGF0YmIV0Yaj6tmG
-vxgBOUfHEsBakLYcHkfZOjD4YECISg2T9Q==
+MHcCAQEEIAmT9hzIKHvEJiBcmN5acFJANcSVkAOiV9cI/674UwKVoAoGCCqGSM49
+AwEHoUQDQgAEbEnIVFr/YW5zNhqq/T7AbjS66BqxPcC3RDGhvaRiH03ZpdT2e0+s
+W1Rj6fAm9Bcr8jhXGd0ALlR70vH4NKi6Sw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/test_case_vector.json
index eacc7f3e1a07cb..7ffc0e7136ace1 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id fild is not present and dac_origin_product_id is present.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa003020102020837973e57afd894bc300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000413d69110f110e8379df042a87a3a20f6487ba89dfcbc36b9fbb856a447aecbf72c27e25174d36179d4561fd4d778347ed761a66e045f5a84755d7edd37a6ed3da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146fa83f2ecd8c25d3c9938a45bac4c778663c9a6d301f0603551d230418301680140e0a1861b44f7a31b31ee6a195a4fc49982a6161300a06082a8648ce3d0403020349003046022100df7c1c4f6169577c3355e6c9b476ec8618bda77b188b91bca3ea9574d9ee8e9802210087e889253a49b03b4c4e58e3207ab1d561d4d248432d99f662b58307baedcbc4",
-    "pai_cert": "308201d33082017aa003020102020837c3db6493853b81300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041390247512b7292047b0c3c86814e22cd6737b9c86b7bf81537a69286174626215d186a3ead986bf18013947c712c05a90b61c1e47d93a30f86040884a0d93f5a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604140e0a1861b44f7a31b31ee6a195a4fc49982a6161301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220348e2223b80bacb83b37c6f57072605c3e11714ba347ab0e0a5331ad8494818402201344b5736a1db3b59494a3d9a9461ee38b4d663daeb37946bbc10e3b4c3306d3",
-    "certification_declaration": "3082010606092a864886f70d010702a081f83081f5020103310d300b0609608648016503040201306206092a864886f70d010701a0550453152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800250a0080360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220126f13eafead3c674a29d5f6cae02c6a8a42a75e6d50987f7ca6a5e988f2bf35022100bdd09b007cfe0d7576d510d0b11dfc11eded7f49ea61af12afc3df477eed8aff",
-    "dac_private_key": "d84901572e8f02ffc04f5e7d37652981c9ab27cebe608663bf33b6a3cec92f77",
-    "dac_public_key": "0413d69110f110e8379df042a87a3a20f6487ba89dfcbc36b9fbb856a447aecbf72c27e25174d36179d4561fd4d778347ed761a66e045f5a84755d7edd37a6ed3d"
+    "dac_cert": "308201e43082018aa00302010202086fca8305379a51c8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048f9e81c533da04fa65f648b68a51e30e79cd25213fe0e12408de2c16143a9963b185be23b14984eaa85071801fc7f4c73d79c7c5764c6466d54bedf0d839c2b5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604149a9da1de5035530cf84ae9828cce06883dd4c8c6301f0603551d2304183016801461cd58c802384c8d2b02da483df4bfdcbd7251fe300a06082a8648ce3d0403020348003045022100bd1cbf19f6c4f8755e6b4a35e589605f703cc33a620a68d4eab6803c6d46ac4c02207211efe3355790fadf84523ad67425364fb9a3fe4b9d8ca01682398e761ee006",
+    "pai_cert": "308201d33082017aa00302010202080f9cc819a7183e74300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200046c49c8545aff616e73361aaafd3ec06e34bae81ab13dc0b74431a1bda4621f4dd9a5d4f67b4fac5b5463e9f026f4172bf2385719dd002e547bd2f1f834a8ba4ba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041461cd58c802384c8d2b02da483df4bfdcbd7251fe301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207fc77f59a6ca922c02b3231158cec6d44b26444116646bfbc075d09db010f7440220435f925a125174f1d8fb58c3f44186246722796356eff2afbe362b65f49801c3",
+    "certification_declaration": "3081ec06092a864886f70d010702a081de3081db020103310d300b0609608648016503040201304906092a864886f70d010701a03c043a152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800250a008018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402200d624e7be3c6724f1d4daa489b95110f06c9444f562a8d9798bed064ff562eca022052f07ef535ab980a5def109859c48f82b8a7390d0841d3bce756e57d2b664900",
+    "dac_private_key": "9219182b978c1d62aae2223f96edaa6313162a707e4efcd70a94909c21c7e397",
+    "dac_public_key": "048f9e81c533da04fa65f648b68a51e30e79cd25213fe0e12408de2c16143a9963b185be23b14984eaa85071801fc7f4c73d79c7c5764c6466d54bedf0d839c2b5"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/cd.der
index 17720cae56c52f..73b2f33a6f4316 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.der
index 6fad516397c048..5930d40801838f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.pem
index dc9ef8c6248228..802642bb69224f 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIFzxUc6nJ8oEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIITVDSOh+/Gg4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-NwWonmb3xT+x/P4ey9UWM87KBZGwcUXHxPFH0rh+sWDD31CvVqThJ7IpNR63kV6j
-eOPT42qqiHckQGFy4oDAX6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFC/Takh6/cm2WZ1F7R0lkn+qS0o9MB8GA1UdIwQYMBaAFOzd
-NYioNpGQ43wdxDsg55UWUoS6MAoGCCqGSM49BAMCA0gAMEUCIQDU4izaqnmGpDM0
-IUtu4eYWop9VduLMevJYRoPJGKLC1gIgDO+9fvyEx2i/KFpVnx073VumhsmePmfg
-VTO+5zDfdTQ=
++tWEOsag5s51lSU2FMoMz6dUv/Rwnt9o/4HQ89rg2FdKyv1w5Bhot1jufQDEEMS/
+lWuljL6DK+mPk2sdnC+o6KNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFI+rtj5YUaXyEs5ayu2MRI5VTRSBMB8GA1UdIwQYMBaAFHNk
+kEDHCvSvu7G73tKDd7sUomFnMAoGCCqGSM49BAMCA0gAMEUCIQCFM6OLKjgX2VEa
+P5JT6fIqBdaG6EoB2J/vLUwxXiEX1gIgf/dzLbHcglQSNHieeoL2gxdEDxO570UQ
+pIOB++DH6wA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.der
index 7579d965fa0248..bae564c561ec9b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.pem
index 3713cc0cae7a01..4e512374d06f03 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHSZgUawD8hnF9XJqXOoSB1Kst+XatzHhUdYHVecjY7MoAoGCCqGSM49
-AwEHoUQDQgAENwWonmb3xT+x/P4ey9UWM87KBZGwcUXHxPFH0rh+sWDD31CvVqTh
-J7IpNR63kV6jeOPT42qqiHckQGFy4oDAXw==
+MHcCAQEEINnbH01hrvi7c45wOXDfduTT8UqClbE/+UwU8SEtQJMtoAoGCCqGSM49
+AwEHoUQDQgAE+tWEOsag5s51lSU2FMoMz6dUv/Rwnt9o/4HQ89rg2FdKyv1w5Bho
+t1jufQDEEMS/lWuljL6DK+mPk2sdnC+o6A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.der
index e6fe7997607876..edb97ae9109f32 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.pem
index fc85bcefd1a86f..c9bf8ffc9cb5fd 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIaAV2pI71JRAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIJmFpITcenJ0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ9AigDkzgFw7pcpgC0UoBl82OKFFCt
-gY2sC+nHwbsiQapUCLSkG5qX0jGoVCk18f1244gRsDY586ejcGRsX/zzo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7N01
-iKg2kZDjfB3EOyDnlRZShLowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAIaAhAGgG7aTvWOeBirLbSOkcpIkAUIaCRq6
-/KFbL4QPAiEA6ru/+1su/ICzViB+T5jOZ0z1gqQtK8XR43kNNQW6vyM=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASS6eV5eoUhSBA/YNoB/dEqtjYCwpfo
+/lZjVtfYnlc/diFs6v43ml1rPqFo0OvyNTcnLhpY0ZAhwhbdE9y8KF5uo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUc2SQ
+QMcK9K+7sbve0oN3uxSiYWcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgMmudQd7/DSaeXtTeYeexn00k9/aDIUFRmNgx
+ZLzSAncCIQDhts7UeOW8NI2dwrch+hvgIuVlj/8DNhWFrDCkceS5Ew==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.der
index 7a2692d0ff3616..4251febab1631e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.pem
index c019b24312e92e..a04fc45b884b44 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBHrRyIKtaJR5EL5bbHqjllVxXu4ngVyzAK6SWMCEYZloAoGCCqGSM49
-AwEHoUQDQgAEPQIoA5M4BcO6XKYAtFKAZfNjihRQrYGNrAvpx8G7IkGqVAi0pBua
-l9IxqFQpNfH9duOIEbA2OfOno3BkbF/88w==
+MHcCAQEEIM+NFOv4Y8slweQjNK1LF6Yhcbpo+ukEc09kBaFmt6kToAoGCCqGSM49
+AwEHoUQDQgAEkunleXqFIUgQP2DaAf3RKrY2AsKX6P5WY1bX2J5XP3YhbOr+N5pd
+az6haNDr8jU3Jy4aWNGQIcIW3RPcvChebg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/test_case_vector.json
index ec0708143802e6..00671b42ba8781 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id and dac_origin_product_id fields are not present.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa0030201020208173c5473a9c9f281300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043705a89e66f7c53fb1fcfe1ecbd51633ceca0591b07145c7c4f147d2b87eb160c3df50af56a4e127b229351eb7915ea378e3d3e36aaa887724406172e280c05fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604142fd36a487afdc9b6599d45ed1d25927faa4b4a3d301f0603551d23041830168014ecdd3588a8369190e37c1dc43b20e795165284ba300a06082a8648ce3d0403020348003045022100d4e22cdaaa7986a43334214b6ee1e616a29f5576e2cc7af2584683c918a2c2d602200cefbd7efc84c768bf285a559f1d3bdd5ba686c99e3e67e05533bee730df7534",
-    "pai_cert": "308201d53082017aa0030201020208680576a48ef52510300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043d022803933805c3ba5ca600b4528065f3638a1450ad818dac0be9c7c1bb2241aa5408b4a41b9a97d231a8542935f1fd76e38811b03639f3a7a370646c5ffcf3a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ecdd3588a8369190e37c1dc43b20e795165284ba301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210086808401a01bb693bd639e062acb6d23a472922401421a091abafca15b2f840f022100eabbbffb5b2efc80b356207e4f98ce674cf582a42d2bc5d1e3790d3505babf23",
-    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022062a5599b044e3d22014801194c59118145f4e8e2fa98188356426e232b497aaa0220293921578e23e3d85dc9df00226b8aa4ef3cfc5ebd04d4c9fe288721a6b93420",
-    "dac_private_key": "74998146b00fc86717d5c9a973a8481d4ab2df976adcc78547581d579c8d8ecc",
-    "dac_public_key": "043705a89e66f7c53fb1fcfe1ecbd51633ceca0591b07145c7c4f147d2b87eb160c3df50af56a4e127b229351eb7915ea378e3d3e36aaa887724406172e280c05f"
+    "dac_cert": "308201e43082018aa00302010202084d50d23a1fbf1a0e300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fad5843ac6a0e6ce7595253614ca0ccfa754bff4709edf68ff81d0f3dae0d8574acafd70e41868b758ee7d00c410c4bf956ba58cbe832be98f936b1d9c2fa8e8a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148fabb63e5851a5f212ce5acaed8c448e554d1481301f0603551d2304183016801473649040c70af4afbbb1bbded28377bb14a26167300a06082a8648ce3d04030203480030450221008533a38b2a3817d9511a3f9253e9f22a05d686e84a01d89fef2d4c315e2117d602207ff7732db1dc82541234789e7a82f68317440f13b9ef4510a48381fbe0c7eb00",
+    "pai_cert": "308201d43082017aa003020102020826616921371e9c9d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000492e9e5797a852148103f60da01fdd12ab63602c297e8fe566356d7d89e573f76216ceafe379a5d6b3ea168d0ebf23537272e1a58d19021c216dd13dcbc285e6ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041473649040c70af4afbbb1bbded28377bb14a26167301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220326b9d41deff0d269e5ed4de61e7b19f4d24f7f68321415198d83164bcd20277022100e1b6ced478e5bc348d9dc2b721fa1be022e5658fff03361585ac30a471e4b913",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203917850d875473d4ceea249b1a69f3298db296c912b193dca184a9e98f111e4e022100bca116dedfcc576533d1a2912ecd005bc6fd3fecfdd850c5db2da30100ab4ea2",
+    "dac_private_key": "d9db1f4d61aef8bb738e703970df76e4d3f14a8295b13ff94c14f1212d40932d",
+    "dac_public_key": "04fad5843ac6a0e6ce7595253614ca0ccfa754bff4709edf68ff81d0f3dae0d8574acafd70e41868b758ee7d00c410c4bf956ba58cbe832be98f936b1d9c2fa8e8"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/cd.der
index cf7a8f036274d5..3b37b8ccc60b0e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.der
index 9856168f56fa5d..132446adc1533c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.pem
index ece9389db67033..217e06802d1dc6 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIILY2cVqGzLVYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIILF+VcdyluGEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-xus3QGDvf25ZyvScm3itALu5C7gyeAB+nQcvqFmg0XxXds8lMThUDKCaGCUyUR8a
-NO/xcmBPH/rf4+nwrzVFkKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFG2VAgwn4ERoASi3Xo+9yfnc9n/YMB8GA1UdIwQYMBaAFEe6
-9EsY7aJOg7cB4ksA+z1q6qvHMAoGCCqGSM49BAMCA0kAMEYCIQC3AiriaqkEARhu
-dK0cE/EcCsVNnqrRvNwHEJ5+fyp/LgIhAO0zviDtXCs+sJnyXymfMF7rpbhv/3fK
-2zjETEu4l3x7
+PNnZCKD963b6QHCGIctixMoyvkfPacIlBx7lLMkAsPYRZDzuR+K9rd3RRfJbprEg
+VBMeVo9Y+aNf+mWWOg9g86NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFKcW+ubD2eqpUAF7qOmW+aAGoSbcMB8GA1UdIwQYMBaAFKA6
+yLPKKIsJU47Bv4zEQ+7IaEk3MAoGCCqGSM49BAMCA0gAMEUCIQC+++zpww0DqlN5
+PlGHuS9kETNFmGXVFNgYouFCO1LhawIgE0BsLWoV4sjN3xiKgON/09HFeaht+jV4
+fQe/cV+HqzA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.der
index 1cfd238785054e..2bc326e1e523b1 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.pem
index 36d768b1cd3056..f67547412c18c6 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEKsAC1GNU5otNnBgH1vsqARYUJXPVQeczz7wEm6GlTcoAoGCCqGSM49
-AwEHoUQDQgAExus3QGDvf25ZyvScm3itALu5C7gyeAB+nQcvqFmg0XxXds8lMThU
-DKCaGCUyUR8aNO/xcmBPH/rf4+nwrzVFkA==
+MHcCAQEEINv2GCx/zb0bmKuMEcNxQwepy40PiKKpaNJm6Ue0u9Y4oAoGCCqGSM49
+AwEHoUQDQgAEPNnZCKD963b6QHCGIctixMoyvkfPacIlBx7lLMkAsPYRZDzuR+K9
+rd3RRfJbprEgVBMeVo9Y+aNf+mWWOg9g8w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.der
index 455e245ba52d37..f80beff796cdf1 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.pem
index e5d512f58b4bcb..fa71356f74437a 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIf/UiU84qYy0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIPwLZlRjjcswwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASQJ7ef2USioSL7qiT2l4z+XDSX6cuo
-o+sxvBC2VZyjQx6vRa89bLrvhjcwUWaglveGsKSQnH5ghsq7fQiQKaG/o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUR7r0
-Sxjtok6DtwHiSwD7PWrqq8cwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAPtozGKjANywu/VOvoJ1avlKVMxh6qbAKysA
-x24/odjEAiA+UcWqD9oHZtKapLtvvhlNsCU8tWIHtxFDose6ebI7ig==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATARxCVFHhifFu24EZqgcOLi9EKnDNP
+8Qo+3TcXow55LPU0eKG8WfpT1qU5sqCmAirWU4PRre4witfGWv+UaF8Do2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoDrI
+s8ooiwlTjsG/jMRD7shoSTcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAO25LZ1BiBqZDerilV1KedA9zLy/YHoMh9B7
+UuAxfojAAiEA+3BxO9FAmXuGmDxRdTyTxPwJzvQVAD18qzcQBYyO7QA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.der
index 67d0efd48f40f0..cec12de443febc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.pem
index f378418954fa57..9db45ee2201084 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMRbyq0BucetfRDLzNLcSXSluV10goA4Zo2uvdj/gh/xoAoGCCqGSM49
-AwEHoUQDQgAEkCe3n9lEoqEi+6ok9peM/lw0l+nLqKPrMbwQtlWco0Mer0WvPWy6
-74Y3MFFmoJb3hrCkkJx+YIbKu30IkCmhvw==
+MHcCAQEEIKY8N5kKcFBUoNWevotyFbuQmI5bFzFj6CtnFuTF2bVjoAoGCCqGSM49
+AwEHoUQDQgAEwEcQlRR4YnxbtuBGaoHDi4vRCpwzT/EKPt03F6MOeSz1NHihvFn6
+U9alObKgpgIq1lOD0a3uMIrXxlr/lGhfAw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/test_case_vector.json
index 6dd2ca5da1c00f..5fe58f4d0cbfbc 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_match/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id and dac_origin_product_id fields present and contain the VID and PID values that match the VID and PID found in the DAC Subject DN.",
     "is_success_case": "true",
-    "dac_cert": "308201e53082018aa00302010202082d8d9c56a1b32d56300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c6eb374060ef7f6e59caf49c9b78ad00bbb90bb83278007e9d072fa859a0d17c5776cf253138540ca09a182532511f1a34eff172604f1ffadfe3e9f0af354590a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146d95020c27e044680128b75e8fbdc9f9dcf67fd8301f0603551d2304183016801447baf44b18eda24e83b701e24b00fb3d6aeaabc7300a06082a8648ce3d0403020349003046022100b7022ae26aa90401186e74ad1c13f11c0ac54d9eaad1bcdc07109e7e7f2a7f2e022100ed33be20ed5c2b3eb099f25f299f305eeba5b86fff77cadb38c44c4bb8977c7b",
-    "pai_cert": "308201d43082017aa00302010202087ff52253ce2a632d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049027b79fd944a2a122fbaa24f6978cfe5c3497e9cba8a3eb31bc10b6559ca3431eaf45af3d6cbaef8637305166a096f786b0a4909c7e6086cabb7d089029a1bfa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041447baf44b18eda24e83b701e24b00fb3d6aeaabc7301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100fb68cc62a300dcb0bbf54ebe82756af94a54cc61eaa6c02b2b00c76e3fa1d8c402203e51c5aa0fda0766d29aa4bb6fbe194db0253cb56207b71143a2c7ba79b23b8a",
-    "certification_declaration": "3082010a06092a864886f70d010702a081fc3081f9020103310d300b0609608648016503040201306606092a864886f70d010701a0590457152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408002509f1ff250a0080360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100eb0602ea25f357700d6f39582d2cc273764fd7a48d4f78b672471c173b0fc59902202029f73f5cb06d0dce4b872ffb61559d6d83d3a7b6d7448022e2f0b32bf7fd55",
-    "dac_private_key": "42ac002d46354e68b4d9c1807d6fb2a0116142573d541e733cfbc049ba1a54dc",
-    "dac_public_key": "04c6eb374060ef7f6e59caf49c9b78ad00bbb90bb83278007e9d072fa859a0d17c5776cf253138540ca09a182532511f1a34eff172604f1ffadfe3e9f0af354590"
+    "dac_cert": "308201e43082018aa00302010202082c5f9571dca5b861300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043cd9d908a0fdeb76fa40708621cb62c4ca32be47cf69c225071ee52cc900b0f611643cee47e2bdadddd145f25ba6b12054131e568f58f9a35ffa65963a0f60f3a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a716fae6c3d9eaa950017ba8e996f9a006a126dc301f0603551d23041830168014a03ac8b3ca288b09538ec1bf8cc443eec8684937300a06082a8648ce3d0403020348003045022100befbece9c30d03aa53793e5187b92f641133459865d514d818a2e1423b52e16b022013406c2d6a15e2c8cddf188a80e37fd3d1c579a86dfa35787d07bf715f87ab30",
+    "pai_cert": "308201d53082017aa00302010202083f02d99518e372cc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c04710951478627c5bb6e0466a81c38b8bd10a9c334ff10a3edd3717a30e792cf53478a1bc59fa53d6a539b2a0a6022ad65383d1adee308ad7c65aff94685f03a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a03ac8b3ca288b09538ec1bf8cc443eec8684937301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100edb92d9d41881a990deae2955d4a79d03dccbcbf607a0c87d07b52e0317e88c0022100fb70713bd140997b86983c51753c93c4fc09cef415003d7cab3710058c8eed00",
+    "certification_declaration": "3081f106092a864886f70d010702a081e33081e0020103310d300b0609608648016503040201304d06092a864886f70d010701a040043e152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408002509f1ff250a008018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100cd9628a064b0421c0f2fb5ea4ddc4fadba37c70fc3fac7ba885121cb45f49384022069a14a56376e8155610eef914234a07952dc3b1287ce46926fd9b14c045ed04a",
+    "dac_private_key": "dbf6182c7fcdbd1b98ab8c11c3714307a9cb8d0f88a2a968d266e947b4bbd638",
+    "dac_public_key": "043cd9d908a0fdeb76fa40708621cb62c4ca32be47cf69c225071ee52cc900b0f611643cee47e2bdadddd145f25ba6b12054131e568f58f9a35ffa65963a0f60f3"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/cd.der
index ba396736737841..b884b2fecbde44 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.der
index b3055d781f8fc2..10ea137c88570d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.pem
index e29ad1354f73f3..1cc5aefcb42a1a 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIRT4kWtqebgIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIAajvd5WDQZowCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-KmN1yIIGzgi2b0nV1iHeDJVw8c/xaMAnAd/3kd/K+McCI6zStMr+NRf3XcaCWl2A
-1KSH39/lRFbK2ylhqRC1XaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFOH57la50tXT+kz+ziG+ba1B/qAdMB8GA1UdIwQYMBaAFP0J
-pVBELan2bsfbUN0DvyguZFopMAoGCCqGSM49BAMCA0gAMEUCIQC5oJ4pxJQ0wHLg
-qwO4d1rmhCnY5Bydd+8ZsFHfOtn8OwIgelpUZZlfOir18vw4I81w/3V1N0yegzhe
-yR7dWTzYTyE=
+a6ecxqhX5FY6rjKQSUzYaSSLW1UdfseOIG152SOe87lIpplo4dygliZH8W3nj5sd
+RBTXOnJLnrO8u6ym37PHu6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFO1fznUPT7quh3ne2ZkL137XT13rMB8GA1UdIwQYMBaAFA5e
+AVT6g4Uuqb19UTZ4zmIbEtsXMAoGCCqGSM49BAMCA0cAMEQCIG9vAtl3+30LV4KR
+SnZHH28otrrOa6Ig9r0pEbiOZax4AiBP6cWJOnE7/GUHnhfxgpSbHn8wwTAOIaOE
+zgaEpr83pA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.der
index 16e737757106fe..328a5766d313cf 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.pem
index 0c31a2896fb965..361f3257cc20c4 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFig2eRdcriJq/J0Yw2p7hXf0B3oZy/O6l8glWcl39oZoAoGCCqGSM49
-AwEHoUQDQgAEKmN1yIIGzgi2b0nV1iHeDJVw8c/xaMAnAd/3kd/K+McCI6zStMr+
-NRf3XcaCWl2A1KSH39/lRFbK2ylhqRC1XQ==
+MHcCAQEEIFQNd7a4chBy7rWtsDRbb6KKnvYWDcGP5v+E/YRXcINaoAoGCCqGSM49
+AwEHoUQDQgAEa6ecxqhX5FY6rjKQSUzYaSSLW1UdfseOIG152SOe87lIpplo4dyg
+liZH8W3nj5sdRBTXOnJLnrO8u6ym37PHuw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.der
index f63967c578590a..db1e1d19efc01a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.pem
index 3a2268926fc01f..6aa79db013cdb5 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIcCw2uR6umbUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIB7lHfcfAjLwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATjSmDky9WaBBXc9t5wKUB32/dlTXiL
-mZNRFF5Sh7SlDQp58LIFKTDZHtAY2Om0GG2warl0Dys8AitPzgeX88yCo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU/Qml
-UEQtqfZux9tQ3QO/KC5kWikwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMCzRaMQqGYbSyklQjOEDhpfjrvgpNM/2Y/i
-nbE/OEkvAiAV3I6Aw2EGRCarotOtszzb/uobjDDAa/FTpRI495ihFQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbOWHpBkgQEau1OvRf2bkjGMjXCBqc
+9mrJ9I65TCWC3wvzDOnq54OcZKd3m1lglvuubzwQfYByV/2Bmxmtxpqpo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUDl4B
+VPqDhS6pvX1RNnjOYhsS2xcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgI4r5esKsEcOnV24EAuzCWseua0Beb5JzUSPH
+yOWPdtoCIE4Hou0XioD5AlUjG+DeYgyQzmU5h61h9Tuv8FUpIUTf
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.der
index e47350fa2d632e..8f9e3861e001df 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.pem
index 2d71b1dd0d9914..863e4f84911052 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJdGMXh1zEChNZAX3emOYdk2UMq5VaVjbt91GhfkYKOuoAoGCCqGSM49
-AwEHoUQDQgAE40pg5MvVmgQV3PbecClAd9v3ZU14i5mTURReUoe0pQ0KefCyBSkw
-2R7QGNjptBhtsGq5dA8rPAIrT84Hl/PMgg==
+MHcCAQEEIN0ATFO84+g4biZ+c+z1lL1T4ePpU3P0NMmLgxP9JND+oAoGCCqGSM49
+AwEHoUQDQgAE2zlh6QZIEBGrtTr0X9m5IxjI1wganPZqyfSOuUwlgt8L8wzp6ueD
+nGSnd5tZYJb7rm88EH2Aclf9gZsZrcaaqQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/test_case_vector.json
index 751d9f1b8bab14..2705fffe53e80b 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id and dac_origin_product_id fields present and the PID value doesn't match the PID found in the DAC Subject DN.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa0030201020208453e245ada9e6e02300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042a6375c88206ce08b66f49d5d621de0c9570f1cff168c02701dff791dfcaf8c70223acd2b4cafe3517f75dc6825a5d80d4a487dfdfe54456cadb2961a910b55da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e1f9ee56b9d2d5d3fa4cfece21be6dad41fea01d301f0603551d23041830168014fd09a550442da9f66ec7db50dd03bf282e645a29300a06082a8648ce3d0403020348003045022100b9a09e29c49434c072e0ab03b8775ae68429d8e41c9d77ef19b051df3ad9fc3b02207a5a5465995f3a2af5f2fc3823cd70ff7575374c9e83385ec91edd593cd84f21",
-    "pai_cert": "308201d43082017aa0030201020208702c36b91eae99b5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e34a60e4cbd59a0415dcf6de70294077dbf7654d788b999351145e5287b4a50d0a79f0b2052930d91ed018d8e9b4186db06ab9740f2b3c022b4fce0797f3cc82a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414fd09a550442da9f66ec7db50dd03bf282e645a29301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100c0b345a310a8661b4b29254233840e1a5f8ebbe0a4d33fd98fe29db13f38492f022015dc8e80c361064426aba2d3adb33cdbfeea1b8c30c06bf153a51238f798a115",
-    "certification_declaration": "3082010b06092a864886f70d010702a081fd3081fa020103310d300b0609608648016503040201306606092a864886f70d010701a0590457152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080025090880250a00ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221008d2087a64f755602d132c9c05c688240ba27b9153081c9fc49c92b92f6654ab2022100cecabcaed42bee5021cdc4d79a5208f74c6d80f70b734983bb467e5ef896b4da",
-    "dac_private_key": "58a0d9e45d72b889abf274630da9ee15dfd01de8672fceea5f20956725dfda19",
-    "dac_public_key": "042a6375c88206ce08b66f49d5d621de0c9570f1cff168c02701dff791dfcaf8c70223acd2b4cafe3517f75dc6825a5d80d4a487dfdfe54456cadb2961a910b55d"
+    "dac_cert": "308201e33082018aa003020102020801a8ef779583419a300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200046ba79cc6a857e4563aae3290494cd869248b5b551d7ec78e206d79d9239ef3b948a69968e1dca0962647f16de78f9b1d4414d73a724b9eb3bcbbaca6dfb3c7bba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ed5fce750f4fbaae8779ded9990bd77ed74f5deb301f0603551d230418301680140e5e0154fa83852ea9bd7d513678ce621b12db17300a06082a8648ce3d040302034700304402206f6f02d977fb7d0b5782914a76471f6f28b6bace6ba220f6bd2911b88e65ac7802204fe9c5893a713bfc65079e17f182949b1e7f30c1300e21a384ce0684a6bf37a4",
+    "pai_cert": "308201d33082017aa003020102020807b9477dc7c08cbc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004db3961e906481011abb53af45fd9b92318c8d7081a9cf66ac9f48eb94c2582df0bf30ce9eae7839c64a7779b596096fbae6f3c107d807257fd819b19adc69aa9a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604140e5e0154fa83852ea9bd7d513678ce621b12db17301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220238af97ac2ac11c3a7576e0402ecc25ac7ae6b405e6f92735123c7c8e58f76da02204e07a2ed178a80f90255231be0de620c90ce653987ad61f53baff055292144df",
+    "certification_declaration": "3081f206092a864886f70d010702a081e43081e1020103310d300b0609608648016503040201304d06092a864886f70d010701a040043e152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080025090880250a00ff18317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d08faa14c78d204d7b3f191b7b18c667eb53a4ea7b8fb2891a297c07b223c176022100842d2b037776544c70bd1206615f715fc7a2e6692189e4acb4d99807bbd05057",
+    "dac_private_key": "540d77b6b8721072eeb5adb0345b6fa28a9ef6160dc18fe6ff84fd845770835a",
+    "dac_public_key": "046ba79cc6a857e4563aae3290494cd869248b5b551d7ec78e206d79d9239ef3b948a69968e1dca0962647f16de78f9b1d4414d73a724b9eb3bcbbaca6dfb3c7bb"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/cd.der
index 8fa15c6e6cadd6..1fa115a0ecde96 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.der
index 123d0e13447c8e..ce43280eaa98d4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.pem
index 1a477e2f2c34e6..7e6ebee3cf913e 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIDsFM3tIJY4swCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIecprRmqVVCgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-AXrv8SGerAMB0umDpkw0RkGC9tk0Wgm9Fj//mTGkMv1WtOHYq7JilR/hAE5xfQEm
-gCJylor+Wzq1xeiz82FQvaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFFLuoTj16HS8QeU0WlWb4Zk2K98cMB8GA1UdIwQYMBaAFBNS
-Cn8R5nJg29yvQomKtOtz/eb2MAoGCCqGSM49BAMCA0gAMEUCIEXg3crNC3uPjBkk
-rOrnYsK0leM2N+vH6U2S8c9lTNCcAiEAjou8RTa4qdP3ZMWNen4GKkBa6Ej29JCb
-unyek5Ciny4=
+xhORSOYHzj7xkLvbOXeKwOoQyaynHmxNCiq0SA0sAipLx/5cz8OjB9oe6QTNbdS+
+2fnvyazP8iG9ltrbXLOGK6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFEz3E1Wi1uVb/oWitd87rllciYOsMB8GA1UdIwQYMBaAFNwi
+1MC6lrzsnnP+vMalxqlczNUwMAoGCCqGSM49BAMCA0gAMEUCIQCPXfbI4DzZdPd+
+gq+CvyNqj+hf7x2yc1RTQsJ/NndnGAIgSc/H3enKcT2gNnbDjk175xM0EEBDCKoG
+V0FBZmRhcjA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.der
index 0353af8b8d44c9..feda6705b39577 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.pem
index 81807d91112f8f..94cd865466a717 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIB7gZ5Os8e+U1DgNTVVmA1X8X12fdEmKEwv7P083LVYboAoGCCqGSM49
-AwEHoUQDQgAEAXrv8SGerAMB0umDpkw0RkGC9tk0Wgm9Fj//mTGkMv1WtOHYq7Ji
-lR/hAE5xfQEmgCJylor+Wzq1xeiz82FQvQ==
+MHcCAQEEILzdoQbgC4V0ywtoTh78XApqYWTwLbL4K1hpM6mkSEnyoAoGCCqGSM49
+AwEHoUQDQgAExhORSOYHzj7xkLvbOXeKwOoQyaynHmxNCiq0SA0sAipLx/5cz8Oj
+B9oe6QTNbdS+2fnvyazP8iG9ltrbXLOGKw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.der
index 8627d8fd2eb175..b32560f1231578 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.pem
index 559246babf35e8..ae1e57d35c8db4 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIEkkAf5kui6UwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIICj6Hesyfx3gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQHdSDVMCer9ll8DNTEr9lpXtwxesoQ
-rJyOlpcAyY9I8X63Y3VJum4/7NVTHnO2loDQPJiW0IwrM9DByFsDKuOGo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUE1IK
-fxHmcmDb3K9CiYq063P95vYwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJwY6s0x3FOWHbEGyvO6XX9pgBCGxAZ4OKCu
-nYW98gt3AiBgxjnTvVrMRSikYBvYJPFFV0QAUjsDAEpHGbZoStPYow==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASS4MLmYRTK7upakHH0QF7epmwr+yjk
+7gnEZ+2FpM6F5fHxl1hRHa61eHXHPna/jDQgokWIKs1M9/L6ZbRwYJzUo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU3CLU
+wLqWvOyec/68xqXGqVzM1TAwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgffojeMzvLfi0tG4H5ICCW59MqxtelR7Dizf4
++JhmuzkCIQDpTe0GP1rW+sQYcbNhsjP7RA8l6ADSY0LRa+YkQ6zF0w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.der
index 339d0c603427e8..7b0599dbf3c43c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.pem
index ad6d29e4a33662..ecbb509e021915 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHDVH7Z/IMDtl2ZSlvWAZ78r+ipjwC5qgB3HgM3g4HQLoAoGCCqGSM49
-AwEHoUQDQgAEB3Ug1TAnq/ZZfAzUxK/ZaV7cMXrKEKycjpaXAMmPSPF+t2N1Sbpu
-P+zVUx5ztpaA0DyYltCMKzPQwchbAyrjhg==
+MHcCAQEEIKQWPCZoXdC9BGNTvXCzXRfMN8INMZNuyk9/vd1PKR4/oAoGCCqGSM49
+AwEHoUQDQgAEkuDC5mEUyu7qWpBx9EBe3qZsK/so5O4JxGfthaTOheXx8ZdYUR2u
+tXh1xz52v4w0IKJFiCrNTPfy+mW0cGCc1A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/test_case_vector.json
index b9b7e0006e69eb..6419866698444d 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id and dac_origin_product_id fields present and the VID value doesn't match the VID found in the DAC Subject DN.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202080ec14cded209638b300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004017aeff1219eac0301d2e983a64c34464182f6d9345a09bd163fff9931a432fd56b4e1d8abb262951fe1004e717d0126802272968afe5b3ab5c5e8b3f36150bda360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041452eea138f5e874bc41e5345a559be199362bdf1c301f0603551d2304183016801413520a7f11e67260dbdcaf42898ab4eb73fde6f6300a06082a8648ce3d0403020348003045022045e0ddcacd0b7b8f8c1924aceae762c2b495e33637ebc7e94d92f1cf654cd09c0221008e8bbc4536b8a9d3f764c58d7a7e062a405ae848f6f4909bba7c9e9390a29f2e",
-    "pai_cert": "308201d43082017aa00302010202081249007f992e8ba5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004077520d53027abf6597c0cd4c4afd9695edc317aca10ac9c8e969700c98f48f17eb7637549ba6e3fecd5531e73b69680d03c9896d08c2b33d0c1c85b032ae386a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041413520a7f11e67260dbdcaf42898ab4eb73fde6f6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009c18eacd31dc53961db106caf3ba5d7f69801086c4067838a0ae9d85bdf20b77022060c639d3bd5acc4528a4601bd824f145574400523b03004a4719b6684ad3d8a3",
-    "certification_declaration": "3082010b06092a864886f70d010702a081fd3081fa020103310d300b0609608648016503040201306606092a864886f70d010701a0590457152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080025090880250a00ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210098274181c3c7282114426896d0f510d31d39d32d228f13fb14507b92107913eb0221008c33978b88ca12c79eba51d9fd2de9c0476c139344479589b66e999773e078b6",
-    "dac_private_key": "1ee06793acf1ef94d4380d4d55660355fc5f5d9f74498a130bfb3f4f372d561b",
-    "dac_public_key": "04017aeff1219eac0301d2e983a64c34464182f6d9345a09bd163fff9931a432fd56b4e1d8abb262951fe1004e717d0126802272968afe5b3ab5c5e8b3f36150bd"
+    "dac_cert": "308201e43082018aa003020102020879ca6b466a955428300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c6139148e607ce3ef190bbdb39778ac0ea10c9aca71e6c4d0a2ab4480d2c022a4bc7fe5ccfc3a307da1ee904cd6dd4bed9f9efc9accff221bd96dadb5cb3862ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144cf71355a2d6e55bfe85a2b5df3bae595c8983ac301f0603551d23041830168014dc22d4c0ba96bcec9e73febcc6a5c6a95cccd530300a06082a8648ce3d04030203480030450221008f5df6c8e03cd974f77e82af82bf236a8fe85fef1db273545342c27f36776718022049cfc7dde9ca713da03676c38e4d7be7133410404308aa065741416664617230",
+    "pai_cert": "308201d43082017aa00302010202080a3e877acc9fc778300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000492e0c2e66114caeeea5a9071f4405edea66c2bfb28e4ee09c467ed85a4ce85e5f1f19758511daeb57875c73e76bf8c3420a245882acd4cf7f2fa65b470609cd4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414dc22d4c0ba96bcec9e73febcc6a5c6a95cccd530301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207dfa2378ccef2df8b4b46e07e480825b9f4cab1b5e951ec38b37f8f89866bb39022100e94ded063f5ad6fac41871b361b233fb440f25e800d26342d16be62443acc5d3",
+    "certification_declaration": "3081f106092a864886f70d010702a081e33081e0020103310d300b0609608648016503040201304d06092a864886f70d010701a040043e152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080025090880250a00ff18317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220141fd1d963a4d35addceeb2588808663bf9e48869cdd7638fcd17ca7744db671022100e247d9707c2e73a241a3ecc681e98f431e926dba315a8c7af014eaed8005cb68",
+    "dac_private_key": "bcdda106e00b8574cb0b684e1efc5c0a6a6164f02db2f82b586933a9a44849f2",
+    "dac_public_key": "04c6139148e607ce3ef190bbdb39778ac0ea10c9aca71e6c4d0a2ab4480d2c022a4bc7fe5ccfc3a307da1ee904cd6dd4bed9f9efc9accff221bd96dadb5cb3862b"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/cd.der
index e35ccbf304d19e..7f2ce2eda92a6d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.der
index 2fc94874264961..2da9859db12dee 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.pem
index b6f269fca6d833..e9f7c80c2cfbc5 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIQyOd5XAjakEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIITgPrhEK9M1cwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-i9/WKm1va8vLvk/2f0Rla4+pgBAhXr/KmdXKK+tgLnEv+1I57VQ6as2ZOExWdR8F
-zvA2GDN/5hjTLt7vj9EfH6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFHfZPcc5eAWFp87Y7ll5Sr4xd0BOMB8GA1UdIwQYMBaAFKjQ
-bUQc6OS7QqGPJuSXCW4Vxb3TMAoGCCqGSM49BAMCA0gAMEUCIQDB1Ldt+M9bWKrw
-lfFIvyt1NjbyvwnOWqPO0aiUpZvUWAIgSNDch0WXeXQDyfCA2su71fWaUXESdPU0
-AK6Tp+D/+Bk=
+MndQUaEYjUV75p0oPS1HL8+Z/ZHQziRe9PtNdXJvcbN3XANfVnHay6NRMo2VVT8d
+BSxmgbgbuB/WcNoWYvqLJ6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFHQJsSZb7ValcLCbEq/RbN6qHSUWMB8GA1UdIwQYMBaAFBXK
+Epwfq0vu8knHi2ItxyX9sEF5MAoGCCqGSM49BAMCA0gAMEUCIQCyY/SP2WztAzwT
+eyEXD0O9ApGNwVtz/qZ+4q5hZApxdQIgdqasMPp5lsRdiWjHSJH5uPeqa05P0cIi
+XyRbPIlN62s=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.der
index 1298c82dde7081..279b54f95b7ade 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.pem
index 2ccd459e2a66d6..96c821ba97773c 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPUb6ojwF7CDfTBbygk9is2oJp7s+izujkZLoCcTi1sMoAoGCCqGSM49
-AwEHoUQDQgAEi9/WKm1va8vLvk/2f0Rla4+pgBAhXr/KmdXKK+tgLnEv+1I57VQ6
-as2ZOExWdR8FzvA2GDN/5hjTLt7vj9EfHw==
+MHcCAQEEIKRp69Q3KvlSBfklnON7RtFW1B203Sgt3fMwjVwzNw+moAoGCCqGSM49
+AwEHoUQDQgAEMndQUaEYjUV75p0oPS1HL8+Z/ZHQziRe9PtNdXJvcbN3XANfVnHa
+y6NRMo2VVT8dBSxmgbgbuB/WcNoWYvqLJw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.der
index 242f5047c54e66..ae0302d3909e1a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.pem
index 5c267ae9c4bcc4..1dbffdccefe872 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIOSDwDhfeWa8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIWcIgxuZmFPswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARdXNS9aez7/ohTq+i7R3lMJosQMBoD
-JlS8vVSf3d/ItY3BkEyLo7SxbfKkjFrGoup1id18ynM3TwRZjJx8jKnEo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUqNBt
-RBzo5LtCoY8m5JcJbhXFvdMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgAIrQaxC8Mvxvh3R8udsX1X9lsLa/0Xqsk4zH
-6Hy6qxECIQDU4bQooJ5JjX0I5xPOUL3+iti149GYFjP3eXJ5gPArFQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATYUSkoGlXJfMm51tevb+v4/pWm07eM
+ce1x8PhESBKzFoZYHl9AEPaNnOT5GC9+cQTSIdoSGEutGnEkvN9K4THgo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUFcoS
+nB+rS+7ySceLYi3HJf2wQXkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgfZ7fDxwkoz5tfbCkI1/OMlKTnsb8WmuNpSQf
+qNA/0h8CIQCrdEeo1eyglmFfd3r0+apDr55K8bo3+ccfQBqG7DHSjA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.der
index 87784c29ae3599..de0ca463cf31ff 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.pem
index a94876f785c3b8..72796f8bd158c7 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGBR+MQga37w9rNFc8sfM2MC1l0RE62vhYjnIK1v4I+koAoGCCqGSM49
-AwEHoUQDQgAEXVzUvWns+/6IU6vou0d5TCaLEDAaAyZUvL1Un93fyLWNwZBMi6O0
-sW3ypIxaxqLqdYndfMpzN08EWYycfIypxA==
+MHcCAQEEIIJ9fRc7XhA1NYVGHIJcmFE/fLFC6b32Dj+vn5mLB+tyoAoGCCqGSM49
+AwEHoUQDQgAE2FEpKBpVyXzJudbXr2/r+P6VptO3jHHtcfD4REgSsxaGWB5fQBD2
+jZzk+RgvfnEE0iHaEhhLrRpxJLzfSuEx4A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/test_case_vector.json
index 2726ec7eaa71da..60d9465c59d190 100644
--- a/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The dac_origin_vendor_id fild is present and dac_origin_product_id fields is not present.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020843239de570236a41300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048bdfd62a6d6f6bcbcbbe4ff67f44656b8fa98010215ebfca99d5ca2beb602e712ffb5239ed543a6acd99384c56751f05cef03618337fe618d32edeef8fd11f1fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041477d93dc739780585a7ced8ee59794abe3177404e301f0603551d23041830168014a8d06d441ce8e4bb42a18f26e497096e15c5bdd3300a06082a8648ce3d0403020348003045022100c1d4b76df8cf5b58aaf095f148bf2b753636f2bf09ce5aa3ced1a894a59bd458022048d0dc874597797403c9f080dacbbbd5f59a51711274f53400ae93a7e0fff819",
-    "pai_cert": "308201d43082017aa00302010202083920f00e17de59af300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045d5cd4bd69ecfbfe8853abe8bb47794c268b10301a032654bcbd549fdddfc8b58dc1904c8ba3b4b16df2a48c5ac6a2ea7589dd7cca73374f04598c9c7c8ca9c4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a8d06d441ce8e4bb42a18f26e497096e15c5bdd3301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220008ad06b10bc32fc6f87747cb9db17d57f65b0b6bfd17aac938cc7e87cbaab11022100d4e1b428a09e498d7d08e713ce50bdfe8ad8b5e3d1981633f779727980f02b15",
-    "certification_declaration": "3082010606092a864886f70d010702a081f83081f5020103310d300b0609608648016503040201306206092a864886f70d010701a0550453152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408002509f1ff360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022038edcc96a1f97e1adedebe39a958c060adfe365f4912d016ae520c32fa0a64bf022100dfb86c94e78e5f05753ee27aa415a072d57479d98f91c668d9f70833ee78e5ba",
-    "dac_private_key": "f51bea88f017b0837d305bca093d8acda8269eecfa2cee8e464ba027138b5b0c",
-    "dac_public_key": "048bdfd62a6d6f6bcbcbbe4ff67f44656b8fa98010215ebfca99d5ca2beb602e712ffb5239ed543a6acd99384c56751f05cef03618337fe618d32edeef8fd11f1f"
+    "dac_cert": "308201e43082018aa00302010202084e03eb8442bd3357300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000432775051a1188d457be69d283d2d472fcf99fd91d0ce245ef4fb4d75726f71b3775c035f5671dacba351328d95553f1d052c6681b81bb81fd670da1662fa8b27a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147409b1265bed56a570b09b12afd16cdeaa1d2516301f0603551d2304183016801415ca129c1fab4beef249c78b622dc725fdb04179300a06082a8648ce3d0403020348003045022100b263f48fd96ced033c137b21170f43bd02918dc15b73fea67ee2ae61640a7175022076a6ac30fa7996c45d8968c74891f9b8f7aa6b4e4fd1c2225f245b3c894deb6b",
+    "pai_cert": "308201d43082017aa003020102020859c220c6e66614fb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d85129281a55c97cc9b9d6d7af6febf8fe95a6d3b78c71ed71f0f8444812b31686581e5f4010f68d9ce4f9182f7e7104d221da12184bad1a7124bcdf4ae131e0a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041415ca129c1fab4beef249c78b622dc725fdb04179301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207d9edf0f1c24a33e6d7db0a4235fce3252939ec6fc5a6b8da5241fa8d03fd21f022100ab7447a8d5eca096615f777af4f9aa43af9e4af1ba37f9c71f401a86ec31d28c",
+    "certification_declaration": "3081ec06092a864886f70d010702a081de3081db020103310d300b0609608648016503040201304906092a864886f70d010701a03c043a152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408002509f1ff18317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402203b39f5769ff990ea93efe930bf51b535b46bf27eb512b31b64d5c1ce0b14a4290220258dc57e0c162d8999cb540a663ead0f7b8afe43a81be777df57ebb94b1d0ee0",
+    "dac_private_key": "a469ebd4372af95205f9259ce37b46d156d41db4dd282dddf3308d5c33370fa6",
+    "dac_public_key": "0432775051a1188d457be69d283d2d472fcf99fd91d0ce245ef4fb4d75726f71b3775c035f5671dacba351328d95553f1d052c6681b81bb81fd670da1662fa8b27"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/cd.der
index f63027a133ef6d..bf67be23d1c518 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.der
index 36d1fbad6ec1d0..439a2b71373add 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.pem
index 81833e5e0b77e4..6f4189586c5c6b 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIINWM7GMn2z38wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIXwG8UJsZDdkwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-6gc85K+EElZ72TraQtnjIR2Y6smJ+/Z+XyMCmU5qedv87EqBZ12MByS441407W2R
-czwscpSK3bvgfp+dJYbze6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFKX2QeTFC5iLkzxE9i+i2wASD5LEMB8GA1UdIwQYMBaAFJf7
-WyHclWDHzs4m83JZaLBT2sRxMAoGCCqGSM49BAMCA0gAMEUCIBFvwT7MWYp8RUjy
-ft0cQcRLbVuG3iuCYg5jOt5XqaXMAiEAygCmaDXyD7gfxxrLNNINdGBC940kryHk
-kO3vs8+tthQ=
+h67Nzl/gLDQoXWziJSIbw/f8b8na8x6PioWOVhr2kyLOpAr1hBlUxJem4iFEcE38
+AQtnEr3YY4ScKPhfNSmFxaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFP003e19E+/I4yJA0pWR9MtmBzRJMB8GA1UdIwQYMBaAFA/W
+/Z5vFPFS3iH3TLceP+ZxLdacMAoGCCqGSM49BAMCA0gAMEUCIHsdApH3uH5DqJHO
+5Fj3LDdW40+LfnACyBvMqTDJQ722AiEAx84iwPZUC4KdJBKvY6dhnUmcgJBr/L41
+pgNezmBExsE=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.der
index 1f02f6f54072ef..3812be141c8159 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.pem
index 4822421ffd6395..0aa1e168dadad3 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOzbXnjNvltzCYzpfJkxMK5mHsltIC+1wtQMooVQo57OoAoGCCqGSM49
-AwEHoUQDQgAE6gc85K+EElZ72TraQtnjIR2Y6smJ+/Z+XyMCmU5qedv87EqBZ12M
-ByS441407W2RczwscpSK3bvgfp+dJYbzew==
+MHcCAQEEIEOpLjLj0PaHuJrN+lcLy/vooFxuJUTMVCi5ug2QS2ZNoAoGCCqGSM49
+AwEHoUQDQgAEh67Nzl/gLDQoXWziJSIbw/f8b8na8x6PioWOVhr2kyLOpAr1hBlU
+xJem4iFEcE38AQtnEr3YY4ScKPhfNSmFxQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.der
index 250743fb6b147c..26f3ee8694a8f7 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.pem
index 4fa2fb49153777..d1ff45cadc7287 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIBWdEeY4WI10wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIICWkwvNexMBswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASJ510mMVIqRYZ6y8gFPLhkV1fp8jfY
-3smqKg6lCsgmv2KtI0NVbkjWdJZ/iVEXew5ZOLvdHaAIo/KG1lOK2ubno2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUl/tb
-IdyVYMfOzibzcllosFPaxHEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgSwdcACJ20UvlEagcgAZoE697BrOKjqot/Pio
-qa60b3oCIQD4gl4DksziW7IGvTmFB4p3JEvE5tCM1bBIptC9iJf5hg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR6H2icpbATkAns1U+fNcJ+tbmO48N5
+js9nPbA+D6Cb2/LL/GOtIYtmN9ky9tq3N/AollmC4qzMs0BLKBIJGsRbo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUD9b9
+nm8U8VLeIfdMtx4/5nEt1pwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAJ6YEopP7jbjxeYnBjKchDbomcQKe3lbAiE+
+ZCFTdx/BAiEAiixM3F/Ke74O+QVG+iD383ZswZAVWAM4rq1aYSLjTUs=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.der
index 26edce655b12c5..6f3a47b6a145f3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.pem
index bd3f6be8c33847..a7835ee97e5ed8 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBvAO7wltJibqsImCxZ+BOaT8mO3YwTfe/JQFs0R9zMzoAoGCCqGSM49
-AwEHoUQDQgAEieddJjFSKkWGesvIBTy4ZFdX6fI32N7JqioOpQrIJr9irSNDVW5I
-1nSWf4lRF3sOWTi73R2gCKPyhtZTitrm5w==
+MHcCAQEEIIXLU6ufnumnNcRdlEoD9+mJCVoE6F2njEd8WMFmZutvoAoGCCqGSM49
+AwEHoUQDQgAEeh9onKWwE5AJ7NVPnzXCfrW5juPDeY7PZz2wPg+gm9vyy/xjrSGL
+ZjfZMvbatzfwKJZZguKszLNASygSCRrEWw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/test_case_vector.json
index 888fd056bddda0..13849c2d91c371 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The device_type_id field doesn't match the device_type_id value in the DCL entries associated with the VID and PID.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020835633b18c9f6cf7f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ea073ce4af8412567bd93ada42d9e3211d98eac989fbf67e5f2302994e6a79dbfcec4a81675d8c0724b8e35e34ed6d91733c2c72948addbbe07e9f9d2586f37ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a5f641e4c50b988b933c44f62fa2db00120f92c4301f0603551d2304183016801497fb5b21dc9560c7cece26f3725968b053dac471300a06082a8648ce3d04030203480030450220116fc13ecc598a7c4548f27edd1c41c44b6d5b86de2b82620e633ade57a9a5cc022100ca00a66835f20fb81fc71acb34d20d746042f78d24af21e490edefb3cfadb614",
-    "pai_cert": "308201d43082017aa0030201020208056744798e16235d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000489e75d2631522a45867acbc8053cb8645757e9f237d8dec9aa2a0ea50ac826bf62ad2343556e48d674967f8951177b0e5938bbdd1da008a3f286d6538adae6e7a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041497fb5b21dc9560c7cece26f3725968b053dac471301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204b075c002276d14be511a81c80066813af7b06b38a8eaa2dfcf8a8a9aeb46f7a022100f8825e0392cce25bb206bd3985078a77244bc4e6d08cd5b048a6d0bd8897f986",
-    "certification_declaration": "3082010406092a864886f70d010702a081f63081f3020103310d300b0609608648016503040201306006092a864886f70d010701a0530451152000012501f1ff3602050080182603cbedffff2c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100f4f82b239cfd2f8cea53df37dd69f5405cb310a99797ec372603e4cb15a7d573022042f6f585b9f9a4ada57162fed47acf98a87a96e4469af80020507a094d4cc51c",
-    "dac_private_key": "ecdb5e78cdbe5b73098ce97c993130ae661ec96d202fb5c2d40ca28550a39ece",
-    "dac_public_key": "04ea073ce4af8412567bd93ada42d9e3211d98eac989fbf67e5f2302994e6a79dbfcec4a81675d8c0724b8e35e34ed6d91733c2c72948addbbe07e9f9d2586f37b"
+    "dac_cert": "308201e43082018aa00302010202085f01bc509b190dd9300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000487aecdce5fe02c34285d6ce225221bc3f7fc6fc9daf31e8f8a858e561af69322cea40af5841954c497a6e22144704dfc010b6712bdd863849c28f85f352985c5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414fd34dded7d13efc8e32240d29591f4cb66073449301f0603551d230418301680140fd6fd9e6f14f152de21f74cb71e3fe6712dd69c300a06082a8648ce3d040302034800304502207b1d0291f7b87e43a891cee458f72c3756e34f8b7e7002c81bcca930c943bdb6022100c7ce22c0f6540b829d2412af63a7619d499c80906bfcbe35a6035ece6044c6c1",
+    "pai_cert": "308201d53082017aa0030201020208096930bcd7b1301b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047a1f689ca5b0139009ecd54f9f35c27eb5b98ee3c3798ecf673db03e0fa09bdbf2cbfc63ad218b6637d932f6dab737f028965982e2acccb3404b2812091ac45ba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604140fd6fd9e6f14f152de21f74cb71e3fe6712dd69c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221009e98128a4fee36e3c5e62706329c8436e899c40a7b795b02213e642153771fc10221008a2c4cdc5fca7bbe0ef90546fa20f7f3766cc19015580338aead5a6122e34d4b",
+    "certification_declaration": "3081ec06092a864886f70d010702a081de3081db020103310d300b0609608648016503040201304706092a864886f70d010701a03a0438152400012501f1ff3602050080182603cbedffff2c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100cf9ef2cd6f3d1dab544baa9b5aaea70b6566749d061ebf2fffb966f3934c94820221008de090bf9e9e4e5c52de503176ca4b8f9190eb46785676de92e709f32c4ea9dd",
+    "dac_private_key": "43a92e32e3d0f687b89acdfa570bcbfbe8a05c6e2544cc5428b9ba0d904b664d",
+    "dac_public_key": "0487aecdce5fe02c34285d6ce225221bc3f7fc6fc9daf31e8f8a858e561af69322cea40af5841954c497a6e22144704dfc010b6712bdd863849c28f85f352985c5"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/cd.der
index edf0fc5a0abcce..474ebaf1c9f890 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.der
index a06e4ca4b8c1a8..004a9f64db7d6c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.pem
index 87d2fbdb0e3948..d2f919727ac47a 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIc+C8/Au85WAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIELO0L6IF+cAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-R2XTKEutymlr/n+cFInaexB+PZAp/BCddo8tcmZCaxgrCVol7vnHUBoakfR78Wli
-iHMYhts6wslt4Zszp63xvqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFEZDgm1A+XwgrJPTYXbTdtyvN1pjMB8GA1UdIwQYMBaAFPEZ
-JRSheDjIrAuVuY7sNpLZQo96MAoGCCqGSM49BAMCA0kAMEYCIQCqzTN7M9g2TY1E
-0SsSUpwn5DqP4zYUyLw1iT+xPhbd8AIhAPaiwSNdzf8VoVHV+BT0/1g6DYkoZ0DO
-7npzHVd3kNOZ
+udi1f7n8FcmSz8IsUpoKoZuI3dwKm0a0qhN5cJNXXmUIW6FdAm0ZGCA42zXnYJuF
+puxw+YRXL1Fk2h2/kgDewaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFBzeSNmsAfJZil+yIX31/1jJPyGJMB8GA1UdIwQYMBaAFMYQ
+PTyuLJLcA3nozOabvL/BtKo8MAoGCCqGSM49BAMCA0gAMEUCIQCAV0YV4On9TWcD
+VazgWISSJBA/hLXntW0BwE1/S1N46AIgcBH+9phiW4i29/eRMvU73uVW6aD6HCyg
+XpnwO2QZtWk=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.der
index 40e566c55ac839..2d5a8272fa48c0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.pem
index 6456a58b30ddb7..4f4c7cc7391119 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJ5/tDG+GYOGIQJJkJY8tk7AtUK3bDZkQfdDr/dnYyIqoAoGCCqGSM49
-AwEHoUQDQgAER2XTKEutymlr/n+cFInaexB+PZAp/BCddo8tcmZCaxgrCVol7vnH
-UBoakfR78WliiHMYhts6wslt4Zszp63xvg==
+MHcCAQEEIFhnUQq19dXhRGOn+prMpslhrgrVIlnRoed2UrNPSzVboAoGCCqGSM49
+AwEHoUQDQgAEudi1f7n8FcmSz8IsUpoKoZuI3dwKm0a0qhN5cJNXXmUIW6FdAm0Z
+GCA42zXnYJuFpuxw+YRXL1Fk2h2/kgDewQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.der
index 9f664af9731cd8..7aa46e6fcb792b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.pem
index 0e93af893dddc9..fe50bfeff2365f 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIIc1o61HXsKswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIckNpU+NAchEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQr/bbqa5MHQe+mTBjcxXF/rOHS7X4N
-YDUx0SjjC/k1sBE5U90A3AgG4htTyPbUkW9Ef2tEJhJfkJ3EXB71Y4UNo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU8Rkl
-FKF4OMisC5W5juw2ktlCj3owHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKp404qNofxo/L3kpayECbQZBzK7t3/0tUgo
-o3lggVKKAiASGn8l7ZRm8A4oyaAdmnq9OXxqZfjQ0fjkOo6gGPV7xA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ9jnjX8yFZRQS7q3VW/eF83ESErvt+
+/v2LsEdNABk7hfMEPf2TXCq2y1Hkduazm07cCBRBuPaxka8HLZIO3gkBo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhA9
+PK4sktwDeejM5pu8v8G0qjwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMETWhcYvMTqcHqSzNnVsrbnxFaE0kP9rj+n
+XgLHWhi8AiB+BYmsRUmwbY+kXXKMxm/SvP19QlFk8zMW7+jYwghFNg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.der
index d68b27e59d1633..90922406b92a69 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.pem
index a19c61081e282e..1910d963354e21 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHASSe6GEaKI15whZvh/8GsRgoBZV7wMgAEOh4N1y5xooAoGCCqGSM49
-AwEHoUQDQgAEK/226muTB0HvpkwY3MVxf6zh0u1+DWA1MdEo4wv5NbAROVPdANwI
-BuIbU8j21JFvRH9rRCYSX5CdxFwe9WOFDQ==
+MHcCAQEEIGgnUC+7QyRqR2iYpL5uBrtGbaRVwY8QTU6tOJX8bvsHoAoGCCqGSM49
+AwEHoUQDQgAEPY541/MhWUUEu6t1Vv3hfNxEhK77fv79i7BHTQAZO4XzBD39k1wq
+tstR5Hbms5tO3AgUQbj2sZGvBy2SDt4JAQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/test_case_vector.json
index a8c9f09be015a1..b408b8ae58d446 100644
--- a/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The device_type_id field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa003020102020873e0bcfc0bbce560300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044765d3284badca696bfe7f9c1489da7b107e3d9029fc109d768f2d7266426b182b095a25eef9c7501a1a91f47bf1696288731886db3ac2c96de19b33a7adf1bea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144643826d40f97c20ac93d36176d376dcaf375a63301f0603551d23041830168014f1192514a17838c8ac0b95b98eec3692d9428f7a300a06082a8648ce3d0403020349003046022100aacd337b33d8364d8d44d12b12529c27e43a8fe33614c8bc35893fb13e16ddf0022100f6a2c1235dcdff15a151d5f814f4ff583a0d89286740ceee7a731d577790d399",
-    "pai_cert": "308201d43082017aa003020102020821cd68eb51d7b0ab300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042bfdb6ea6b930741efa64c18dcc5717face1d2ed7e0d603531d128e30bf935b0113953dd00dc0806e21b53c8f6d4916f447f6b4426125f909dc45c1ef563850da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f1192514a17838c8ac0b95b98eec3692d9428f7a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100aa78d38a8da1fc68fcbde4a5ac8409b4190732bbb77ff4b54828a3796081528a0220121a7f25ed9466f00e28c9a01d9a7abd397c6a65f8d0d1f8e43a8ea018f57bc4",
-    "certification_declaration": "3081fe06092a864886f70d010702a081f03081ed020103310d300b0609608648016503040201305a06092a864886f70d010701a04d044b152000012501f1ff3602050080182c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100dd5f901f2529515fbc7bd9aa7daf07d1aeaca7dc5f99cc2856b0d246f831f13902201e0fbf2b3302a80424c85f1cfa206b75526c0b25c310f58585fb9165ca31526b",
-    "dac_private_key": "9e7fb431be19838621024990963cb64ec0b542b76c366441f743aff76763222a",
-    "dac_public_key": "044765d3284badca696bfe7f9c1489da7b107e3d9029fc109d768f2d7266426b182b095a25eef9c7501a1a91f47bf1696288731886db3ac2c96de19b33a7adf1be"
+    "dac_cert": "308201e43082018aa003020102020810b3b42fa205f9c0300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b9d8b57fb9fc15c992cfc22c529a0aa19b88dddc0a9b46b4aa13797093575e65085ba15d026d19182038db35e7609b85a6ec70f984572f5164da1dbf9200dec1a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141cde48d9ac01f2598a5fb2217df5ff58c93f2189301f0603551d23041830168014c6103d3cae2c92dc0379e8cce69bbcbfc1b4aa3c300a06082a8648ce3d040302034800304502210080574615e0e9fd4d670355ace058849224103f84b5e7b56d01c04d7f4b5378e802207011fef698625b88b6f7f79132f53bdee556e9a0fa1c2ca05e99f03b6419b569",
+    "pai_cert": "308201d43082017aa003020102020872436953e3407211300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043d8e78d7f321594504bbab7556fde17cdc4484aefb7efefd8bb0474d00193b85f3043dfd935c2ab6cb51e476e6b39b4edc081441b8f6b191af072d920ede0901a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414c6103d3cae2c92dc0379e8cce69bbcbfc1b4aa3c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100c1135a1718bcc4ea707a92ccd9d5b2b6e7c45684d243fdae3fa75e02c75a18bc02207e0589ac4549b06d8fa45d728cc66fd2bcfd7d425164f33316efe8d8c2084536",
+    "certification_declaration": "3081e506092a864886f70d010702a081d73081d4020103310d300b0609608648016503040201304106092a864886f70d010701a0340432152400012501f1ff3602050080182c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100cff9aa11d224cad4658821f4de919097e83ad2f926563aee18de157e576facd60220295d0cd70509b00efeeec306bb609bef718d576b98906ff6645e3bb66ac3153e",
+    "dac_private_key": "5867510ab5f5d5e14463a7fa9acca6c961ae0ad52259d1a1e77652b34f4b355b",
+    "dac_public_key": "04b9d8b57fb9fc15c992cfc22c529a0aa19b88dddc0a9b46b4aa13797093575e65085ba15d026d19182038db35e7609b85a6ec70f984572f5164da1dbf9200dec1"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/cd.der b/credentials/development/commissioner_dut/struct_cd_format_version_1/cd.der
index 626ecc3d71b4f9..dab3153a3442c6 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_1/cd.der and b/credentials/development/commissioner_dut/struct_cd_format_version_1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.der
index 0b725574fc2a39..b739ed31f29aea 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.pem
index 13ec080587fc01..d142cf886fd9ad 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIaP0AInrLBg8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIA17Ho6ZbQJowCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-sAwzhggJChb2Trvysoa0zBBxgLYunI05tE0V7YBmISc5NwaU2nb4Fp8ZM8WGq0hf
-2lUtLuUgnhcX8OcWhG5YIKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFMb+5aHmYNQHVLE10fSexNnqaFWHMB8GA1UdIwQYMBaAFHhm
-KJlJLyTG65MJ6WyDT1C702yVMAoGCCqGSM49BAMCA0kAMEYCIQCBfQ9LGMMMI5gT
-2DgwC4wFOJqQPyGjz1m0QGyTWSBi8QIhAO423ZR/mOagtHbsbeDtY8a/5iwo2bxG
-If8fTBlauOVf
+cYZXevXH5t/bCOlBXEdKZfgps1cpB+3C15BQXliHvFuiqHP8ydzWdbh+lvzIz0uZ
+z87ntrMBXmciMNEkePeE2qNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFORW669Cxu8VST38gu6VRhcsgMfzMB8GA1UdIwQYMBaAFMOo
+n+vbnRrtCe0Ox87R9QxDItlfMAoGCCqGSM49BAMCA0gAMEUCIQDgGy4nadPhirKq
+WQGpOpvk4S8ISmeEAPZv/omOSKY5TwIgCML18XnBjCIxYY0VKPiyiWTSBFWTSho6
+KNYuMM7B39Y=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.der
index d598bf192e4f5d..f97d35bd9f23f6 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.pem
index 6ee3f6c30e2122..f03d19d0a29846 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMe9OrnX7hNnp0mT318HFmiOHe3838sxxoQIvmohcBC1oAoGCCqGSM49
-AwEHoUQDQgAEsAwzhggJChb2Trvysoa0zBBxgLYunI05tE0V7YBmISc5NwaU2nb4
-Fp8ZM8WGq0hf2lUtLuUgnhcX8OcWhG5YIA==
+MHcCAQEEILRcgtEPhkBtRXsc0zaKLVgE+2/XlIuVZD2XeN68RVgToAoGCCqGSM49
+AwEHoUQDQgAEcYZXevXH5t/bCOlBXEdKZfgps1cpB+3C15BQXliHvFuiqHP8ydzW
+dbh+lvzIz0uZz87ntrMBXmciMNEkePeE2g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.der
index c928dbaf4c3304..b090e82d0569dd 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.pem
index 2548d67fbd00e6..bedcf545600cef 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIKm/KdWrtoEowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIISPEH8MVmtA4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASL7IaGEfkSdQq1TkzFKrYGsd/WbCpU
-l8MVvkMhzJv61NoOz5xw/ySRmNwPIFCKXXtNTCw+GLNqtlgLBmSMLjZ9o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUeGYo
-mUkvJMbrkwnpbINPULvTbJUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAOS8bfv0csX9rhYGaoVf57Kdwhf/bwWDjl3K
-pNPKaVrwAiBnvA6kUvpLdo46m48DjeKgsM+1DPENkqk8TCFVpUN7pA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR0aDpXeHkXIWBWklKDKszS9QcztMrl
+lsE6+BXAAg2PxL3yCml49RgRaacF15mhZ9B16qzKGdVLWmUP1N4PI8oWo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUw6if
+69udGu0J7Q7HztH1DEMi2V8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKrYOpH5S0rQsKsBpgn+C/YY+SiROTU29jy8
+sAttJWCrAiAlXGi8Hukp0CnINc3dcohW6/CcAPA9w2PTkJe3kLCitQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.der
index c88fc88c1c4196..50d6b7a0c46144 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.pem
index 4302cbac5f8dc9..7cc858e4b55ae3 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAtZwtCcsEBKqNOiUf5Git1NZt2d131XlaT+PBs8nR9woAoGCCqGSM49
-AwEHoUQDQgAEi+yGhhH5EnUKtU5MxSq2BrHf1mwqVJfDFb5DIcyb+tTaDs+ccP8k
-kZjcDyBQil17TUwsPhizarZYCwZkjC42fQ==
+MHcCAQEEIKzCkDjAzpPK0AHKC22xFpMZQOg3uHrtsTDL9FY0OyqQoAoGCCqGSM49
+AwEHoUQDQgAEdGg6V3h5FyFgVpJSgyrM0vUHM7TK5ZbBOvgVwAINj8S98gppePUY
+EWmnBdeZoWfQdeqsyhnVS1plD9TeDyPKFg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_1/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_format_version_1/test_case_vector.json
index 5938afeabcbafc..e7c33e2f0f5893 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Valid format_version field set to 1.",
     "is_success_case": "true",
-    "dac_cert": "308201e53082018aa003020102020868fd00227acb060f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b00c338608090a16f64ebbf2b286b4cc107180b62e9c8d39b44d15ed8066212739370694da76f8169f1933c586ab485fda552d2ee5209e1717f0e716846e5820a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c6fee5a1e660d40754b135d1f49ec4d9ea685587301f0603551d2304183016801478662899492f24c6eb9309e96c834f50bbd36c95300a06082a8648ce3d0403020349003046022100817d0f4b18c30c239813d838300b8c05389a903f21a3cf59b4406c93592062f1022100ee36dd947f98e6a0b476ec6de0ed63c6bfe62c28d9bc4621ff1f4c195ab8e55f",
-    "pai_cert": "308201d43082017aa00302010202082a6fca756aeda04a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048bec868611f912750ab54e4cc52ab606b1dfd66c2a5497c315be4321cc9bfad4da0ecf9c70ff249198dc0f20508a5d7b4d4c2c3e18b36ab6580b06648c2e367da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041478662899492f24c6eb9309e96c834f50bbd36c95301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100e4bc6dfbf472c5fdae16066a855fe7b29dc217ff6f05838e5dcaa4d3ca695af0022067bc0ea452fa4b768e3a9b8f038de2a0b0cfb50cf10d92a93c4c2155a5437ba4",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207092fe41f57172ff0fc86b8f190337e7be48a25679166f046c642c0fa92cf45f022100daf90a2229a7af6bb162d4a78b1251ce8a16a9ca2283c75017de46fb858ea7d5",
-    "dac_private_key": "c7bd3ab9d7ee1367a74993df5f0716688e1dedfcdfcb31c68408be6a217010b5",
-    "dac_public_key": "04b00c338608090a16f64ebbf2b286b4cc107180b62e9c8d39b44d15ed8066212739370694da76f8169f1933c586ab485fda552d2ee5209e1717f0e716846e5820"
+    "dac_cert": "308201e43082018aa0030201020208035ec7a3a65b409a300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047186577af5c7e6dfdb08e9415c474a65f829b3572907edc2d790505e5887bc5ba2a873fcc9dcd675b87e96fcc8cf4b99cfcee7b6b3015e672230d12478f784daa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e456ebaf42c6ef15493dfc82ee9546172c80c7f3301f0603551d23041830168014c3a89febdb9d1aed09ed0ec7ced1f50c4322d95f300a06082a8648ce3d0403020348003045022100e01b2e2769d3e18ab2aa5901a93a9be4e12f084a678400f66ffe898e48a6394f022008c2f5f179c18c2231618d1528f8b28964d20455934a1a3a28d62e30cec1dfd6",
+    "pai_cert": "308201d43082017aa003020102020848f107f0c566b40e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000474683a577879172160569252832accd2f50733b4cae596c13af815c0020d8fc4bdf20a6978f5181169a705d799a167d075eaacca19d54b5a650fd4de0f23ca16a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414c3a89febdb9d1aed09ed0ec7ced1f50c4322d95f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100aad83a91f94b4ad0b0ab01a609fe0bf618f92891393536f63cbcb00b6d2560ab0220255c68bc1ee929d029c835cddd728856ebf09c00f03dc363d39097b790b0a2b5",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210091f543aa73f3665262f783002d126e06ae641d7e96d33dea516b088b44000421022100cd6e9a27613886e9c03831ad4bb4d101fabab954f7daa9e505b31081818890a3",
+    "dac_private_key": "b45c82d10f86406d457b1cd3368a2d5804fb6fd7948b95643d9778debc455813",
+    "dac_public_key": "047186577af5c7e6dfdb08e9415c474a65f829b3572907edc2d790505e5887bc5ba2a873fcc9dcd675b87e96fcc8cf4b99cfcee7b6b3015e672230d12478f784da"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/cd.der b/credentials/development/commissioner_dut/struct_cd_format_version_2/cd.der
index 09c7cb616496b5..e379d1b10afc90 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_2/cd.der and b/credentials/development/commissioner_dut/struct_cd_format_version_2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.der
index 70b05a01426b37..85cf6a1fec5d88 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.pem
index 0cf351e108101f..975ec9d4c3573c 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIWaW6cAV6JEUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIVG1tUi6sS6gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-rz83CT+pKgvbHr2/2KSS3bdMBElmK6prtuykfQR3Dyp2pK56dKjaUjpPX4i1t0n1
-aihtaefIPKu5EViHdiVh2aNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFNy/shMK1q9C6TaANF2QYFcpdvq3MB8GA1UdIwQYMBaAFGMK
-IiqH4D8rSOJnLAr3embxEUjyMAoGCCqGSM49BAMCA0kAMEYCIQCOOc4BzReDdxdf
-a0pL6pVz6clOIUHv2K1MUGzWeLfE2AIhALUg9CbXoEVAfNZZg8dK8M8Yb6aonevR
-1ZFZkreS+HmP
+b+PUMtlJzKBufUVx0xrOjT6UfodiNIT5ZZSp2NqvHbtKDWSmGEmBjzmZPMWJNHeO
+lrbgELazinmEVMgPAE8NVqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFPOVLDg3QbyMVqTY5lYx4kJ+/mezMB8GA1UdIwQYMBaAFFwT
+jn4ldxX4X3/PFd5lm6F8oZPeMAoGCCqGSM49BAMCA0gAMEUCICM1NOy6C45Pp/XN
+S5abk4gtJ7EqaN/KyyJttl6lREBlAiEAvJ7rZVYN/Tu1KbR56g0eNUmbGES7zcT8
+Cmszpo/qVzo=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.der
index ccab1136260658..401c81d5181b33 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.pem
index 07af1c8824fbc4..34b8d12790999e 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAmEyyJUWWRNq9iXqwW5Jk7bywXlRkPMfal4oY+gWn7VoAoGCCqGSM49
-AwEHoUQDQgAErz83CT+pKgvbHr2/2KSS3bdMBElmK6prtuykfQR3Dyp2pK56dKja
-UjpPX4i1t0n1aihtaefIPKu5EViHdiVh2Q==
+MHcCAQEEIElz1Jnc1ZtdtSkbFPpRix22UO+jP/il1z2vRiwpJCVNoAoGCCqGSM49
+AwEHoUQDQgAEb+PUMtlJzKBufUVx0xrOjT6UfodiNIT5ZZSp2NqvHbtKDWSmGEmB
+jzmZPMWJNHeOlrbgELazinmEVMgPAE8NVg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.der
index 8060c68b7c9006..ac13db2819dfef 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.pem
index 8296d88cb44d34..bf8a703f6b62cc 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIRpOShFeFnU8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIDKnMCXJ8gvkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATAPAvmgrE+3NKB0qF5KhKtFmFBAIfp
-0c7HQJdP5oaERVOPZ+UF9SQAnay0XmnXyN0JWIkjxP+ME37DjIuDu32oo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUYwoi
-KofgPytI4mcsCvd6ZvERSPIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAJkZhjRuM110p2QrL+yYBge0zG7HJWmgJ5Ji
-YjBlFgaKAiEAij/fAUqAq1+GoOVJZrAm68VBvhp+PnsZdustnkXBySo=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARj4nIXlPPp8degUSdYfi8i0a5B4dEu
+7vFhXUu2JNpDDlOU1MdWHgsBYYytQiD5LDp62z+ZWmi48PZpEpEWoTIFo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUXBOO
+fiV3Ffhff88V3mWboXyhk94wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgQafpCS+YNV2DLrkWHrrLUfjiC/AW4S//MrRN
+/PxFn1wCIQCn1kzaby/PfkITMLZyD98WdREcureaDCjpuvVfcfku0g==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.der
index cdfc98444e10d0..d506e0c0c41d34 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.pem
index c7605458a57829..8e955efe014f19 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJBpsalT3sdmUhSirFc62qXzhBGPNq9KuWr/3cItiC/roAoGCCqGSM49
-AwEHoUQDQgAEwDwL5oKxPtzSgdKheSoSrRZhQQCH6dHOx0CXT+aGhEVTj2flBfUk
-AJ2stF5p18jdCViJI8T/jBN+w4yLg7t9qA==
+MHcCAQEEIKIpwkQgN0R6ZfZQFMrR+eAGsbOCRB1MQIYDu5/iFdI1oAoGCCqGSM49
+AwEHoUQDQgAEY+JyF5Tz6fHXoFEnWH4vItGuQeHRLu7xYV1LtiTaQw5TlNTHVh4L
+AWGMrUIg+Sw6ets/mVpouPD2aRKRFqEyBQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_2/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_format_version_2/test_case_vector.json
index db06a043552ef8..4c9f1508fe2160 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid format_version field set to 2.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa003020102020859a5ba70057a2445300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004af3f37093fa92a0bdb1ebdbfd8a492ddb74c0449662baa6bb6eca47d04770f2a76a4ae7a74a8da523a4f5f88b5b749f56a286d69e7c83cabb9115887762561d9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414dcbfb2130ad6af42e93680345d9060572976fab7301f0603551d23041830168014630a222a87e03f2b48e2672c0af77a66f11148f2300a06082a8648ce3d04030203490030460221008e39ce01cd178377175f6b4a4bea9573e9c94e2141efd8ad4c506cd678b7c4d8022100b520f426d7a045407cd65983c74af0cf186fa6a89debd1d5915992b792f8798f",
-    "pai_cert": "308201d53082017aa00302010202084693928457859d4f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c03c0be682b13edcd281d2a1792a12ad1661410087e9d1cec740974fe6868445538f67e505f524009dacb45e69d7c8dd09588923c4ff8c137ec38c8b83bb7da8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414630a222a87e03f2b48e2672c0af77a66f11148f2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100991986346e335d74a7642b2fec980607b4cc6ec72569a027926262306516068a0221008a3fdf014a80ab5f86a0e54966b026ebc541be1a7e3e7b1976eb2d9e45c1c92a",
-    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000022501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100fe6acbf07b710f74b15938e30d3a0bdd414283f18b87e161a55dd6f520c427dd022100ab1201522158ac046f37f81d45fbd3fea90cecfe64b724b21d21baf1e66c2000",
-    "dac_private_key": "0984cb225459644dabd897ab05b9264edbcb05e54643cc7da978a18fa05a7ed5",
-    "dac_public_key": "04af3f37093fa92a0bdb1ebdbfd8a492ddb74c0449662baa6bb6eca47d04770f2a76a4ae7a74a8da523a4f5f88b5b749f56a286d69e7c83cabb9115887762561d9"
+    "dac_cert": "308201e43082018aa0030201020208546d6d522eac4ba8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200046fe3d432d949cca06e7d4571d31ace8d3e947e87623484f96594a9d8daaf1dbb4a0d64a61849818f39993cc58934778e96b6e010b6b38a798454c80f004f0d56a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f3952c383741bc8c56a4d8e65631e2427efe67b3301f0603551d230418301680145c138e7e257715f85f7fcf15de659ba17ca193de300a06082a8648ce3d04030203480030450220233534ecba0b8e4fa7f5cd4b969b93882d27b12a68dfcacb226db65ea5444065022100bc9eeb65560dfd3bb529b479ea0d1e35499b1844bbcdc4fc0a6b33a68fea573a",
+    "pai_cert": "308201d43082017aa00302010202080ca9cc09727c82f9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000463e2721794f3e9f1d7a05127587e2f22d1ae41e1d12eeef1615d4bb624da430e5394d4c7561e0b01618cad4220f92c3a7adb3f995a68b8f0f669129116a13205a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145c138e7e257715f85f7fcf15de659ba17ca193de301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022041a7e9092f98355d832eb9161ebacb51f8e20bf016e12fff32b44dfcfc459f5c022100a7d64cda6f2fcf7e421330b6720fdf1675111cbab79a0c28e9baf55f71f92ed2",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400022501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221009ad37ffe2daa88ce82ba2af513e07a97be2b1f26bdd5b9101afe70151d56d7f1022040dee6e3b812d9f51436960334409a98ad84caa4e4a2a99bc1bdf7ee6f536305",
+    "dac_private_key": "4973d499dcd59b5db5291b14fa518b1db650efa33ff8a5d73daf462c2924254d",
+    "dac_public_key": "046fe3d432d949cca06e7d4571d31ace8d3e947e87623484f96594a9d8daaf1dbb4a0d64a61849818f39993cc58934778e96b6e010b6b38a798454c80f004f0d56"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_format_version_missing/cd.der
index d4a45ec1930f55..fae054e54b7f23 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_format_version_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.der
index 5d2a6458312f35..f575e31dbbd5a2 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.pem
index 8ead6fa8484ff0..2a6a722653534c 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIOsdnx/zHpLwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIHQ2TNmo25iwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-iOMQgS8mTMLdCYIIsHkCOEIDk5OrS9Z/wAmQAXCb6oT8XNf4yzwMAh50+jd3OUEM
-O6jqYd3AmWnLGPgOdBmU96NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFCejZkkjHHKsPaYVh3v3s+ZodZOGMB8GA1UdIwQYMBaAFCZ+
-+0u3HrM0s2wOxXwnKsMDjXQkMAoGCCqGSM49BAMCA0gAMEUCIBbwRv8y/5FvXovM
-47DyLA5w76DqAzMKH9GSJbiPB5TgAiEA1A/gCZTZyLQB1OqdDfMJnhicA3Z9LDPo
-xU6wu/X846w=
+wrhCbQaXD/nxX7w17JSAiXGPPkuJds5XZqaJLH94Pk/kO7U1wjnF4qRoSAKI/rK7
+awlyoborrgMBkGPvnQ8RDKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFPr1UAKzH2ggZo4JSLACM0MnEZ+YMB8GA1UdIwQYMBaAFFUz
+SBERiyngy6mgPHcITlm6DpDrMAoGCCqGSM49BAMCA0gAMEUCIG6leuE5AOwf9q2a
+n/QBt1MkenThlWVCK/qXkt1FWWDCAiEApelwsx9dKNrRsIu7UjQiJxt0aCppBo+w
+P4UpUmBQPNM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.der
index 54d6fa90102612..4857239945f3b1 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.pem
index 5759d2bcf061c3..f5fb812e3850dc 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFhg7xJbwPPbecirbRNBRVjMc8Z9rRCOHT8tvLVpvFGVoAoGCCqGSM49
-AwEHoUQDQgAEiOMQgS8mTMLdCYIIsHkCOEIDk5OrS9Z/wAmQAXCb6oT8XNf4yzwM
-Ah50+jd3OUEMO6jqYd3AmWnLGPgOdBmU9w==
+MHcCAQEEIOCmVtEleFhrluhOi0LFtifdl4bWXM4psx90PCI5owd3oAoGCCqGSM49
+AwEHoUQDQgAEwrhCbQaXD/nxX7w17JSAiXGPPkuJds5XZqaJLH94Pk/kO7U1wjnF
+4qRoSAKI/rK7awlyoborrgMBkGPvnQ8RDA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.der
index 74ef53b0b2888b..1cba0dbef15d00 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.pem
index a3f516b9574f71..19dee61a5955bd 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIcsiBMWSiWUowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIICTKa3GP1UpgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARbnIPh06gENBt6n0NeNn3SDOueb0FA
-SxlPKxrNuorykTU4956JPpZcM3cwEw3ZgNg5Y1nk+ECah8XGZ6YqGB3bo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUJn77
-S7ceszSzbA7FfCcqwwONdCQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgHLCJ4V7RyKaB9YvP+NJkrzPCv/QR9DCf0/po
-QFXfXR4CIE1g22SYMkunLW+hFMiFSIOM/ORBFU7bp6lvZ5R0hFtP
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT+Jxqguj0kOJXJYA8/pVXmKGmmzNLm
+ft19qCMAv8O8QLxfyKjRvteEedYA9MPbUrULboeL8g2WbQ3fESwk/Vrxo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUVTNI
+ERGLKeDLqaA8dwhOWboOkOswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhALH5DM75xGW5lHSNfkgKh8UMIFl8sd4zjoNa
+KVWQ6HehAiEAotVXCu6GCTYrs85wGI/rjaq9RDKl/rUvQa5l6EFtLB4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.der
index 77b78408dcc602..bf0c6db34899f8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.pem
index 2f3b9cc873da54..c819c43ed0825b 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM9BWs70e/jJziF1n3xo3RqjVQXeNVOFfe6fMx4q4r2RoAoGCCqGSM49
-AwEHoUQDQgAEW5yD4dOoBDQbep9DXjZ90gzrnm9BQEsZTysazbqK8pE1OPeeiT6W
-XDN3MBMN2YDYOWNZ5PhAmofFxmemKhgd2w==
+MHcCAQEEIEL/hnhPFqTB3WwdNPhiBTo+8/KVrqYilmAZb+N96kupoAoGCCqGSM49
+AwEHoUQDQgAE/icaoLo9JDiVyWAPP6VV5ihppszS5n7dfagjAL/DvEC8X8io0b7X
+hHnWAPTD21K1C26Hi/INlm0N3xEsJP1a8Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_format_version_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_format_version_missing/test_case_vector.json
index f66aada7998ee0..e087c92ff94c03 100644
--- a/credentials/development/commissioner_dut/struct_cd_format_version_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_format_version_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The format_version field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202083ac767c7fcc7a4bc300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000488e310812f264cc2dd098208b079023842039393ab4bd67fc0099001709bea84fc5cd7f8cb3c0c021e74fa377739410c3ba8ea61ddc09969cb18f80e741994f7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041427a36649231c72ac3da615877bf7b3e668759386301f0603551d23041830168014267efb4bb71eb334b36c0ec57c272ac3038d7424300a06082a8648ce3d0403020348003045022016f046ff32ff916f5e8bcce3b0f22c0e70efa0ea03330a1fd19225b88f0794e0022100d40fe00994d9c8b401d4ea9d0df3099e189c03767d2c33e8c54eb0bbf5fce3ac",
-    "pai_cert": "308201d33082017aa003020102020872c8813164a2594a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045b9c83e1d3a804341b7a9f435e367dd20ceb9e6f41404b194f2b1acdba8af2913538f79e893e965c337730130dd980d8396359e4f8409a87c5c667a62a181ddba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414267efb4bb71eb334b36c0ec57c272ac3038d7424301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402201cb089e15ed1c8a681f58bcff8d264af33c2bff411f4309fd3fa684055df5d1e02204d60db6498324ba72d6fa114c88548838cfce441154edba7a96f679474845b4f",
-    "certification_declaration": "3081ff06092a864886f70d010702a081f13081ee020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201d8b681c92a71730f71b3322c28bc1d60374c9dbf2d0f678191b20eb0e05c912022100c616befc743659789384a66fffbab1c199885772b64e71b07872242178bb52a9",
-    "dac_private_key": "5860ef125bc0f3db79c8ab6d13414558cc73c67dad108e1d3f2dbcb569bc5195",
-    "dac_public_key": "0488e310812f264cc2dd098208b079023842039393ab4bd67fc0099001709bea84fc5cd7f8cb3c0c021e74fa377739410c3ba8ea61ddc09969cb18f80e741994f7"
+    "dac_cert": "308201e43082018aa00302010202081d0d93366a36e62c300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c2b8426d06970ff9f15fbc35ec948089718f3e4b8976ce5766a6892c7f783e4fe43bb535c239c5e2a468480288feb2bb6b0972a1ba2bae03019063ef9d0f110ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414faf55002b31f6820668e0948b002334327119f98301f0603551d2304183016801455334811118b29e0cba9a03c77084e59ba0e90eb300a06082a8648ce3d040302034800304502206ea57ae13900ec1ff6ad9a9ff401b753247a74e19565422bfa9792dd455960c2022100a5e970b31f5d28dad1b08bbb523422271b74682a69068fb03f85295260503cd3",
+    "pai_cert": "308201d53082017aa003020102020809329adc63f55298300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fe271aa0ba3d243895c9600f3fa555e62869a6ccd2e67edd7da82300bfc3bc40bc5fc8a8d1bed78479d600f4c3db52b50b6e878bf20d966d0ddf112c24fd5af1a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041455334811118b29e0cba9a03c77084e59ba0e90eb301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b1f90ccef9c465b994748d7e480a87c50c20597cb1de338e835a295590e877a1022100a2d5570aee8609362bb3ce70188feb8daabd4432a5feb52f41ae65e8416d2c1e",
+    "certification_declaration": "3081e606092a864886f70d010702a081d83081d5020103310d300b0609608648016503040201304206092a864886f70d010701a0350433152501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100e1ab367555c9ed7816e5a307123278385ca877f2a0bdc4c9bd0e5083d279b184022031770d30da5910be7821c0f0e56265ecce55f40a19937d8f94af6461a137ea0a",
+    "dac_private_key": "e0a656d12578586b96e84e8b42c5b627dd9786d65cce29b31f743c2239a30777",
+    "dac_public_key": "04c2b8426d06970ff9f15fbc35ec948089718f3e4b8976ce5766a6892c7f783e4fe43bb535c239c5e2a468480288feb2bb6b0972a1ba2bae03019063ef9d0f110c"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/cd.der
index 2779a752c98627..acd4abe96dfbbd 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.der
index 1beb92ef856e37..2574dafe9a91c3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.pem
index 7d338ec9cb6c23..26584e6adedc06 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIcIigy0osW94wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIDcAxt6vz2TAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-j2vAC0d5WQP6l44oLeVy8/okevd5a2RTNpac3FNGG+YqVrVIHC4GJOuJ8zpWYUMT
-+fMR6UXgaxBDrhbtjKEHtKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFOrL///1euGaX7h8qijkS7IuZF05MB8GA1UdIwQYMBaAFNsS
-P9ru6XunB4ZX4a64Ib2NkWQNMAoGCCqGSM49BAMCA0cAMEQCIFcjmwKQIamucjCM
-LLrwLPR+UbCezN2CdMzTRg4ib/kkAiBT3HHxOD1/Jvjd++EwWogjjYevJ2Y7mioN
-OCnOzMnABg==
+epmRS0Cj2N6ta9NS80teQvteId7MYwqksRO4QgBkHkSyRzZac4mUtL6PCQoTaa3b
+S8NBpU5Uc743SPfljDr3e6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFGg0wBxLearH0AOwumuasaQAVg28MB8GA1UdIwQYMBaAFOs3
+C5FMa8/Xl5/T9F4v3aq17o0mMAoGCCqGSM49BAMCA0kAMEYCIQCtAIF4aY8gvNwO
+qGJsBsB6bcrISwqOCs8iYmgKvPDpzgIhAIx5gsEa5wgzSIGJua5s0UvcrcROZX0M
+QF5UwOQDspzM
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.der
index 9b95f9c829b1ff..6e46a37180976c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.pem
index 30f3960a6b1f05..51ebfbd8875c46 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILb5RiCdmip9fBngJ2IMw32N6E18N4hdJ9KneQgsifQsoAoGCCqGSM49
-AwEHoUQDQgAEj2vAC0d5WQP6l44oLeVy8/okevd5a2RTNpac3FNGG+YqVrVIHC4G
-JOuJ8zpWYUMT+fMR6UXgaxBDrhbtjKEHtA==
+MHcCAQEEIFrjZOlrc5No/dMdPuscKkwAKIJURA6LsdfNT32DHjhQoAoGCCqGSM49
+AwEHoUQDQgAEepmRS0Cj2N6ta9NS80teQvteId7MYwqksRO4QgBkHkSyRzZac4mU
+tL6PCQoTaa3bS8NBpU5Uc743SPfljDr3ew==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.der
index f9987e1fa6d109..f47da338195b59 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.pem
index 9d978e59e6e895..bab57879c48392 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIcjK08xvD5XEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIWjav4l5d0YAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATvQQMCYbXtlR/arMIGVz0NKMTxf2Wu
-iYve9hodKfcyYjzt4HDKs1Mk7fmFEyvSCBhrg+zQeTQFJtd2uoJtCfifo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU2xI/
-2u7pe6cHhlfhrrghvY2RZA0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgD5yGQz6I8ceTkwzqU3hhXDiRvyQVVErqiNkm
-Ek0G3ZYCIEE7uXZfK72cfMEcv/T4OU2T482StfdRji1TM86w0BDe
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAREEiRcUXyaaDtSzJTXVVj/wnmxBygd
+8rDELAfbD5vi+Ic1QuZmobmSotJQA2SZJI3ruukOqAcUCGg7c8avMDNqo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU6zcL
+kUxrz9eXn9P0Xi/dqrXujSYwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAJAMUoyYuf2lfQ73kQ9dbviw5BQiS3cNdmyk
+sX0alAwsAiEAvj05bjxj0rd4lXSIhxHKYR5iuBoEvHTE2mFnBKQjPvo=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.der
index caa2c64ab5168b..108d396642ea7b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.pem
index 1a6f8862a07500..0c90e571d747ab 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJTITPlmrg9Wz6iw8UnNdCfuJKURDJ42d75g/lz3KEovoAoGCCqGSM49
-AwEHoUQDQgAE70EDAmG17ZUf2qzCBlc9DSjE8X9lromL3vYaHSn3MmI87eBwyrNT
-JO35hRMr0ggYa4Ps0Hk0BSbXdrqCbQn4nw==
+MHcCAQEEIKFbdcHALwXYeQ8kbrKE+tlW2GuBI9fkNJwJS1kBYwAdoAoGCCqGSM49
+AwEHoUQDQgAERBIkXFF8mmg7UsyU11VY/8J5sQcoHfKwxCwH2w+b4viHNULmZqG5
+kqLSUANkmSSN67rpDqgHFAhoO3PGrzAzag==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/test_case_vector.json
index 56f10bada9959f..13655cc7ac64e9 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count0/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count0/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field is empty TLV array.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa00302010202087088a0cb4a2c5bde300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048f6bc00b47795903fa978e282de572f3fa247af7796b645336969cdc53461be62a56b5481c2e0624eb89f33a56614313f9f311e945e06b1043ae16ed8ca107b4a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414eacbfffff57ae19a5fb87caa28e44bb22e645d39301f0603551d23041830168014db123fdaeee97ba7078657e1aeb821bd8d91640d300a06082a8648ce3d0403020347003044022057239b029021a9ae72308c2cbaf02cf47e51b09eccdd8274ccd3460e226ff924022053dc71f1383d7f26f8ddfbe1305a88238d87af27663b9a2a0d3829ceccc9c006",
-    "pai_cert": "308201d33082017aa00302010202087232b4f31bc3e571300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ef41030261b5ed951fdaacc206573d0d28c4f17f65ae898bdef61a1d29f732623cede070cab35324edf985132bd208186b83ecd079340526d776ba826d09f89fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414db123fdaeee97ba7078657e1aeb821bd8d91640d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402200f9c86433e88f1c793930cea5378615c3891bf2415544aea88d926124d06dd960220413bb9765f2bbd9c7cc11cbff4f8394d93e3cd92b5f7518e2d5333ceb0d010de",
-    "certification_declaration": "3081ff06092a864886f70d010702a081f13081ee020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360218250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220320a23c02088e89003c7e2a9abbd76a74ad2b85ed5024a4b920bf66a0f2df968022100c36325bd3b8515eba9f674cbd4855dd7c52c01ef6ab150c46291bc33ed71642d",
-    "dac_private_key": "b6f946209d9a2a7d7c19e027620cc37d8de84d7c37885d27d2a779082c89f42c",
-    "dac_public_key": "048f6bc00b47795903fa978e282de572f3fa247af7796b645336969cdc53461be62a56b5481c2e0624eb89f33a56614313f9f311e945e06b1043ae16ed8ca107b4"
+    "dac_cert": "308201e53082018aa00302010202080dc031b7abf3d930300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047a99914b40a3d8dead6bd352f34b5e42fb5e21decc630aa4b113b84200641e44b247365a738994b4be8f090a1369addb4bc341a54e5473be3748f7e58c3af77ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146834c01c4b79aac7d003b0ba6b9ab1a400560dbc301f0603551d23041830168014eb370b914c6bcfd7979fd3f45e2fddaab5ee8d26300a06082a8648ce3d0403020349003046022100ad008178698f20bcdc0ea8626c06c07a6dcac84b0a8e0acf2262680abcf0e9ce0221008c7982c11ae70833488189b9ae6cd14bdcadc44e657d0c405e54c0e403b29ccc",
+    "pai_cert": "308201d53082017aa00302010202085a36afe25e5dd180300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044412245c517c9a683b52cc94d75558ffc279b107281df2b0c42c07db0f9be2f8873542e666a1b992a2d250036499248debbae90ea8071408683b73c6af30336aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414eb370b914c6bcfd7979fd3f45e2fddaab5ee8d26301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100900c528c98b9fda57d0ef7910f5d6ef8b0e414224b770d766ca4b17d1a940c2c022100be3d396e3c63d2b7789574888711ca611e62b81a04bc74c4da616704a4233efa",
+    "certification_declaration": "3081e506092a864886f70d010702a081d73081d4020103310d300b0609608648016503040201304206092a864886f70d010701a0350433152400012501f1ff360218250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022037d322978286a3de31d08ee96bd942aa72da18fbe26b063b914934e5fd4e087402205601ec5cd295d33050ec64b6f3fb23bfec1ed436c02c5cc8f71639a49b5d9bfd",
+    "dac_private_key": "5ae364e96b739368fdd31d3eeb1c2a4c00288254440e8bb1d7cd4f7d831e3850",
+    "dac_public_key": "047a99914b40a3d8dead6bd352f34b5e42fb5e21decc630aa4b113b84200641e44b247365a738994b4be8f090a1369addb4bc341a54e5473be3748f7e58c3af77b"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/cd.der
index e14dd90196bf1e..657a28d45d18d9 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.der
index 8ff8d0cd741e59..406ec339d5ca0d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.pem
index 95664db7fe1137..43a47ae6dde7ea 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIXsR7xEXOdAUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIFsdoriafqiQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-PllOSwpOw2suaxdJ79DSJKI7jrQ9Sy7agBCKYmgsPo9LI2xbX138JVHX6j1uu5BZ
-4cs2nsP93QkZgR8kM6qBW6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFDo+bHJ0csmY7id1DXh8yoOG2EbAMB8GA1UdIwQYMBaAFNe5
-p1wY6KwiPqkbpHUJTGTvmKaMMAoGCCqGSM49BAMCA0gAMEUCIHYKvoASQ3Mk2I6v
-ugwiCQHUB1+Y6xdFa4BJH5WU59VhAiEA0o4pAUonTMiUvlSmSYTx4DwQaGjcMU5H
-ObQECJWk7+c=
+5hfFIrw1mJ/MuvPBtNFhXZh8YwjZ+IJ0TOlmmidCCUor0fxiq/woB4ZNJ6xsKxuO
+NK1ethSzgXe+1XfyNRIzdqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFF52I1gmx3y4tCKjS+XHMYeZcT2lMB8GA1UdIwQYMBaAFFqR
+vDwtdyyrwP6/0uYLP2rn/Le2MAoGCCqGSM49BAMCA0cAMEQCIHfpw51i0071gAQ1
+u8K078Ib+Ffx/ERMEpPqbeLv+1g8AiBCVEcITHqmgChmeX6egMJ3foVTmrj1SsNW
+NTchoJlVuQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.der
index e3881b84142f06..8e2206e725e86a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.pem
index f8eee59003dd0f..62d57fa3684672 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBsvrLuyQHiY3ylmkxeF7FaAMGT7M/0hhXTybRxyJxTtoAoGCCqGSM49
-AwEHoUQDQgAEPllOSwpOw2suaxdJ79DSJKI7jrQ9Sy7agBCKYmgsPo9LI2xbX138
-JVHX6j1uu5BZ4cs2nsP93QkZgR8kM6qBWw==
+MHcCAQEEIE0/swzTqMMX5lYasSDMQlm9gFtU5qtIKEcQiiB0VWx6oAoGCCqGSM49
+AwEHoUQDQgAE5hfFIrw1mJ/MuvPBtNFhXZh8YwjZ+IJ0TOlmmidCCUor0fxiq/wo
+B4ZNJ6xsKxuONK1ethSzgXe+1XfyNRIzdg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.der
index eb90f3fc346469..fa28b98b40addc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.pem
index 393d051da56522..281a2b26daf1b3 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIDem4WoeaMOQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIWb77F50IE4cwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASrR3cBBffvhK1DWU5rvjSmUWqhNYjb
-uWzPCoyEfPnAvfoArPvziyi6flXS7yyxdZnQg2keXmFIbOMW5SFGr+Kfo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU17mn
-XBjorCI+qRukdQlMZO+YpowwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAMbl0XLMQtlKvcLyaQJnGh7lICLZMeJ8SFtu
-G24TUe8kAiEApBrfXMq1Q3QD2wtehdaVpCJIamK1xXacn5gY2SooE/c=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQHnke8qwTwtY5Fbgt81eSqb46L8yE3
+IqlDdqFH4Btzafu8j9vrkgKUrG2y7f2LYllEePtW30b7GmEVS+L8Ic2No2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUWpG8
+PC13LKvA/r/S5gs/auf8t7YwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAJhUM3HrdOQGDp5vBIjVL4UrUJ0ao1+t2PW8
+1l9OCTIGAiEAhz1wMo9UR2LyXNcYCQXFD6i2qxngTfxFRGKD+xr9OOI=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.der
index f4c273a0650f99..bf2a55d8b8c30d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.pem
index 3485b62ebd9404..1482d8fde431f4 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIB8NqKBo79vxuxqnWncST2CzN1aSruHxMh8MY8TYkNOnoAoGCCqGSM49
-AwEHoUQDQgAEq0d3AQX374StQ1lOa740plFqoTWI27lszwqMhHz5wL36AKz784so
-un5V0u8ssXWZ0INpHl5hSGzjFuUhRq/inw==
+MHcCAQEEIENbAE/OZflDu7+SFlEWN+daWNPXSAKU8FYgmpfVtYwioAoGCCqGSM49
+AwEHoUQDQgAEB55HvKsE8LWORW4LfNXkqm+Oi/MhNyKpQ3ahR+Abc2n7vI/b65IC
+lKxtsu39i2JZRHj7Vt9G+xphFUvi/CHNjQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/test_case_vector.json
index 31bbee9d96c82d..d1a6420a9965bf 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has one PID value that doesn't match the PID value in DAC.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202085ec47bc445ce7405300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043e594e4b0a4ec36b2e6b1749efd0d224a23b8eb43d4b2eda80108a62682c3e8f4b236c5b5f5dfc2551d7ea3d6ebb9059e1cb369ec3fddd0919811f2433aa815ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143a3e6c727472c998ee27750d787cca8386d846c0301f0603551d23041830168014d7b9a75c18e8ac223ea91ba475094c64ef98a68c300a06082a8648ce3d04030203480030450220760abe8012437324d88eafba0c220901d4075f98eb17456b80491f9594e7d561022100d28e29014a274cc894be54a64984f1e03c106868dc314e4739b4040895a4efe7",
-    "pai_cert": "308201d53082017aa00302010202080de9b85a879a30e4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ab47770105f7ef84ad43594e6bbe34a6516aa13588dbb96ccf0a8c847cf9c0bdfa00acfbf38b28ba7e55d2ef2cb17599d083691e5e61486ce316e52146afe29fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d7b9a75c18e8ac223ea91ba475094c64ef98a68c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c6e5d172cc42d94abdc2f26902671a1ee52022d931e27c485b6e1b6e1351ef24022100a41adf5ccab5437403db0b5e85d695a422486a62b5c5769c9f9818d92a2813f7",
-    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205018018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100859ae1b166131e60090f06446274867083cf2f62722dee3e8b3bf3803d7922f0022100fc4cd8a74a119b0e94c6ac6e7c060f71e3a97e07205f7e6c8f6471706dc43152",
-    "dac_private_key": "1b2facbbb2407898df2966931785ec56803064fb33fd218574f26d1c722714ed",
-    "dac_public_key": "043e594e4b0a4ec36b2e6b1749efd0d224a23b8eb43d4b2eda80108a62682c3e8f4b236c5b5f5dfc2551d7ea3d6ebb9059e1cb369ec3fddd0919811f2433aa815b"
+    "dac_cert": "308201e33082018aa003020102020816c768ae269faa24300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e617c522bc35989fccbaf3c1b4d1615d987c6308d9f882744ce9669a2742094a2bd1fc62abfc2807864d27ac6c2b1b8e34ad5eb614b38177bed577f235123376a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604145e76235826c77cb8b422a34be5c7318799713da5301f0603551d230418301680145a91bc3c2d772cabc0febfd2e60b3f6ae7fcb7b6300a06082a8648ce3d0403020347003044022077e9c39d62d34ef5800435bbc2b4efc21bf857f1fc444c1293ea6de2effb583c0220425447084c7aa6802866797e9e80c2777e85539ab8f54ac356353721a09955b9",
+    "pai_cert": "308201d53082017aa003020102020859befb179d081387300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004079e47bcab04f0b58e456e0b7cd5e4aa6f8e8bf3213722a94376a147e01b7369fbbc8fdbeb920294ac6db2edfd8b62594478fb56df46fb1a61154be2fc21cd8da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145a91bc3c2d772cabc0febfd2e60b3f6ae7fcb7b6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210098543371eb74e4060e9e6f0488d52f852b509d1aa35fadd8f5bcd65f4e093206022100873d70328f544762f25cd7180905c50fa8b6ab19e04dfc45446283fb1afd38e2",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205018018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c65b5b0f2133979bc4ddd7531bf401008178223bd19852a331431016cbeca0b202207cb7cc48ab35550809da5990fca76833177cc309b9d79f3420f498c127670883",
+    "dac_private_key": "4d3fb30cd3a8c317e6561ab120cc4259bd805b54e6ab482847108a2074556c7a",
+    "dac_public_key": "04e617c522bc35989fccbaf3c1b4d1615d987c6308d9f882744ce9669a2742094a2bd1fc62abfc2807864d27ac6c2b1b8e34ad5eb614b38177bed577f235123376"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/cd.der
index b807f647d52132..2f741dfd8761aa 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.der
index a2ccab8fb86577..0e9f6ac916d836 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.pem
index 628f8e433a4ad5..a971a02e9724bf 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIS6ptMIr1QTswCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIRue7cRsaj1kwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-X72ibI3f0MmwwPtACTwETDjtmAMbEJ2jIIhHHIZruIcnK2lsu/QLAOjMSVNqUz/u
-29cAWHwjohh8PNHlweFQG6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFMLfEmNWH5OfkA+cowtG0rzC0pz4MB8GA1UdIwQYMBaAFGjW
-jtrcEbNyMMJpKIdIEPWQtKN2MAoGCCqGSM49BAMCA0gAMEUCIQCPaLX+IL03D56C
-JHrsgBUwd8PZycwMxBQLB9+jTn1+YQIgFc9XY+b4EasndpSQx0Znh6WzuULv1tHV
-yqtMJtSxc+I=
+VXgC+ikZYIuYjY4dIBT4WR2Zn0MsKAB6ijrZcJ6UGctnr0bQrJPbB+mMAadYg/v0
+mB9gF0Mr/Cj6zKoQcNQnB6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFLyfdK3xPNHHjHKVfxL98/il/ioEMB8GA1UdIwQYMBaAFAPd
+NTgiRhxywB+Fp5g2eLBljeeHMAoGCCqGSM49BAMCA0cAMEQCIGGV7U8jdW0WEo7O
+C9yrz5Jiwa9jRKCQYcB7YWis0KdfAiB+oY8qi/O/e5nca15ayzRPbbkiiaBukPpR
+x6gXNwN38A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.der
index 444a817a7c7681..3b19239506f259 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.pem
index 78584e12ffd6de..4446ae5be750b2 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDZz/Qwn4nYR/fIpHECgufjRreDaBrh8/2O9mfSTeO6goAoGCCqGSM49
-AwEHoUQDQgAEX72ibI3f0MmwwPtACTwETDjtmAMbEJ2jIIhHHIZruIcnK2lsu/QL
-AOjMSVNqUz/u29cAWHwjohh8PNHlweFQGw==
+MHcCAQEEIHLkau0VfeE1jsqW768q/TXHus9sbV2WiiyLBCUCoLW9oAoGCCqGSM49
+AwEHoUQDQgAEVXgC+ikZYIuYjY4dIBT4WR2Zn0MsKAB6ijrZcJ6UGctnr0bQrJPb
+B+mMAadYg/v0mB9gF0Mr/Cj6zKoQcNQnBw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.der
index 9e60f75adc2aaa..8b6000b663a91b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.pem
index 9567e5daaa93e7..7682171f760ea5 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIKw+WSD+kJtAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIf7Hh8YgFQG8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASLUGuu7HZ52hOt3WS2m9dNVnJlmfow
-mRdU0MyuMw4tpCKfP5zzzQg3iHGwJYZNVDBnTRrY6kRKQlWLoXHLbt/+o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUaNaO
-2twRs3Iwwmkoh0gQ9ZC0o3YwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgBwdHA7ielH5tZrl7Op5EBTSq8BygtvHBVOJb
-tPIALFYCIC7UC+KXD/DHJ3YLzk19FQ3HkEsAHY+zse5LLElh6m8d
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQm6OO7XCHZ7XdBhp5e1cWTTS03e+Mo
+K9hhwuCk0041S+55NzVQO9bv49aoVyrQNTaTp8UBaNwBSKX/PnlkGMs+o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUA901
+OCJGHHLAH4WnmDZ4sGWN54cwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhALVvlXK6B/MqIKrJmQ7My6emVSYC0s1LYbxR
+T4MvlYUZAiEA7Xyqamu873g2EyRy9iyw8TCx/yi25Izv3HMwLtzRlhc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.der
index 9012838fadff1f..0bb73961dfc14b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.pem
index 29d160e796a3da..92964919ddfa35 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHiOg4d4D91DpJervBqIxqNNrT/DJ3x+a63UngfRToKuoAoGCCqGSM49
-AwEHoUQDQgAEi1Brrux2edoTrd1ktpvXTVZyZZn6MJkXVNDMrjMOLaQinz+c880I
-N4hxsCWGTVQwZ00a2OpESkJVi6Fxy27f/g==
+MHcCAQEEIHbqNgo8albwSpoe6kJm6OnaBS1ChsbAGaXXrMBMkVbnoAoGCCqGSM49
+AwEHoUQDQgAEJujju1wh2e13QYaeXtXFk00tN3vjKCvYYcLgpNNONUvueTc1UDvW
+7+PWqFcq0DU2k6fFAWjcAUil/z55ZBjLPg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/test_case_vector.json
index db24fe5b8ad831..59879f18149afd 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count01_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has one PID value which matches the PID value in DAC.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa00302010202084baa6d308af5413b300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045fbda26c8ddfd0c9b0c0fb40093c044c38ed98031b109da32088471c866bb887272b696cbbf40b00e8cc49536a533feedbd700587c23a2187c3cd1e5c1e1501ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c2df1263561f939f900f9ca30b46d2bcc2d29cf8301f0603551d2304183016801468d68edadc11b37230c26928874810f590b4a376300a06082a8648ce3d04030203480030450221008f68b5fe20bd370f9e82247aec80153077c3d9c9cc0cc4140b07dfa34e7d7e61022015cf5763e6f811ab27769490c7466787a5b3b942efd6d1d5caab4c26d4b173e2",
-    "pai_cert": "308201d33082017aa00302010202082b0f96483fa426d0300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048b506baeec7679da13addd64b69bd74d56726599fa30991754d0ccae330e2da4229f3f9cf3cd08378871b025864d5430674d1ad8ea444a42558ba171cb6edffea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041468d68edadc11b37230c26928874810f590b4a376301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022007074703b89e947e6d66b97b3a9e440534aaf01ca0b6f1c154e25bb4f2002c5602202ed40be2970ff0c727760bce4d7d150dc7904b001d8fb3b1ee4b2c4961ea6f1d",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022048bc632f9a578f6d226af805091a123c20327ab34d901d0a7d9210eb9cd9ba8802210088f535696b239773a872de44d0c05d96d53e4b0f3fb52dfc78c2abda088acff5",
-    "dac_private_key": "3673fd0c27e27611fdf2291c40a0b9f8d1ade0da06b87cff63bd99f49378eea0",
-    "dac_public_key": "045fbda26c8ddfd0c9b0c0fb40093c044c38ed98031b109da32088471c866bb887272b696cbbf40b00e8cc49536a533feedbd700587c23a2187c3cd1e5c1e1501b"
+    "dac_cert": "308201e33082018aa003020102020846e7bb711b1a8f59300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004557802fa2919608b988d8e1d2014f8591d999f432c28007a8a3ad9709e9419cb67af46d0ac93db07e98c01a75883fbf4981f6017432bfc28faccaa1070d42707a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bc9f74adf13cd1c78c72957f12fdf3f8a5fe2a04301f0603551d2304183016801403dd353822461c72c01f85a7983678b0658de787300a06082a8648ce3d040302034700304402206195ed4f23756d16128ece0bdcabcf9262c1af6344a09061c07b6168acd0a75f02207ea18f2a8bf3bf7b99dc6b5e5acb344f6db92289a06e90fa51c7a817370377f0",
+    "pai_cert": "308201d53082017aa00302010202087fb1e1f18805406f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000426e8e3bb5c21d9ed7741869e5ed5c5934d2d377be3282bd861c2e0a4d34e354bee793735503bd6efe3d6a8572ad0353693a7c50168dc0148a5ff3e796418cb3ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041403dd353822461c72c01f85a7983678b0658de787301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b56f9572ba07f32a20aac9990ecccba7a6552602d2cd4b61bc514f832f958519022100ed7caa6a6bbcef7836132472f62cb0f130b1ff28b6e48cefdc73302edcd19617",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201fd94ea4e095f4415928cd615ccfbdb4de8fd7f91452d19babae66d7e60c8568022100af9aff7d2a08426a1d2c232eccce49fdb61ac4e78c79edb3bd6fe6472a451e31",
+    "dac_private_key": "72e46aed157de1358eca96efaf2afd35c7bacf6c6d5d968a2c8b042502a0b5bd",
+    "dac_public_key": "04557802fa2919608b988d8e1d2014f8591d999f432c28007a8a3ad9709e9419cb67af46d0ac93db07e98c01a75883fbf4981f6017432bfc28faccaa1070d42707"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/cd.der
index f08687e041321b..1b81d863a19758 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.der
index e1896b35d03689..694e84d99d6d23 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.pem
index 2dc13c32f51568..a30b95a75c7e3c 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIILNCQSHDFlZUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIE8n+DRU7liYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-vngr12OauR2VuobqFtCD/US4bZWZht4t4lEXx4/dEnPwrGIWg6LyEBVi07NVOSql
-5dwuc9DonvEWZcowk6CVOKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFKh3d0VFqiGiPD+y0QQKHf0qWkFAMB8GA1UdIwQYMBaAFM7/
-dhXBPrPcWAX/dvpHzptsky69MAoGCCqGSM49BAMCA0gAMEUCIQDVU8u5baGW4CDA
-y6Ecy11WDl03UPGhUv1Meua/yQNmHgIgcOoE92PJkTwKvfAgqjyMsMj+Z3n/6H8g
-2aoDjSLVaCM=
+laCeAxEHW+aWOYN45OzKNeG5NDBeNyjcsQ6cVXBJC7Z+NI6lfpf05nL6YXWWH542
+q4e0zw3vo9NsxnOXV3Jzj6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFEZ5pRK8U1Q/WSdUTf+TicHu+ji1MB8GA1UdIwQYMBaAFPju
+HGsn1Dx71Ny8ZKTcCIB24sC6MAoGCCqGSM49BAMCA0gAMEUCIQCKQ9qYPnybTy9H
+LkJs2gz4OkJiuyD4aFfM8ZE9AZWEdwIgKUwEoY8c8Bl4HXUZ85ylGegKcqyWLVZl
+n/sC+sbi3tU=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.der
index 71466d22d55d4b..ace11c2a4bf286 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.pem
index 91b5613ad6eb9c..f180d5ab1a8207 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIC3BH3L83WOnU65hhZcCcjeKEtfy/Fs5C1kQoSJqCdaeoAoGCCqGSM49
-AwEHoUQDQgAEvngr12OauR2VuobqFtCD/US4bZWZht4t4lEXx4/dEnPwrGIWg6Ly
-EBVi07NVOSql5dwuc9DonvEWZcowk6CVOA==
+MHcCAQEEICKp04pB05j2ioE4nUNhRu3Gg460NQQ0Brbad5V4Oy9RoAoGCCqGSM49
+AwEHoUQDQgAElaCeAxEHW+aWOYN45OzKNeG5NDBeNyjcsQ6cVXBJC7Z+NI6lfpf0
+5nL6YXWWH542q4e0zw3vo9NsxnOXV3Jzjw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.der
index bf82f9acdba643..f6a12b17c2f7f3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.pem
index 4342ec26607b74..31abf44d6912c7 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIbCRgTmUFJTYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIBtmmuc0XlGswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQO6ctLLKARXeuw522OX519LMECgXCL
-6NtkVoYwf/PgxTNSbWSnImPUwDSGC6epJ9KHrwalUOkEIc+sn8NaRlw1o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzv92
-FcE+s9xYBf92+kfOm2yTLr0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAIjptPauEwGXxL2WRl8lCcXG6R+dLnqWuIDA
-nzfF84rdAiEAiJuXwvVGja5gOiBn93D7EhdZusAAAebhiiISxF9oNIk=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATi0tSdHw2rh2TILzzAdBwusG6dF5dI
+50Cqw2HiWkwsiTMZFInsPDwJ1SW4f4oZ+cZdY1i3MQ/vrrQSaWhC7jREo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU+O4c
+ayfUPHvU3LxkpNwIgHbiwLowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgIKSrLeQyojZ0uGw+JWxWmOa+/GLHeS+o252o
+4XV6vjUCIEIRo5jC+YoRK8unMnu7MUIBkiG0WchADlRWjUSwV3U/
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.der
index c87063d401cfe1..abee22734eee2d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.pem
index ba4162ef6d8e8f..2db9421a490f98 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFDuOxN1iTFXg+0VzlHiheyGVfAhIIy2Ea6t9lJpVXe1oAoGCCqGSM49
-AwEHoUQDQgAEDunLSyygEV3rsOdtjl+dfSzBAoFwi+jbZFaGMH/z4MUzUm1kpyJj
-1MA0hgunqSfSh68GpVDpBCHPrJ/DWkZcNQ==
+MHcCAQEEIPgZh0hYgXZJls8WQ7nZXAWQf1yxQZX3uz1/lni2CfYeoAoGCCqGSM49
+AwEHoUQDQgAE4tLUnR8Nq4dkyC88wHQcLrBunReXSOdAqsNh4lpMLIkzGRSJ7Dw8
+CdUluH+KGfnGXWNYtzEP7660EmloQu40RA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/test_case_vector.json
index b0500502369c02..7514b727c2dbba 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has 100 PID values none of which matches the PID value in DAC.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa00302010202082cd0904870c59595300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004be782bd7639ab91d95ba86ea16d083fd44b86d959986de2de25117c78fdd1273f0ac621683a2f2101562d3b355392aa5e5dc2e73d0e89ef11665ca3093a09538a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a877774545aa21a23c3fb2d1040a1dfd2a5a4140301f0603551d23041830168014ceff7615c13eb3dc5805ff76fa47ce9b6c932ebd300a06082a8648ce3d0403020348003045022100d553cbb96da196e020c0cba11ccb5d560e5d3750f1a152fd4c7ae6bfc903661e022070ea04f763c9913c0abdf020aa3c8cb0c8fe6779ffe87f20d9aa038d22d56823",
-    "pai_cert": "308201d53082017aa00302010202086c24604e65052536300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040ee9cb4b2ca0115debb0e76d8e5f9d7d2cc10281708be8db645686307ff3e0c533526d64a72263d4c034860ba7a927d287af06a550e90421cfac9fc35a465c35a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ceff7615c13eb3dc5805ff76fa47ce9b6c932ebd301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210088e9b4f6ae130197c4bd96465f2509c5c6e91f9d2e7a96b880c09f37c5f38add022100889b97c2f5468dae603a2067f770fb121759bac00001e6e18a2212c45f683489",
-    "certification_declaration": "3082023306092a864886f70d010702a082022430820220020103310d300b06096086480165030402013082018b06092a864886f70d010701a082017c04820178152000012501f1ff3602050180050280050380050480050580050680050780050880050980050a80050b80050c80050d80050e80050f80051080051180051280051380051480051580051680051780051880051980051a80051b80051c80051d80051e80051f80052080052180052280052380052480052580052680052780052880052980052a80052b80052c80052d80052e80052f80053080053180053280053380053480053580053680053780053880053980053a80053b80053c80053d80053e80053f80054080054180054280054380054480054580054680054780054880054980054a80054b80054c80054d80054e80054f80055080055180055280055380055480055580055680055780055880055980055a80055b80055c80055d80055e80055f8005608005618005628005638005648018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c0608fcf5b35c5dec988339672ef27ef1eec78397d5b2b696a48cf843c7afd0e02204c84115dc79dae3a827bcbb737f905474dbc139ce728c5cb9aba294d32e058fe",
-    "dac_private_key": "2dc11f72fcdd63a753ae6185970272378a12d7f2fc5b390b5910a1226a09d69e",
-    "dac_public_key": "04be782bd7639ab91d95ba86ea16d083fd44b86d959986de2de25117c78fdd1273f0ac621683a2f2101562d3b355392aa5e5dc2e73d0e89ef11665ca3093a09538"
+    "dac_cert": "308201e43082018aa003020102020813c9fe0d153b9626300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000495a09e0311075be696398378e4ecca35e1b934305e3728dcb10e9c5570490bb67e348ea57e97f4e672fa6175961f9e36ab87b4cf0defa3d36cc673975772738fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144679a512bc53543f5927544dff9389c1eefa38b5301f0603551d23041830168014f8ee1c6b27d43c7bd4dcbc64a4dc088076e2c0ba300a06082a8648ce3d04030203480030450221008a43da983e7c9b4f2f472e426cda0cf83a4262bb20f86857ccf1913d019584770220294c04a18f1cf019781d7519f39ca519e80a72ac962d56659ffb02fac6e2ded5",
+    "pai_cert": "308201d33082017aa003020102020806d9a6b9cd17946b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e2d2d49d1f0dab8764c82f3cc0741c2eb06e9d179748e740aac361e25a4c2c8933191489ec3c3c09d525b87f8a19f9c65d6358b7310fefaeb412696842ee3444a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f8ee1c6b27d43c7bd4dcbc64a4dc088076e2c0ba301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022020a4ab2de432a23674b86c3e256c5698e6befc62c7792fa8db9da8e1757abe3502204211a398c2f98a112bcba7327bbb3142019221b459c8400e54568d44b057753f",
+    "certification_declaration": "3082021a06092a864886f70d010702a082020b30820207020103310d300b06096086480165030402013082017206092a864886f70d010701a08201630482015f152400012501f1ff3602050180050280050380050480050580050680050780050880050980050a80050b80050c80050d80050e80050f80051080051180051280051380051480051580051680051780051880051980051a80051b80051c80051d80051e80051f80052080052180052280052380052480052580052680052780052880052980052a80052b80052c80052d80052e80052f80053080053180053280053380053480053580053680053780053880053980053a80053b80053c80053d80053e80053f80054080054180054280054380054480054580054680054780054880054980054a80054b80054c80054d80054e80054f80055080055180055280055380055480055580055680055780055880055980055a80055b80055c80055d80055e80055f8005608005618005628005638005648018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207edcef8e1549aa5924f99ebc30b0b117b0ea950e580f024d1d34e27fd6a78cf2022100e4bf6442c088ebe23afe5d4f245cf73ff433fc855d637c35739ad9fa339bd868",
+    "dac_private_key": "22a9d38a41d398f68a81389d436146edc6838eb435043406b6da7795783b2f51",
+    "dac_public_key": "0495a09e0311075be696398378e4ecca35e1b934305e3728dcb10e9c5570490bb67e348ea57e97f4e672fa6175961f9e36ab87b4cf0defa3d36cc673975772738f"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/cd.der
index 5fdb2c8a7440c4..41327bd9ae8e2a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.der
index 76a428365aa9cf..2525cfe9bca670 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.pem
index ab52c5cf595840..5f1bac99b49db3 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIKUC+rxcclS8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIPZpQMT9+ZDIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-EDRuSnlua3UNP1XQ7ZsNszmVeUyyQKWW2yRYR1aT0IB9P9aGCXGmhad3N+u9vSAz
-snSJQzmtRiD74xtEJh/7Q6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFPWyUnmm854VY5QX6TifVyu3OVz3MB8GA1UdIwQYMBaAFKqT
-NrPC7OpusMkH7RZ2hynGpPaBMAoGCCqGSM49BAMCA0gAMEUCIQDzOnutdQkd+DPD
-dEk+fY4MWaeHjcCe9uM3SDm4WmBTqwIgQsj/F+hkdQCOHOpGAqgWC/YmNiHmn8HO
-VJgOvBT7UnA=
+YoSQBcfF0eR46fdkagcZSgIZXCemdE+kqxJr3hmqmW/7Ht03FmeEg30ApXxJtTZe
+e6yBptWKLEIH4y2icGEl7KNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFA88+MiNs1Ui/uPPB9du1venQhjdMB8GA1UdIwQYMBaAFHx+
+w6aX8dHSPDq/FuqoVDtB2wF2MAoGCCqGSM49BAMCA0cAMEQCIFIfXIA4BDpPUlqz
+qWKmiamEkZwhPGCU4qZx/YfzBqEtAiBnAnz+/2qJ5RWAezQTjhuKswGWqin5N0yp
+ylhgjpaRyQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.der
index 0809d8d5d67d19..f12ef5c1d763e8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.pem
index 506ca66b7e970c..a9d067c1087a2a 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILIh4VsbECSwrBT25xHOWuDuZT/aKPeI+kw+vNWEXXPSoAoGCCqGSM49
-AwEHoUQDQgAEEDRuSnlua3UNP1XQ7ZsNszmVeUyyQKWW2yRYR1aT0IB9P9aGCXGm
-had3N+u9vSAzsnSJQzmtRiD74xtEJh/7Qw==
+MHcCAQEEIKzIEz62BaUOoE9ek0M07N4S+CaRDzdjJLdXyEzAI5CYoAoGCCqGSM49
+AwEHoUQDQgAEYoSQBcfF0eR46fdkagcZSgIZXCemdE+kqxJr3hmqmW/7Ht03FmeE
+g30ApXxJtTZee6yBptWKLEIH4y2icGEl7A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.der
index 0d7e0517c1965e..124b4e579547a0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.pem
index 024694e49d132a..f3ee2d18cc5611 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIOP420CaYZg8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIaJIiWfD4jQ8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3QjveKP276vGM9t+5AJJkrF15x4BY
-gTorBzaJFGJpfx+KkrgiYRXEsddxUR+Z8he1Q16tuA0cXScXGECnAnVlo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUqpM2
-s8Ls6m6wyQftFnaHKcak9oEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgY+ghnAvt7FW0b0cUn4RHWrh+w7Cdu1PhRKAx
-Zfg+aXoCIQDeKM217gKGYuL7OUHWYC2tJKFo4u6yIahh/dHM+IFTHg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASsGQ/rIirpSr9eb0vqbHjjqCONVqOc
+zdPaVXoJI2I+jkY/sS2VTMMR+FtAvguB5soEuy2uJBcnbL2gW/RDqJjWo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUfH7D
+ppfx0dI8Or8W6qhUO0HbAXYwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMmxdmC9ogGzocYghwy9edz8bFqcJulWyhSo
+zNQN5DoIAiAErZA2WyOsbrhKnlD5wl8j4BxPy8xFJhhsevIV4rScMw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.der
index 87d2af4680303d..8bac52c697b698 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.pem
index 9e7624d9831bfc..94ec934ac14182 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFc/SOW8St+7CaqM2FTvyqEu9HxQbNo80ER3k9Y1UC9aoAoGCCqGSM49
-AwEHoUQDQgAEd0I73ij9u+rxjPbfuQCSZKxdeceAWIE6Kwc2iRRiaX8fipK4ImEV
-xLHXcVEfmfIXtUNerbgNHF0nFxhApwJ1ZQ==
+MHcCAQEEIG6h2vCNpVtnFNE6BF1BrImj6BOGLgD8rU1u+eosK1fcoAoGCCqGSM49
+AwEHoUQDQgAErBkP6yIq6Uq/Xm9L6mx446gjjVajnM3T2lV6CSNiPo5GP7EtlUzD
+EfhbQL4LgebKBLstriQXJ2y9oFv0Q6iY1g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/test_case_vector.json
index 714a81ca932a2b..9c7038ab9d6569 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count100_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has 100 PID values one of which matches the PID value in DAC.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa00302010202082940beaf171c952f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000410346e4a796e6b750d3f55d0ed9b0db33995794cb240a596db2458475693d0807d3fd6860971a685a77737ebbdbd2033b274894339ad4620fbe31b44261ffb43a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f5b25279a6f39e15639417e9389f572bb7395cf7301f0603551d23041830168014aa9336b3c2ecea6eb0c907ed16768729c6a4f681300a06082a8648ce3d0403020348003045022100f33a7bad75091df833c374493e7d8e0c59a7878dc09ef6e3374839b85a6053ab022042c8ff17e86475008e1cea4602a8160bf6263621e69fc1ce54980ebc14fb5270",
-    "pai_cert": "308201d43082017aa003020102020838fe36d02698660f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000477423bde28fdbbeaf18cf6dfb9009264ac5d79c78058813a2b0736891462697f1f8a92b8226115c4b1d771511f99f217b5435eadb80d1c5d27171840a7027565a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414aa9336b3c2ecea6eb0c907ed16768729c6a4f681301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022063e8219c0bedec55b46f47149f84475ab87ec3b09dbb53e144a03165f83e697a022100de28cdb5ee028662e2fb3941d6602dad24a168e2eeb221a861fdd1ccf881531e",
-    "certification_declaration": "3082023406092a864886f70d010702a082022530820221020103310d300b06096086480165030402013082018b06092a864886f70d010701a082017c04820178152000012501f1ff3602050080050180050280050380050480050580050680050780050880050980050a80050b80050c80050d80050e80050f80051080051180051280051380051480051580051680051780051880051980051a80051b80051c80051d80051e80051f80052080052180052280052380052480052580052680052780052880052980052a80052b80052c80052d80052e80052f80053080053180053280053380053480053580053680053780053880053980053a80053b80053c80053d80053e80053f80054080054180054280054380054480054580054680054780054880054980054a80054b80054c80054d80054e80054f80055080055180055280055380055480055580055680055780055880055980055a80055b80055c80055d80055e80055f8005608005618005628005638018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100bd4d1f301a93348a0ddbc3dd5e211094f895561c05786d9abe73c0d4761c8e24022100fa3ee82640b34776e7db89775cc8d4f84689406050a0479bae67d87903de625d",
-    "dac_private_key": "b221e15b1b1024b0ac14f6e711ce5ae0ee653fda28f788fa4c3ebcd5845d73d2",
-    "dac_public_key": "0410346e4a796e6b750d3f55d0ed9b0db33995794cb240a596db2458475693d0807d3fd6860971a685a77737ebbdbd2033b274894339ad4620fbe31b44261ffb43"
+    "dac_cert": "308201e33082018aa00302010202083d9a50313f7e6432300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000462849005c7c5d1e478e9f7646a07194a02195c27a6744fa4ab126bde19aa996ffb1edd37166784837d00a57c49b5365e7bac81a6d58a2c4207e32da2706125eca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140f3cf8c88db35522fee3cf07d76ed6f7a74218dd301f0603551d230418301680147c7ec3a697f1d1d23c3abf16eaa8543b41db0176300a06082a8648ce3d04030203470030440220521f5c8038043a4f525ab3a962a689a984919c213c6094e2a671fd87f306a12d022067027cfeff6a89e515807b34138e1b8ab30196aa29f9374ca9ca58608e9691c9",
+    "pai_cert": "308201d43082017aa003020102020868922259f0f88d0f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ac190feb222ae94abf5e6f4bea6c78e3a8238d56a39ccdd3da557a0923623e8e463fb12d954cc311f85b40be0b81e6ca04bb2dae2417276cbda05bf443a898d6a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147c7ec3a697f1d1d23c3abf16eaa8543b41db0176301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100c9b17660bda201b3a1c620870cbd79dcfc6c5a9c26e956ca14a8ccd40de43a08022004ad90365b23ac6eb84a9e50f9c25f23e01c4fcbcc4526186c7af215e2b49c33",
+    "certification_declaration": "3082021b06092a864886f70d010702a082020c30820208020103310d300b06096086480165030402013082017206092a864886f70d010701a08201630482015f152400012501f1ff3602050080050180050280050380050480050580050680050780050880050980050a80050b80050c80050d80050e80050f80051080051180051280051380051480051580051680051780051880051980051a80051b80051c80051d80051e80051f80052080052180052280052380052480052580052680052780052880052980052a80052b80052c80052d80052e80052f80053080053180053280053380053480053580053680053780053880053980053a80053b80053c80053d80053e80053f80054080054180054280054380054480054580054680054780054880054980054a80054b80054c80054d80054e80054f80055080055180055280055380055480055580055680055780055880055980055a80055b80055c80055d80055e80055f8005608005618005628005638018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d1ea878a4afdc2fa9421b821a0aa13c91adb7073a7aa522a37427e3deedddb0f022100fb4bd91f26623af67968c235f769685dbd216676a3a5e8be68a22882e8bb5426",
+    "dac_private_key": "acc8133eb605a50ea04f5e934334ecde12f826910f376324b757c84cc0239098",
+    "dac_public_key": "0462849005c7c5d1e478e9f7646a07194a02195c27a6744fa4ab126bde19aa996ffb1edd37166784837d00a57c49b5365e7bac81a6d58a2c4207e32da2706125ec"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/cd.der
index 968bc702c62748..43d531b4624830 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.der
index 942b24eb99e673..0501b7e41b8bf2 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.pem
index 6b00a6ab380735..49c4b7d4c344a8 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIdd/hpoFGflEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIbFC0zsD27mcwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-VslFXMsXyx0oTj+80hh69FCfHDWtK9SmG+WX2+3LoZobmPW+NpLFZ5UomYVXVueb
-x9sb7E/3PfoRjzJq+DuQn6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFFn2DzSMSDadeoMcA+lWEBdaAO2XMB8GA1UdIwQYMBaAFHOk
-QSmm9sKNG4BjfDwxTJVKpwV4MAoGCCqGSM49BAMCA0gAMEUCIGeetvKl8lS9cGR/
-3nDjgH05MAz67b0TLi3Zz3vDTgwGAiEA3ceMpFFRGFyAiP4oQDiwAKShy7HTrdxg
-Znnz6iTlD9c=
+G9bKrEORbzIFFBpp9vI3Ab9HXuGv3SBQ4uTi2AYfksDcIom/W2+BvuBa1fCETS80
+bPRXBkvSpBFfWsS8EylmYKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFE8Myq7fUr6h1E8gRNlRJRUgbs5BMB8GA1UdIwQYMBaAFB3n
+wOLTcufpeGQHM34oZdQcmI0JMAoGCCqGSM49BAMCA0gAMEUCIAFy6xcrZvb1Lp+F
+n0iPPv4fpWzi7Ca+3NQxhJ16DMpjAiEA9rwxac51x6r6Gql7AIzx4BUtztv7lR6z
+04iiZ0pyavM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.der
index 1472db84152830..42566ebff8ae8b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.pem
index 09ce7da1891973..00018d5f4ece2d 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMMmNtM/gsT0DGUM1ajcicF+lW1riZqQQjVr6tD9unUQoAoGCCqGSM49
-AwEHoUQDQgAEVslFXMsXyx0oTj+80hh69FCfHDWtK9SmG+WX2+3LoZobmPW+NpLF
-Z5UomYVXVuebx9sb7E/3PfoRjzJq+DuQnw==
+MHcCAQEEIHi/OsLOciaMsVYZ9GZzTcUOwlE5KuMzK3B34/NPmpk8oAoGCCqGSM49
+AwEHoUQDQgAEG9bKrEORbzIFFBpp9vI3Ab9HXuGv3SBQ4uTi2AYfksDcIom/W2+B
+vuBa1fCETS80bPRXBkvSpBFfWsS8EylmYA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.der
index 95775b2aa7fa5f..f71b86f62ba3eb 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.pem
index 1cca97a238cf89..6c4d4ea3b3973a 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIbOGPY+3gWYwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIKFfdYB6otNowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS1XNaIIOS/v7TMnAhxOSKiPFlnqJY6
-s22tUYKfyFBXUIK9TNeILZSzJFdtMLcc5mOmyrdOeXHD0bPmiyx5UIECo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUc6RB
-Kab2wo0bgGN8PDFMlUqnBXgwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAIzKLF9RkPbpHOYTgbEYlMt10MrJG9t/Dj6L
-ithQdOzBAiEA7bfTYVT/njOx/PFzjr7SV98bClphWWI5IuyQjy9s7WU=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ2kE9VIYWUNc6I4SyoYNTbKpImulCM
+AHitjfFV4jBLaoKh/LDugku27pu+/fUzptpY57vtqKQB/M7FcGE/mzHIo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUHefA
+4tNy5+l4ZAczfihl1ByYjQkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJQoCneJtl0+oyhWReku97S9bUHkefpCmaA/
+GgyL3yniAiBGIfeipQmmgG+kxgez4NA3+n1BFPQq69UaT0XjH0ZiVA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.der
index a06acf30392709..517df9575b80d8 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.pem
index 39c4f68027a12a..d425b1209cccde 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGyHHnffjmEkuASt83Pf4uDv9bBoUxuR34chfoIQ+g6LoAoGCCqGSM49
-AwEHoUQDQgAEtVzWiCDkv7+0zJwIcTkiojxZZ6iWOrNtrVGCn8hQV1CCvUzXiC2U
-syRXbTC3HOZjpsq3Tnlxw9Gz5osseVCBAg==
+MHcCAQEEIPKtBW/zmJJPTTLiKsFtgEOSvpin8uLfLheeYyW9Tp5PoAoGCCqGSM49
+AwEHoUQDQgAENpBPVSGFlDXOiOEsqGDU2yqSJrpQjAB4rY3xVeIwS2qCofyw7oJL
+tu6bvv31M6baWOe77aikAfzOxXBhP5sxyA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/test_case_vector.json
index 48c0a5790a3545..560412e4a8d322 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has 10 PID values none of which matches the PID value in DAC.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020875dfe1a681467e51300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000456c9455ccb17cb1d284e3fbcd2187af4509f1c35ad2bd4a61be597dbedcba19a1b98f5be3692c567952899855756e79bc7db1bec4ff73dfa118f326af83b909fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041459f60f348c48369d7a831c03e95610175a00ed97301f0603551d2304183016801473a44129a6f6c28d1b80637c3c314c954aa70578300a06082a8648ce3d04030203480030450220679eb6f2a5f254bd70647fde70e3807d39300cfaedbd132e2dd9cf7bc34e0c06022100ddc78ca45151185c8088fe284038b000a4a1cbb1d3addc606679f3ea24e50fd7",
-    "pai_cert": "308201d53082017aa00302010202086ce18f63ede0598c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b55cd68820e4bfbfb4cc9c08713922a23c5967a8963ab36dad51829fc850575082bd4cd7882d94b324576d30b71ce663a6cab74e7971c3d1b3e68b2c79508102a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041473a44129a6f6c28d1b80637c3c314c954aa70578301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008cca2c5f5190f6e91ce61381b11894cb75d0cac91bdb7f0e3e8b8ad85074ecc1022100edb7d36154ff9e33b1fcf1738ebed257df1b0a5a6159623922ec908f2f6ced65",
-    "certification_declaration": "3082011e06092a864886f70d010702a082010f3082010b020103310d300b0609608648016503040201307906092a864886f70d010701a06c046a152000012501f1ff3602050180050280050380050480050580050680050780050880050980050a8018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402203d38b329272ff8c8fd77dfd4e72b69644883362f6d1b55b15b94e027bda056780220221c16d31dcde97337d7eab24f07a019ff2246328821fe5cecba563c0f69232b",
-    "dac_private_key": "c32636d33f82c4f40c650cd5a8dc89c17e956d6b899a9042356bead0fdba7510",
-    "dac_public_key": "0456c9455ccb17cb1d284e3fbcd2187af4509f1c35ad2bd4a61be597dbedcba19a1b98f5be3692c567952899855756e79bc7db1bec4ff73dfa118f326af83b909f"
+    "dac_cert": "308201e43082018aa00302010202086c50b4cec0f6ee67300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041bd6caac43916f3205141a69f6f23701bf475ee1afdd2050e2e4e2d8061f92c0dc2289bf5b6f81bee05ad5f0844d2f346cf457064bd2a4115f5ac4bc13296660a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144f0ccaaedf52bea1d44f2044d9512515206ece41301f0603551d230418301680141de7c0e2d372e7e9786407337e2865d41c988d09300a06082a8648ce3d040302034800304502200172eb172b66f6f52e9f859f488f3efe1fa56ce2ec26bedcd431849d7a0cca63022100f6bc3169ce75c7aafa1aa97b008cf1e0152dcedbfb951eb3d388a2674a726af3",
+    "pai_cert": "308201d43082017aa00302010202082857dd601ea8b4da300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000436904f5521859435ce88e12ca860d4db2a9226ba508c0078ad8df155e2304b6a82a1fcb0ee824bb6ee9bbefdf533a6da58e7bbeda8a401fccec570613f9b31c8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141de7c0e2d372e7e9786407337e2865d41c988d09301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210094280a7789b65d3ea3285645e92ef7b4bd6d41e479fa4299a03f1a0c8bdf29e202204621f7a2a509a6806fa4c607b3e0d037fa7d4114f42aebd51a4f45e31f466254",
+    "certification_declaration": "3082010406092a864886f70d010702a081f63081f3020103310d300b0609608648016503040201306006092a864886f70d010701a0530451152400012501f1ff3602050180050280050380050480050580050680050780050880050980050a8018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022003ee4d0af4f660acb22916e20add28c200535ff6119c9b6f265ad91f306e0c1f022100a93bb5f92bedba63c2d0ca7109e61191dbad4ddae05e05c43e153c162dbd6e17",
+    "dac_private_key": "78bf3ac2ce72268cb15619f466734dc50ec251392ae3332b7077e3f34f9a993c",
+    "dac_public_key": "041bd6caac43916f3205141a69f6f23701bf475ee1afdd2050e2e4e2d8061f92c0dc2289bf5b6f81bee05ad5f0844d2f346cf457064bd2a4115f5ac4bc13296660"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/cd.der
index 66ea8e33913732..0250163181b6db 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.der
index e7bd19a6026722..36cb18b1f727dd 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.pem
index b2265d42f59d9a..dc4671e6369169 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIID5rymQC724gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIE8cnkzKDd04wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-Kl9ZstKXeKmh8QwrzksjcXeEXmGvcOiMC2mWcpLjlg6EGPcLK/F/4plRI/U1JCyT
-hU98UW+ygYQ4L9VhH6Z+ZaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFNIQ188Ovm1Q0cQilHEpcg5psjWYMB8GA1UdIwQYMBaAFPdf
-d6EMk8ji49JDNwk47EeXSufpMAoGCCqGSM49BAMCA0cAMEQCIASLZ3UqYirWQW0v
-OvDc3akOvcwlFzsF0bbX560YuNgpAiBOS5qF5xuZyiT2VCokb8pznHLGsXUUYEs/
-UfJSCIjjfQ==
+TTCgopE9PkMKUpD297fBDwkTZ888NcrNSRjr66cOFlAPio9yBXUM+37XyCOTApA6
+MPYWssm2RXCuvIxXEK8DwKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFAfCkdBTP0DgdSYCDIE+ZnZY6kMUMB8GA1UdIwQYMBaAFHUT
+Ufv6n5pezCVMynJTACfghKqzMAoGCCqGSM49BAMCA0gAMEUCIQDrhfhgpA3KHs03
+/F7dMg7Z5OtjR1qBm+xgCnqHdFbYTAIgFNopH9MRoJ1iImnaFkVu+6UTiipSQs5Q
+Iwcl3arWlPU=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.der
index 097f1352ed81f0..91fab3dac09897 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.pem
index fd84ef21be1be7..09bdb16f56d9c1 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIG2LPNOto98L63qpTGXkTcKC5xBfSuJPFkL8w+il6pz9oAoGCCqGSM49
-AwEHoUQDQgAEKl9ZstKXeKmh8QwrzksjcXeEXmGvcOiMC2mWcpLjlg6EGPcLK/F/
-4plRI/U1JCyThU98UW+ygYQ4L9VhH6Z+ZQ==
+MHcCAQEEIP0NGyTqlOmJbUrp0Sls61g98Vf2VcuDpaMez2sp0tKPoAoGCCqGSM49
+AwEHoUQDQgAETTCgopE9PkMKUpD297fBDwkTZ888NcrNSRjr66cOFlAPio9yBXUM
++37XyCOTApA6MPYWssm2RXCuvIxXEK8DwA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.der
index ae499fe1c6fbee..c252c5ff7478f9 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.pem
index f06ad86779baf3..b45c369e7796f9 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIISt9GFWbDYVowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIEtS1DVVRH+8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT7vWtMRQJo2r7s/xVP+nngU6JjBsmp
-Z7FYzTW7SVwwVu+7MmJTRX+nOw2sQKkIXmn+n9NRcNUaKLAOOIokEkJHo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU9193
-oQyTyOLj0kM3CTjsR5dK5+kwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgN0dv8sWuRUnYnIc+pmG6HJRACYVwnamjWW+5
-LBFGKj8CIFCwY42gdkZQpSPRtIibPXpCOMzbMA7lCF1hsRzRcfBJ
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARP9BRoLG76BAqTHWnUc3VTHXM4XczL
+zVVzlz76I5nAMZ+j1C0nicAKv/vZY2hWEwva7OHnNbJaeUdZboz5hxw9o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUdRNR
++/qfml7MJUzKclMAJ+CEqrMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgT1GJy9EcGcPcDLuxcsxQDxc3ncZNZWn6d6nA
+LDUI0zMCIFEcu5VDoh9AIMMC/zDE+niko6lxtXRFwsWFvVagXZ7V
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.der
index 70d2b3de5ef878..0ef00edb98865a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.pem
index 8681158a6fea58..c4b8e1596347fd 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAJcPXOcjEDfD+Sad36LwkbhP7Wpf/0CTu9JeojV5KTsoAoGCCqGSM49
-AwEHoUQDQgAE+71rTEUCaNq+7P8VT/p54FOiYwbJqWexWM01u0lcMFbvuzJiU0V/
-pzsNrECpCF5p/p/TUXDVGiiwDjiKJBJCRw==
+MHcCAQEEIKz9OO/cjLQ2X8iJJ07NAOIi3tqALYsV0rHDB00XzxfUoAoGCCqGSM49
+AwEHoUQDQgAET/QUaCxu+gQKkx1p1HN1Ux1zOF3My81Vc5c++iOZwDGfo9QtJ4nA
+Cr/72WNoVhML2uzh5zWyWnlHWW6M+YccPQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/test_case_vector.json
index be7843a18acfce..61a9e7c0acf6e2 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field has 10 PID values one of which matches the PID value in DAC.",
     "is_success_case": "true",
-    "dac_cert": "308201e33082018aa00302010202080f9af29900bbdb88300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042a5f59b2d29778a9a1f10c2bce4b237177845e61af70e88c0b69967292e3960e8418f70b2bf17fe2995123f535242c93854f7c516fb28184382fd5611fa67e65a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d210d7cf0ebe6d50d1c422947129720e69b23598301f0603551d23041830168014f75f77a10c93c8e2e3d243370938ec47974ae7e9300a06082a8648ce3d04030203470030440220048b67752a622ad6416d2f3af0dcdda90ebdcc25173b05d1b6d7e7ad18b8d82902204e4b9a85e71b99ca24f6542a246fca739c72c6b17514604b3f51f2520888e37d",
-    "pai_cert": "308201d33082017aa00302010202084adf461566c3615a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fbbd6b4c450268dabeecff154ffa79e053a26306c9a967b158cd35bb495c3056efbb326253457fa73b0dac40a9085e69fe9fd35170d51a28b00e388a24124247a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f75f77a10c93c8e2e3d243370938ec47974ae7e9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022037476ff2c5ae4549d89c873ea661ba1c94400985709da9a3596fb92c11462a3f022050b0638da0764650a523d1b4889b3d7a4238ccdb300ee5085d61b11cd171f049",
-    "certification_declaration": "3082011f06092a864886f70d010702a08201103082010c020103310d300b0609608648016503040201307906092a864886f70d010701a06c046a152000012501f1ff360205008005018005028005038005048005058005068005078005088005098018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220279ee772fed94f6b82b48f2dd16130a902d4ec2bb8d1b3d9712a48f91efed02e022100c9ba714ba1f2530e8ee49d4a8ce8cabe34c52fca7598f461f4764be0606fbd59",
-    "dac_private_key": "6d8b3cd3ada3df0beb7aa94c65e44dc282e7105f4ae24f1642fcc3e8a5ea9cfd",
-    "dac_public_key": "042a5f59b2d29778a9a1f10c2bce4b237177845e61af70e88c0b69967292e3960e8418f70b2bf17fe2995123f535242c93854f7c516fb28184382fd5611fa67e65"
+    "dac_cert": "308201e43082018aa003020102020813c727933283774e300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044d30a0a2913d3e430a5290f6f7b7c10f091367cf3c35cacd4918ebeba70e16500f8a8f7205750cfb7ed7c8239302903a30f616b2c9b64570aebc8c5710af03c0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041407c291d0533f40e07526020c813e667658ea4314301f0603551d23041830168014751351fbfa9f9a5ecc254cca72530027e084aab3300a06082a8648ce3d0403020348003045022100eb85f860a40dca1ecd37fc5edd320ed9e4eb63475a819bec600a7a877456d84c022014da291fd311a09d622269da16456efba5138a2a5242ce50230725ddaad694f5",
+    "pai_cert": "308201d33082017aa003020102020812d4b50d55511fef300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044ff414682c6efa040a931d69d47375531d73385dcccbcd5573973efa2399c0319fa3d42d2789c00abffbd9636856130bdaece1e735b25a7947596e8cf9871c3da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414751351fbfa9f9a5ecc254cca72530027e084aab3301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402204f5189cbd11c19c3dc0cbbb172cc500f17379dc64d6569fa77a9c02c3508d3330220511cbb9543a21f4020c302ff30c4fa78a4a3a971b57445c2c585bd56a05d9ed5",
+    "certification_declaration": "3082010406092a864886f70d010702a081f63081f3020103310d300b0609608648016503040201306006092a864886f70d010701a0530451152400012501f1ff360205008005018005028005038005048005058005068005078005088005098018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220302965578573f3811244946361f79ce605b02863de179d8ac6a36efb8b78a67e0221009f15b1f4c93acfae9d9c4302c18f6ead7a2a3f3beeb37575085dd1f157db42aa",
+    "dac_private_key": "fd0d1b24ea94e9896d4ae9d1296ceb583df157f655cb83a5a31ecf6b29d2d28f",
+    "dac_public_key": "044d30a0a2913d3e430a5290f6f7b7c10f091367cf3c35cacd4918ebeba70e16500f8a8f7205750cfb7ed7c8239302903a30f616b2c9b64570aebc8c5710af03c0"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/cd.der
index cbe968c3033efc..e8a01dab22e82f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.der
index 025a61e9e55218..4734628fa585fc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.pem
index 5090e20f80a13e..c783ec20848a6b 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIICMfC1tClixEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIH9qkKZHMv1wwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-TYDm9E12N+b00xMBGW3mNh2w5fHM0Q0Cxf3lTBPBBqUY6rBZ7saTM8HRWe2bps+r
-zZbESdTb03LsO77UdFsOhaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFOhLlp4xBCd8CiXsL9LgFM9sq7xQMB8GA1UdIwQYMBaAFDB1
-gVp3d5YkrAZJtoIULEIUVk19MAoGCCqGSM49BAMCA0gAMEUCIF/mNcmOFTdcnAKH
-2rqdCeiRDrkU6huWlShRsOQ6Na0lAiEAl6kEtE6QthZyYm+bsPq2DlSAQGHlulhz
-FXmdlb4qKbg=
+T+vfioMWjXp8e+L8bULan3eDYhBeClzCcJ9xKu1xsYk7vsCfseUBt1tN9umdc6LN
+rLDeaN3bAb7wrvLUZrnh3aNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFBNv3kgZVPEJd6q1TA5KtyIPaQdBMB8GA1UdIwQYMBaAFJ/P
+nqO+7WWuDl7cppYA9KIPoQWXMAoGCCqGSM49BAMCA0cAMEQCIGMkyrqxcSary5CS
+XQUBzBcvB9frirQzkPDakrGxjyomAiBZIc+QVtUa2pEK3Go3fGRTaXANMaiiGOqs
+mdMLYF5/WQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.der
index 7ac88a6882181d..be18ecb77996c5 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.pem
index 1155c901cb7a46..cc54f0b94e1efe 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEhh4VsccqiA3Zp27h5LDxhPtUxmlOmiIy+cwHxqcS60oAoGCCqGSM49
-AwEHoUQDQgAETYDm9E12N+b00xMBGW3mNh2w5fHM0Q0Cxf3lTBPBBqUY6rBZ7saT
-M8HRWe2bps+rzZbESdTb03LsO77UdFsOhQ==
+MHcCAQEEIEVn8T+GDKbO/KI2Ktrjn30TxEz41cvg0V56bhPcNeXJoAoGCCqGSM49
+AwEHoUQDQgAET+vfioMWjXp8e+L8bULan3eDYhBeClzCcJ9xKu1xsYk7vsCfseUB
+t1tN9umdc6LNrLDeaN3bAb7wrvLUZrnh3Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.der
index d441ee934f9721..2a19a56821cdc4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.pem
index 6ac58ee3b781b1..879646c9d4248b 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIMY5vvanUmVowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIck3aCJDGo3gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATN3SFe8aCtSSzLO35WRLw4nN2GkK5d
-JMFb+PHDjxtZxSjgjqWCxy43Xwt0TsZVeUhsgp45PYDPVxZG6x8p1DXzo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUMHWB
-Wnd3liSsBkm2ghQsQhRWTX0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgRY2QpWeE3fcUo2s1ICtUnh5WGO38IDXfMFuG
-3pa1BGYCIDgJ0pcVWqnq2jSrs4M1T/dCVFMWnNSTUT9VJ4NHtJ01
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQc9LCZ0JRJa2+j9N1y9SoKB0K7Z1gu
+INJO9NHPjm9NiHBoTMSa4J5a3ssCQ5P9ZyAyRuIdBjUcMkYiZlzCtyTUo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUn8+e
+o77tZa4OXtymlgD0og+hBZcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAI+RpztWRoADQOBOH3R4dxCGQwVh7x7QLtGd
+lcKczAaqAiBOAZBix56XFbJUIECR27ONorZ2JN6xNimzC5MwCNsC2w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.der
index 19b4581b7baccc..c0c19b9c5ba773 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.pem
index b724bc64c7ea5c..7835705f078571 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAiRCMeYrn6/O4n2CVP4vvrc0s4Ec8SJhoBaXSyQmKtEoAoGCCqGSM49
-AwEHoUQDQgAEzd0hXvGgrUksyzt+VkS8OJzdhpCuXSTBW/jxw48bWcUo4I6lgscu
-N18LdE7GVXlIbIKeOT2Az1cWRusfKdQ18w==
+MHcCAQEEICNFOocgST58fFlzVdTovLAx6P9ZTxctb5uvQy8zNb6foAoGCCqGSM49
+AwEHoUQDQgAEHPSwmdCUSWtvo/TdcvUqCgdCu2dYLiDSTvTRz45vTYhwaEzEmuCe
+Wt7LAkOT/WcgMkbiHQY1HDJGImZcwrck1A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/test_case_vector.json
index e4c8f3d27ad77a..7fabff203d094e 100644
--- a/credentials/development/commissioner_dut/struct_cd_pid_array_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_pid_array_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The product_id_array field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020808c7c2d6d0a58b11300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044d80e6f44d7637e6f4d31301196de6361db0e5f1ccd10d02c5fde54c13c106a518eab059eec69333c1d159ed9ba6cfabcd96c449d4dbd372ec3bbed4745b0e85a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e84b969e3104277c0a25ec2fd2e014cf6cabbc50301f0603551d230418301680143075815a77779624ac0649b682142c4214564d7d300a06082a8648ce3d040302034800304502205fe635c98e15375c9c0287daba9d09e8910eb914ea1b96952851b0e43a35ad2502210097a904b44e90b61672626f9bb0fab60e54804061e5ba587315799d95be2a29b8",
-    "pai_cert": "308201d33082017aa0030201020208318e6fbda9d4995a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004cddd215ef1a0ad492ccb3b7e5644bc389cdd8690ae5d24c15bf8f1c38f1b59c528e08ea582c72e375f0b744ec65579486c829e393d80cf571646eb1f29d435f3a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604143075815a77779624ac0649b682142c4214564d7d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220458d90a56784ddf714a36b35202b549e1e5618edfc2035df305b86de96b5046602203809d297155aa9eada34abb383354ff7425453169cd493513f55278347b49d35",
-    "certification_declaration": "3081fc06092a864886f70d010702a081ee3081eb020103310d300b0609608648016503040201305806092a864886f70d010701a04b0449152000012501f1ff250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207bc399d97e81bf2edd52b123e061510c2d8609382c0df0b105321fde35ad7886022100c0b3945714ea5a57afad9abef787345be01b3af75ed028b94ef5bcb510b8d2b7",
-    "dac_private_key": "4861e15b1c72a880dd9a76ee1e4b0f184fb54c6694e9a2232f9cc07c6a712eb4",
-    "dac_public_key": "044d80e6f44d7637e6f4d31301196de6361db0e5f1ccd10d02c5fde54c13c106a518eab059eec69333c1d159ed9ba6cfabcd96c449d4dbd372ec3bbed4745b0e85"
+    "dac_cert": "308201e33082018aa00302010202081fdaa42991ccbf5c300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044febdf8a83168d7a7c7be2fc6d42da9f778362105e0a5cc2709f712aed71b1893bbec09fb1e501b75b4df6e99d73a2cdacb0de68dddb01bef0aef2d466b9e1dda360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414136fde481954f10977aab54c0e4ab7220f690741301f0603551d230418301680149fcf9ea3beed65ae0e5edca69600f4a20fa10597300a06082a8648ce3d040302034700304402206324cabab17126abcb90925d0501cc172f07d7eb8ab43390f0da92b1b18f2a2602205921cf9056d51ada910adc6a377c645369700d31a8a218eaac99d30b605e7f59",
+    "pai_cert": "308201d43082017aa0030201020208724dda0890c6a378300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041cf4b099d094496b6fa3f4dd72f52a0a0742bb67582e20d24ef4d1cf8e6f4d8870684cc49ae09e5adecb024393fd67203246e21d06351c324622665cc2b724d4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604149fcf9ea3beed65ae0e5edca69600f4a20fa10597301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221008f91a73b5646800340e04e1f7478771086430561ef1ed02ed19d95c29ccc06aa02204e019062c79e9715b254204091dbb38da2b67624deb13629b30b933008db02db",
+    "certification_declaration": "3081e406092a864886f70d010702a081d63081d3020103310d300b0609608648016503040201303f06092a864886f70d010701a0320430152400012501f1ff250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210090cc80d5df9abd077d88a1419ab98362e7dca75c63d792f55587bf60aac3a6be022100814b62096f52d8c92e724c411e9d566c37b243f1ad75685a7c25a182acb59786",
+    "dac_private_key": "4567f13f860ca6cefca2362adae39f7d13c44cf8d5cbe0d15e7a6e13dc35e5c9",
+    "dac_public_key": "044febdf8a83168d7a7c7be2fc6d42da9f778362105e0a5cc2709f712aed71b1893bbec09fb1e501b75b4df6e99d73a2cdacb0de68dddb01bef0aef2d466b9e1dd"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_security_info_missing/cd.der
index 262f81196ca656..8c08a06c6d0c77 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_security_info_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.der
index 5651de1347e3e3..ba29a578c0210a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.pem
index c69896ae810ff3..27907d14fa8d24 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIINkgq+3kzXlEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIH5g5sjEL+FgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-PWQPXR4Aoi4zCl0HZuuZFI2lFyWJOdTV3fQsmc5zb0B879vXuS8h68+GVsUsguB0
-sD2NW7KwP9YON+XwyH6FCKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFNYgvu2nrsdyuPzMnP5EggQSTgaDMB8GA1UdIwQYMBaAFGol
-yH3xUpQZnfeOPTbHjpFmMUKsMAoGCCqGSM49BAMCA0kAMEYCIQCoc72c0vWxxmaH
-Rk2DR2TR1ugyB8zCZ5oTHDD/EI3VSwIhAJCpBgeiRiN1wm9cM9giizUWme12dvrV
-GfcCjj91lJYk
+Fi8tcGWQynfJ4d4KGD0Ryh3JmNbTG8Xg8sy5umUry6sHxxNmwTWfVocqa8cV9y/p
+8fSo/8s81IfJHt7Qy4QgAKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFGLJBJPI7bq54ow+0ImBkLQ6k3QyMB8GA1UdIwQYMBaAFH+d
+8JayO+IZ/2RNdaw+wITq3SsVMAoGCCqGSM49BAMCA0gAMEUCIFWmkGmDbjRYMtVw
+segpQ4isti4EsAf1/VJMvZVXEe9DAiEAuZxKmlVBK8M+3m8/eq7RibwbOgajrML6
+ExRxDn2bQtU=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.der
index 6c833a1623a51c..66f8639b21fffe 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.pem
index c88a69fbe4945f..1caffcc5ad9909 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILYOAwiQ90NNo3utsfK4CXDJXBaCDP0FtzhdetGpmEHYoAoGCCqGSM49
-AwEHoUQDQgAEPWQPXR4Aoi4zCl0HZuuZFI2lFyWJOdTV3fQsmc5zb0B879vXuS8h
-68+GVsUsguB0sD2NW7KwP9YON+XwyH6FCA==
+MHcCAQEEIBsmzTsfAHILxb8TbREXIctC1rbYit+uusLu/92O7JMfoAoGCCqGSM49
+AwEHoUQDQgAEFi8tcGWQynfJ4d4KGD0Ryh3JmNbTG8Xg8sy5umUry6sHxxNmwTWf
+Vocqa8cV9y/p8fSo/8s81IfJHt7Qy4QgAA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.der
index aa4ad0463d4e6a..42af913ed73cbd 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.pem
index 734657be29cc0f..11a3ed086c323f 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIcqi0cRy/dGswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIILb/DAe+YpVUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATY9Jk5ELR8Pz2EezIfe10choDhDy6M
-1KFJgisorM7DMD0EcXiW5GdlD2b4iS7E1KWO6SKzIxoOD6Od7nH9ciioo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUaiXI
-ffFSlBmd9449NseOkWYxQqwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgR66WUV5/zgshaKrquy5lJ/I756xIyTG/k4AK
-F5nv97UCIDaNxJCLJVpmZjSav4uDr8W5aMiJS0Xl8KXuTFd9FVon
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATepFMXaRBdehjPyACEcUngZ1eXrf5V
+dQK6eKLwNAparXTQ2RN3dDyonVEljk0qMbmLJ9spyGMcImz43YuS2bSzo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUf53w
+lrI74hn/ZE11rD7AhOrdKxUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAILDFhcaT52WoRowOHNdj3h2os5nDS1DBViI
+kDusUiPpAiEAnivtRlEAS/extx1PiLADTdB9DqdnelEz3TsmW+DPdRY=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.der
index 53fc3b1d9a9984..ebf5ea8903a056 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.pem
index 083104fbb519c3..668ba23f2c500c 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIO2SX/jJBTl3eehl5OnCq7O5IiljiCM0jvRM5Zo2FEVhoAoGCCqGSM49
-AwEHoUQDQgAE2PSZORC0fD89hHsyH3tdHIaA4Q8ujNShSYIrKKzOwzA9BHF4luRn
-ZQ9m+IkuxNSljukisyMaDg+jne5x/XIoqA==
+MHcCAQEEIJmRfnnjUwHW3dp35Y9ZAlLA/20QLt8u1w5YlYlKgAVKoAoGCCqGSM49
+AwEHoUQDQgAE3qRTF2kQXXoYz8gAhHFJ4GdXl63+VXUCunii8DQKWq100NkTd3Q8
+qJ1RJY5NKjG5iyfbKchjHCJs+N2Lktm0sw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_security_info_missing/test_case_vector.json
index db7c8949cacb95..c26acd865bf73a 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The security_information field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa003020102020836482afb79335e51300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043d640f5d1e00a22e330a5d0766eb99148da517258939d4d5ddf42c99ce736f407cefdbd7b92f21ebcf8656c52c82e074b03d8d5bb2b03fd60e37e5f0c87e8508a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d620beeda7aec772b8fccc9cfe448204124e0683301f0603551d230418301680146a25c87df15294199df78e3d36c78e91663142ac300a06082a8648ce3d0403020349003046022100a873bd9cd2f5b1c66687464d834764d1d6e83207ccc2679a131c30ff108dd54b02210090a90607a2462375c26f5c33d8228b351699ed7676fad519f7028e3f75949624",
-    "pai_cert": "308201d33082017aa003020102020872a8b4711cbf746b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d8f4993910b47c3f3d847b321f7b5d1c8680e10f2e8cd4a149822b28accec3303d04717896e467650f66f8892ec4d4a58ee922b3231a0e0fa39dee71fd7228a8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146a25c87df15294199df78e3d36c78e91663142ac301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022047ae96515e7fce0b2168aaeabb2e6527f23be7ac48c931bf93800a1799eff7b50220368dc4908b255a6666349abf8b83afc5b968c8894b45e5f0a5ee4c577d155a27",
-    "certification_declaration": "3081ff06092a864886f70d010702a081f13081ee020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022037d8e948fc8bba52507f628a75038db9c50ff7f1f1d2d8c04f4e4b12c7dbaccb022100f2da2ba38820d85f1adde06b766d11e4fecb358c7cf4522a72a404279cf8290e",
-    "dac_private_key": "b60e030890f7434da37badb1f2b80970c95c16820cfd05b7385d7ad1a99841d8",
-    "dac_public_key": "043d640f5d1e00a22e330a5d0766eb99148da517258939d4d5ddf42c99ce736f407cefdbd7b92f21ebcf8656c52c82e074b03d8d5bb2b03fd60e37e5f0c87e8508"
+    "dac_cert": "308201e43082018aa00302010202081f9839b2310bf858300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004162f2d706590ca77c9e1de0a183d11ca1dc998d6d31bc5e0f2ccb9ba652bcbab07c71366c1359f56872a6bc715f72fe9f1f4a8ffcb3cd487c91eded0cb842000a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041462c90493c8edbab9e28c3ed0898190b43a937432301f0603551d230418301680147f9df096b23be219ff644d75ac3ec084eadd2b15300a06082a8648ce3d0403020348003045022055a69069836e345832d570b1e8294388acb62e04b007f5fd524cbd955711ef43022100b99c4a9a55412bc33ede6f3f7aaed189bc1b3a06a3acc2fa1314710e7d9b42d5",
+    "pai_cert": "308201d53082017aa00302010202082dbfc301ef98a555300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004dea4531769105d7a18cfc800847149e0675797adfe557502ba78a2f0340a5aad74d0d91377743ca89d51258e4d2a31b98b27db29c8631c226cf8dd8b92d9b4b3a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147f9df096b23be219ff644d75ac3ec084eadd2b15301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210082c316171a4f9d96a11a3038735d8f7876a2ce670d2d43055888903bac5223e90221009e2bed4651004bf7b1b71d4f88b0034dd07d0ea7677a5133dd3b265be0cf7516",
+    "certification_declaration": "3081e606092a864886f70d010702a081d83081d5020103310d300b0609608648016503040201304206092a864886f70d010701a0350433152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100cf1310f8316f1d1d5b2ee2aee1e0169195ce52fc98f18b5c81327ae66b40ec6f02202ee3d05d763838996818ed91d77c5ee2813c056f4b4c8029c771dd2573c6a4d8",
+    "dac_private_key": "1b26cd3b1f00720bc5bf136d111721cb42d6b6d88adfaebac2eeffdd8eec931f",
+    "dac_public_key": "04162f2d706590ca77c9e1de0a183d11ca1dc998d6d31bc5e0f2ccb9ba652bcbab07c71366c1359f56872a6bc715f72fe9f1f4a8ffcb3cd487c91eded0cb842000"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/cd.der b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/cd.der
index e7c193f3f35766..34e55f98720c05 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/cd.der and b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.der
index 56525c6e436896..d7022d5e7da624 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.pem
index 9379781737b56e..b7a449d1f8bcd3 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIZB50ywoitc8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIH55AH3crSy8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-9HwXYG4H8oKW1KWZJaHBnR4f8Z5EgPOW5Z+qvSs9JWOOWRvpKnG08YelO9neAqa0
-ABgi2OdoTQaAEATdYBSqTaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFKXELYAygaUtUCTcxSExn98fM+ndMB8GA1UdIwQYMBaAFG7C
-vbCZOGdvJLPuDtPG41FWU+YdMAoGCCqGSM49BAMCA0gAMEUCIBt0iroUPvZ3jjjq
-OiVEQ4lssd92AkYYeYPKoAKXdL8iAiEA7VgOqYNsvlsSzzGmowYkYgcwKnfWFRq0
-d6I9mAWcyDM=
+mJQj+eDbC7PyLNjGhp4ZLE0JeCxyO6JfsuP8Yj+kCTK88iqnIWed9vqACAiuWNoj
+mcJUuguiQ2gSs/lrlMbbVKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFKOPFWOl4q6Eio5oElj1olAAzUj8MB8GA1UdIwQYMBaAFGNn
+uhMP2HqjxDjP3PQbJBz4MhJpMAoGCCqGSM49BAMCA0gAMEUCIQDn8y0JWuSUKGNs
+ZvWFCcn/Pbi6mCAmbQ3sIq07lviB+gIgC3h1ayz4ThXjaNGZ/cFwg/kxn01Q5dei
+whwBedhwkbk=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.der
index 130f962702f969..2421745b29f8ae 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.pem
index 9a6f269f1b9655..0e7b337841ea20 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOPfxG36Irs4ginNkhObDyzVLc7vd2UA/f12TKz06oDXoAoGCCqGSM49
-AwEHoUQDQgAE9HwXYG4H8oKW1KWZJaHBnR4f8Z5EgPOW5Z+qvSs9JWOOWRvpKnG0
-8YelO9neAqa0ABgi2OdoTQaAEATdYBSqTQ==
+MHcCAQEEIK9wbPZoo2Z/LYnK9PCclvP8u7VPOvObThx3G4LMXP7HoAoGCCqGSM49
+AwEHoUQDQgAEmJQj+eDbC7PyLNjGhp4ZLE0JeCxyO6JfsuP8Yj+kCTK88iqnIWed
+9vqACAiuWNojmcJUuguiQ2gSs/lrlMbbVA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.der
index d3599a8dbfe461..4c45921a845595 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.pem
index 5ae97e84f5a34e..dc5119b99588c3 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIfrIeuBrz6rgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIKMiTp6A7UBUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQjV4YSa9pzPuQpruZiyodPax1mlbXF
-xun1JX7SMQQDSvvO9waINqJ2vCXufAOkx8Bhfa5QDINRxvvldwcG9f1no2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUbsK9
-sJk4Z28ks+4O08bjUVZT5h0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgByivYbeBkHu8MQ/Bn9JFaWDJiZQMJfZ25xHE
-7VMKfPoCIQCrmaBG2GNsfyatvrU9XD0SEDfStltLzO++0X3R/CspJg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAScQzurYWp5x7m2XK8tSXUn/4maWkKb
+LP2HWAKtq4CP+gOKLG1jsR0gf5qKws17I9SndAZxjzPSKBm5xxmSQvz5o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUY2e6
+Ew/YeqPEOM/c9BskHPgyEmkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgKyQIeJ2y5H1cCgSHj1QvWphcY8KHZcM72+VX
+Yf8rgegCIQCmJYWI4dBF8U3oL5Q7zzrQGxoUrsZhQT84xPg/GvBEGQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.der
index 2444b092f7baee..8a4713c9e7bb05 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.pem
index 5acad2f155f187..4fdd89982893fc 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHoVAnU8pQfZMQZrsFWbwvhVSaB0NpN4pShpiRFIz0nWoAoGCCqGSM49
-AwEHoUQDQgAEI1eGEmvacz7kKa7mYsqHT2sdZpW1xcbp9SV+0jEEA0r7zvcGiDai
-drwl7nwDpMfAYX2uUAyDUcb75XcHBvX9Zw==
+MHcCAQEEIKt/35pwgEAOHQyJ2dUQnWFjgxvdf2xDjlMNT9UhAZh/oAoGCCqGSM49
+AwEHoUQDQgAEnEM7q2Fqece5tlyvLUl1J/+JmlpCmyz9h1gCrauAj/oDiixtY7Ed
+IH+aisLNeyPUp3QGcY8z0igZuccZkkL8+Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/test_case_vector.json
index 43c5eb7108cc8a..5c14ce4b86606a 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_info_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_security_info_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The security_information field is set to invalid value (different from 0).",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa0030201020208641e74cb0a22b5cf300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f47c17606e07f28296d4a59925a1c19d1e1ff19e4480f396e59faabd2b3d25638e591be92a71b4f187a53bd9de02a6b4001822d8e7684d06801004dd6014aa4da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a5c42d803281a52d5024dcc521319fdf1f33e9dd301f0603551d230418301680146ec2bdb09938676f24b3ee0ed3c6e3515653e61d300a06082a8648ce3d040302034800304502201b748aba143ef6778e38ea3a254443896cb1df760246187983caa0029774bf22022100ed580ea9836cbe5b12cf31a6a306246207302a77d6151ab477a23d98059cc833",
-    "pai_cert": "308201d43082017aa00302010202087eb21eb81af3eab8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004235786126bda733ee429aee662ca874f6b1d6695b5c5c6e9f5257ed23104034afbcef7068836a276bc25ee7c03a4c7c0617dae500c8351c6fbe5770706f5fd67a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146ec2bdb09938676f24b3ee0ed3c6e3515653e61d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502200728af61b781907bbc310fc19fd2456960c989940c25f676e711c4ed530a7cfa022100ab99a046d8636c7f26adbeb53d5c3d121037d2b65b4bccefbed17dd1fc2b2926",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305f06092a864886f70d010701a0520450152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002506ffff25077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022045fc06db9dbb804d9022c24d5def82b310f35ace521b235a1a6e52148a115dc7022052d30b75dc7f38862a393c552d5599a0728254799c373ea096e92c8ce7bd6c7b",
-    "dac_private_key": "e3dfc46dfa22bb388229cd92139b0f2cd52dceef776500fdfd764cacf4ea80d7",
-    "dac_public_key": "04f47c17606e07f28296d4a59925a1c19d1e1ff19e4480f396e59faabd2b3d25638e591be92a71b4f187a53bd9de02a6b4001822d8e7684d06801004dd6014aa4d"
+    "dac_cert": "308201e43082018aa00302010202081f9e401f772b4b2f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004989423f9e0db0bb3f22cd8c6869e192c4d09782c723ba25fb2e3fc623fa40932bcf22aa721679df6fa800808ae58da2399c254ba0ba2436812b3f96b94c6db54a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a38f1563a5e2ae848a8e681258f5a25000cd48fc301f0603551d230418301680146367ba130fd87aa3c438cfdcf41b241cf8321269300a06082a8648ce3d0403020348003045022100e7f32d095ae49428636c66f58509c9ff3db8ba9820266d0dec22ad3b96f881fa02200b78756b2cf84e15e368d199fdc17083f9319f4d50e5d7a2c21c0179d87091b9",
+    "pai_cert": "308201d43082017aa003020102020828c893a7a03b5015300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049c433bab616a79c7b9b65caf2d497527ff899a5a429b2cfd875802adab808ffa038a2c6d63b11d207f9a8ac2cd7b23d4a77406718f33d22819b9c7199242fcf9a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146367ba130fd87aa3c438cfdcf41b241cf8321269301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502202b2408789db2e47d5c0a04878f542f5a985c63c28765c33bdbe55761ff2b81e8022100a6258588e1d045f14de82f943bcf3ad01b1a14aec661413f38c4f83f1af04419",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304606092a864886f70d010701a0390437152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002506ffff2507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220087385c9846e5d1ec7608356d9ae0597608686a47218820410ef4b2e0fa59945022100d1a0ede842c249956c5238a6a4084ac43a1920fbbe740f95f019abd41c98ce17",
+    "dac_private_key": "af706cf668a3667f2d89caf4f09c96f3fcbbb54f3af39b4e1c771b82cc5cfec7",
+    "dac_public_key": "04989423f9e0db0bb3f22cd8c6869e192c4d09782c723ba25fb2e3fc623fa40932bcf22aa721679df6fa800808ae58da2399c254ba0ba2436812b3f96b94c6db54"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_security_level_missing/cd.der
index e1a434536d7ae4..3f5d6517b68a6e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_security_level_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.der
index 1aa19f316a16c6..93cbccd1c2ae2d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.pem
index 653b8225a74e51..0bfd43afc4b1b4 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIXh5/Ha07pBAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIISOvqpu/6qMYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-fF6w6DEECgHiIO9pWs+lNoHy7B1/SO0GMxb1mxbMCgCceDYJzK1cJqhlEW6AjsQN
-Iirbw/+51tCo0cSOum+DJqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFA4llNWmTNxndpKnVV3vfRhrJ+60MB8GA1UdIwQYMBaAFIl3
-tYgFLXkvMakUd+AcmeFaqgtTMAoGCCqGSM49BAMCA0cAMEQCIHjetx0CpYtZWuO3
-sWTHoxZ+klzxr8ivH6nqJ7QQYEOzAiBY1BaT/rhHBvzQHFkHjsL+3kE6ITTYlO7E
-xDE1gjRJUg==
+scy4s10JhQfLg/UnXAL6JLA2WW6zvk0/dMXvFbveBc+8/d8/13mdDxElqkIUy6x1
+qhb8lTgLnAyTBEBVnGOczKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFBZ4SgBeelBfE9kIbc9vqwe93xKdMB8GA1UdIwQYMBaAFBsV
+aGz46ahRMqaspZIUVDX/y0K1MAoGCCqGSM49BAMCA0gAMEUCIBejyvaxiWBpWy/c
+UJeoUYhqiunVRBDhtYnlHqlQsHSHAiEAuycflY8rwXxlRVm8L+W8UWWF3GiECpOj
+KMGAZcZhHq0=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.der
index 136fd6dadbd5ee..887cfb5c2ccf57 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.pem
index 273e24b8d7cc92..db6d3963c72b6f 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILlxd46H+FOm9nf/SS06wx523Q5GIHCQVutRUbBXNsepoAoGCCqGSM49
-AwEHoUQDQgAEfF6w6DEECgHiIO9pWs+lNoHy7B1/SO0GMxb1mxbMCgCceDYJzK1c
-JqhlEW6AjsQNIirbw/+51tCo0cSOum+DJg==
+MHcCAQEEINSQ3aMTj42zD/M6xX7kTOQb22CjMFFZoxnA45otavquoAoGCCqGSM49
+AwEHoUQDQgAEscy4s10JhQfLg/UnXAL6JLA2WW6zvk0/dMXvFbveBc+8/d8/13md
+DxElqkIUy6x1qhb8lTgLnAyTBEBVnGOczA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.der
index adb808991e31a6..0db4d740856abb 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.pem
index fc8c8348655839..87c621e9532fc4 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIITgos/G5jHqkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIXm0T3kQI00QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARywNeUxPbZOw5TL8LLiHqDdL+hrUQk
-x/t+H9E6mtO7BTSDtcASBofhU5uVGzY1ptzeh1qw5GNGbAEeW8KA7qZdo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiXe1
-iAUteS8xqRR34ByZ4VqqC1MwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAI6KfO44RhCQfcjvCJbg6PXZWqlfIQ92S5kf
-dGD9+IbBAiA3G5TZdZG5GYbYkOm5vzXRMCGv/m9fLmOUgEwd9CjKkg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQC2FNhxNTHqRkugg14ZPO5j62hBa7a
+EI98q80z3AzWIixfHdb9p2Zq9AYul+96t4qixhjKH/w78ZYLCD/ifUloo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUGxVo
+bPjpqFEypqylkhRUNf/LQrUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgQl02IfigN/8Qq8q1xV7kHwivVjO2FUxqZvjH
+RbsdqEQCIQCrHBGPvLc2gaBJL+dHllHBfEx8WuUpVZ0BshD9aDLEjw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.der
index 6d16570f322bf6..d1609547c4d35c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.pem
index 922bec5b3b5fd8..85cebd2c2c0f31 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICByQk2XLl9inolBn/G6Xmz8OD27M0USDe37Z9xKAczeoAoGCCqGSM49
-AwEHoUQDQgAEcsDXlMT22TsOUy/Cy4h6g3S/oa1EJMf7fh/ROprTuwU0g7XAEgaH
-4VOblRs2Nabc3odasORjRmwBHlvCgO6mXQ==
+MHcCAQEEICfgxEl+oJSRgokHI8IolD+F95uW1NMzhCpH7qZ2MWPQoAoGCCqGSM49
+AwEHoUQDQgAEAthTYcTUx6kZLoINeGTzuY+toQWu2hCPfKvNM9wM1iIsXx3W/adm
+avQGLpfvereKosYYyh/8O/GWCwg/4n1JaA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_security_level_missing/test_case_vector.json
index 7bddd7499b83e8..1482d88cc91df4 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The security_level field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa00302010202085e1e7f1dad3ba410300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047c5eb0e831040a01e220ef695acfa53681f2ec1d7f48ed063316f59b16cc0a009c783609ccad5c26a865116e808ec40d222adbc3ffb9d6d0a8d1c48eba6f8326a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140e2594d5a64cdc677692a7555def7d186b27eeb4301f0603551d230418301680148977b588052d792f31a91477e01c99e15aaa0b53300a06082a8648ce3d0403020347003044022078deb71d02a58b595ae3b7b164c7a3167e925cf1afc8af1fa9ea27b4106043b3022058d41693feb84706fcd01c59078ec2fede413a2134d894eec4c4313582344952",
-    "pai_cert": "308201d43082017aa00302010202084e0a2cfc6e631ea9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000472c0d794c4f6d93b0e532fc2cb887a8374bfa1ad4424c7fb7e1fd13a9ad3bb053483b5c0120687e1539b951b3635a6dcde875ab0e463466c011e5bc280eea65da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148977b588052d792f31a91477e01c99e15aaa0b53301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221008e8a7cee384610907dc8ef0896e0e8f5d95aa95f210f764b991f7460fdf886c10220371b94d97591b91986d890e9b9bf35d13021affe6f5f2e6394804c1df428ca92",
-    "certification_declaration": "3082010006092a864886f70d010702a081f23081ef020103310d300b0609608648016503040201305b06092a864886f70d010701a04e044c152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221008c0bedb70d449dc9020251a28c17476f88fe52b3c24d6db16fd4a2b8c930f07c022100d64f1a400b9f3cb96f0547088db46898a0db5dccb4c7af0a9331782ea7af2cd3",
-    "dac_private_key": "b971778e87f853a6f677ff492d3ac31e76dd0e4620709056eb5151b05736c7a9",
-    "dac_public_key": "047c5eb0e831040a01e220ef695acfa53681f2ec1d7f48ed063316f59b16cc0a009c783609ccad5c26a865116e808ec40d222adbc3ffb9d6d0a8d1c48eba6f8326"
+    "dac_cert": "308201e43082018aa003020102020848ebeaa6effaa8c6300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b1ccb8b35d098507cb83f5275c02fa24b036596eb3be4d3f74c5ef15bbde05cfbcfddf3fd7799d0f1125aa4214cbac75aa16fc95380b9c0c930440559c639ccca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041416784a005e7a505f13d9086dcf6fab07bddf129d301f0603551d230418301680141b15686cf8e9a85132a6aca592145435ffcb42b5300a06082a8648ce3d0403020348003045022017a3caf6b18960695b2fdc5097a851886a8ae9d54410e1b589e51ea950b07487022100bb271f958f2bc17c654559bc2fe5bc516585dc68840a93a328c18065c6611ead",
+    "pai_cert": "308201d43082017aa00302010202085e6d13de4408d344300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000402d85361c4d4c7a9192e820d7864f3b98fada105aeda108f7cabcd33dc0cd6222c5f1dd6fda7666af4062e97ef7ab78aa2c618ca1ffc3bf1960b083fe27d4968a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141b15686cf8e9a85132a6aca592145435ffcb42b5301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220425d3621f8a037ff10abcab5c55ee41f08af5633b6154c6a66f8c745bb1da844022100ab1c118fbcb73681a0492fe7479651c17c4c7c5ae529559d01b210fd6832c48f",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304206092a864886f70d010701a0350433152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100a072d7b4e71515e0828a0a0eec39f90a008d0ce906c147bed9c672ed985847cc022100e12aacef50a0e61f482c73293ea2f9098240a1a3daae2db574c657399dfece40",
+    "dac_private_key": "d490dda3138f8db30ff33ac57ee44ce41bdb60a3305159a319c0e39a2d6afaae",
+    "dac_public_key": "04b1ccb8b35d098507cb83f5275c02fa24b036596eb3be4d3f74c5ef15bbde05cfbcfddf3fd7799d0f1125aa4214cbac75aa16fc95380b9c0c930440559c639ccc"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/cd.der b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/cd.der
index c8098266d9f4ab..ac8e95a5ff6b8a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/cd.der and b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.der
index 42b32ba056c153..1533fd65bfbbcc 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.pem
index 76ce3785750b53..d2dc03e4f63df4 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIZ24FPbpUeMEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIDaEM+hAwhb8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-8YyE9cQqUb4yb84U+2cA+OSJFvyd6QgBZi/mA9hny/mF9kUFzmSP1FqBkONftnkd
-L7JPXzoU8+qwd+Uqg8xEo6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFKbuC6X1Xu1An5k/jcQB+SHjO2YMMB8GA1UdIwQYMBaAFLPh
-L3BpwLNgOgGRfe7KP470zPaIMAoGCCqGSM49BAMCA0gAMEUCIC+Z32cnwC55OtCY
-OldO4biwc6H9G04YPsAgnJsY5sb6AiEA3467VQSPNyfPDZCHdgtkFb3o++5gvNa/
-C7tXGYDRDDc=
+Kss4sGWktuhB7QeL5pxDYzPrTz/NP7oTHFj8VQo7vysmrxpLB1xGXs2LzD6/50bq
+d8/4LCf07rGAI5y2aFewVKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFOdhOawFbTFP9YSnCHwZRlwWFOXXMB8GA1UdIwQYMBaAFDaY
+ucS/xHQlvqSemEQUwQSMTu9kMAoGCCqGSM49BAMCA0gAMEUCIFMtYNR10QVyTWpH
+vkZD8KpFj21nhe4E8sBSm3LmGVCIAiEAwIBr4P4X8aAli2yiC8Ft3QuBm+20I2F/
+dIBRAHq2WS0=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.der
index 1dc5a46cbf43e8..273c48c9d3f070 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.pem
index 3ad3e05121ad31..e254265cc60956 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBIxubuP/iigEWEZYUwHz8y5eNkVs2SsY+Yqavo9+jgAoAoGCCqGSM49
-AwEHoUQDQgAE8YyE9cQqUb4yb84U+2cA+OSJFvyd6QgBZi/mA9hny/mF9kUFzmSP
-1FqBkONftnkdL7JPXzoU8+qwd+Uqg8xEow==
+MHcCAQEEIHZ49qjjLTyMWpnjdzdlD06UOnnK8Gq+HsJXTstUfsgNoAoGCCqGSM49
+AwEHoUQDQgAEKss4sGWktuhB7QeL5pxDYzPrTz/NP7oTHFj8VQo7vysmrxpLB1xG
+Xs2LzD6/50bqd8/4LCf07rGAI5y2aFewVA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.der
index 1cac5e14bec6f3..b047ca7b90c028 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.pem
index fa1b0f58494988..4f25b1420462ff 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIBtpDnv9pi6UwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIRxOeWnIW3DwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ789mfPHBO2xjdeaeoBYdA/6PuHCnO
-HQfKhZ88bDTOkUSvvsmk1qdtFz2gI44e/goNURpysqC2aB7ylbkr84IQo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUs+Ev
-cGnAs2A6AZF97so/jvTM9ogwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMrxeYrdDMbcoqxdklcEwphMsDaSq9zJkBHK
-L7CRoGu1AiBqf+Trk1FrB+zkYSOV15qbDg+wCmDBlplim/UzTshRsA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASrVWbbkBhOf8cCLT7ffhor47Hrt2bX
+wVXqyBLrneFrsKyEAvijf9gh6yF109hoj1DVuc0KKhMnznswkpMCvcMRo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUNpi5
+xL/EdCW+pJ6YRBTBBIxO72QwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhALEw9PwP335hMQgqF7aXpcNLJseIkha5Tqfa
+/0nH5IZ0AiEAkFnQTjudXZ/tL5MGkgg4x0sNUSj+QoqfOpK5eepYAtM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.der
index 45ed65ed14acd1..7c445121e7c68a 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.pem
index 0793d135ed4fdc..39db78c380ba58 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIL8MOabzx6xSgdIZh81N0whIEJbIWAjG7FEyX66MidBQoAoGCCqGSM49
-AwEHoUQDQgAEO/PZnzxwTtsY3XmnqAWHQP+j7hwpzh0HyoWfPGw0zpFEr77JpNan
-bRc9oCOOHv4KDVEacrKgtmge8pW5K/OCEA==
+MHcCAQEEIOz9rY2VMeVlOgYznMOCuiCAPcgdp9HAbC8T7uKcMOpIoAoGCCqGSM49
+AwEHoUQDQgAEq1Vm25AYTn/HAi0+334aK+Ox67dm18FV6sgS653ha7CshAL4o3/Y
+IeshddPYaI9Q1bnNCioTJ857MJKTAr3DEQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/test_case_vector.json
index 5573a9a0641d58..460cf3ee650282 100644
--- a/credentials/development/commissioner_dut/struct_cd_security_level_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_security_level_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The security_level field is set to invalid value (different from 0).",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa0030201020208676e053dba5478c1300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f18c84f5c42a51be326fce14fb6700f8e48916fc9de90801662fe603d867cbf985f64505ce648fd45a8190e35fb6791d2fb24f5f3a14f3eab077e52a83cc44a3a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a6ee0ba5f55eed409f993f8dc401f921e33b660c301f0603551d23041830168014b3e12f7069c0b3603a01917deeca3f8ef4ccf688300a06082a8648ce3d040302034800304502202f99df6727c02e793ad0983a574ee1b8b073a1fd1b4e183ec0209c9b18e6c6fa022100df8ebb55048f3727cf0d9087760b6415bde8fbee60bcd6bf0bbb571980d10c37",
-    "pai_cert": "308201d43082017aa003020102020806da439eff698ba5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043bf3d99f3c704edb18dd79a7a8058740ffa3ee1c29ce1d07ca859f3c6c34ce9144afbec9a4d6a76d173da0238e1efe0a0d511a72b2a0b6681ef295b92bf38210a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b3e12f7069c0b3603a01917deeca3f8ef4ccf688301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100caf1798add0cc6dca2ac5d925704c2984cb03692abdcc99011ca2fb091a06bb502206a7fe4eb93516b07ece4612395d79a9b0e0fb00a60c19699629bf5334ec851b0",
-    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405ff24060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402202198dc69a9adf8da52fb4e383eced228f2e610802e2e9d7ca3b93a5c476111db022053da64e484f0599a687cc2b6b0e9465582364fdd3a6bed0f235ba9326de51ff5",
-    "dac_private_key": "1231b9bb8ffe28a0116119614c07cfccb978d915b364ac63e62a6afa3dfa3800",
-    "dac_public_key": "04f18c84f5c42a51be326fce14fb6700f8e48916fc9de90801662fe603d867cbf985f64505ce648fd45a8190e35fb6791d2fb24f5f3a14f3eab077e52a83cc44a3"
+    "dac_cert": "308201e43082018aa00302010202080da10cfa103085bf300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042acb38b065a4b6e841ed078be69c436333eb4f3fcd3fba131c58fc550a3bbf2b26af1a4b075c465ecd8bcc3ebfe746ea77cff82c27f4eeb180239cb66857b054a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e76139ac056d314ff584a7087c19465c1614e5d7301f0603551d230418301680143698b9c4bfc47425bea49e984414c1048c4eef64300a06082a8648ce3d04030203480030450220532d60d475d105724d6a47be4643f0aa458f6d6785ee04f2c0529b72e6195088022100c0806be0fe17f1a0258b6ca20bc16ddd0b819bedb423617f748051007ab6592d",
+    "pai_cert": "308201d53082017aa003020102020847139e5a7216dc3c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ab5566db90184e7fc7022d3edf7e1a2be3b1ebb766d7c155eac812eb9de16bb0ac8402f8a37fd821eb2175d3d8688f50d5b9cd0a2a1327ce7b30929302bdc311a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604143698b9c4bfc47425bea49e984414c1048c4eef64301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b130f4fc0fdf7e6131082a17b697a5c34b26c7889216b94ea7daff49c7e486740221009059d04e3b9d5d9fed2f9306920838c74b0d5128fe428a9f3a92b979ea5802d3",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405ff2406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100f2429a0c926703d64c4cba672c919e9200603b3745211444dd84b21bebaa575c0221009c0d6e198957dbfdb88f2ffaec61496061071a9fabd2b8ac0246215fa1e805f6",
+    "dac_private_key": "7678f6a8e32d3c8c5a99e37737650f4e943a79caf06abe1ec2574ecb547ec80d",
+    "dac_public_key": "042acb38b065a4b6e841ed078be69c436333eb4f3fcd3fba131c58fc550a3bbf2b26af1a4b075c465ecd8bcc3ebfe746ea77cff82c27f4eeb180239cb66857b054"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/cd.der b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/cd.der
index 446ea70614a86b..06ea0824c8696e 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/cd.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.der
index 361075d46c0b02..11ad698d2a327d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.pem
index 74bd473234ce1e..e7b77d337e2ca8 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIBR/npElaNEQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIP9kY38iyq1gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-81Zbr93TQomtY58qdZXGM2gtQ89vvOQpGmJhTdjFdNEqLf8ZKhjzvrI9b+xIn25s
-sH5l5bosFgiudaL9k0hp56NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFGBOORUkhfK+QkZ1WMOIWcpch+uLMB8GA1UdIwQYMBaAFMX/
-3t5iIt4+NBl7cZbkEn5BW95uMAoGCCqGSM49BAMCA0gAMEUCIEtHeYidgkXK2jEK
-tzYy0B7kZ+TcgzsxLc6NH/nXb7iQAiEAs6IRXlV3sh5ycxqBivEnfvnwCljEE4cB
-JljsYK0VF0Y=
+tjh/00FSwj5UQdScppCJY9z0kcn1IYndz5ifp4ErkWAfP1lKBYwQ83DfTAg9kNRV
+Dq6DivLtxq4Lrfn5eqxKyKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFOG4HJ9/y2sRoWs9BuLxdDb3rTRLMB8GA1UdIwQYMBaAFL/V
+vozwM6yC3t2ePrU5gu4bseAUMAoGCCqGSM49BAMCA0kAMEYCIQClKdSysRNL7M8+
+heiRmuDXENIqBcQFISDnyaMEd0BqtwIhALlkohrgVbJDKP18IMcNDRnl/TioNd4Y
+eyk8ZjZ0jlVc
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.der
index 835e2211fd930f..134ee074badd6d 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.pem
index c1a81a85b80519..a105ac29cebfc5 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJcs1cvbliOwgKpEIS3yOUpG46hkt/eUdilryG9Ggm8IoAoGCCqGSM49
-AwEHoUQDQgAE81Zbr93TQomtY58qdZXGM2gtQ89vvOQpGmJhTdjFdNEqLf8ZKhjz
-vrI9b+xIn25ssH5l5bosFgiudaL9k0hp5w==
+MHcCAQEEIBRgfjIHxcVeL569qZVLXi3CxQfeYrrl6K0/N0gxjp/YoAoGCCqGSM49
+AwEHoUQDQgAEtjh/00FSwj5UQdScppCJY9z0kcn1IYndz5ifp4ErkWAfP1lKBYwQ
+83DfTAg9kNRVDq6DivLtxq4Lrfn5eqxKyA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.der
index 952b7bd9914654..40cd0d86a7ef3c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.pem
index 9db798e216abd5..fd82d280480ccf 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIICI7p5uRKYVEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIINjDtKTzu+CQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ7op178AteCQMeMop/YuCMMMHEkidl
-0qVH2ZIGHz2hT62dKkoyEzC9rSqC+qGWMgCT0kaULsC6IdnkV3FjlT30o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxf/e
-3mIi3j40GXtxluQSfkFb3m4wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgW5d4m+OJU2TbJFFluALAKmCuBrtdkdc3MgHS
-esVly3kCIQCebXjkg/iQYevj4xznoB9jzyjTBfuis0WMCYZE64kFCg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASfeMKrcyYP5wr5sTRWtesoqU+mLO+g
+1nzZWuS5KG5Cw9bqz5cJEbj7AVK5u2EOioI2c4HBnQ4P5gmiTwI8ePV8o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUv9W+
+jPAzrILe3Z4+tTmC7hux4BQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAJIj2B2ZKQfp9+bt/dGQOjbOF3sPQXXtfmTg
+U85qNttQAiEAxtYwV26Uy7hJXceGASd62LGYiGmkPSecvN4CIKn/mNk=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.der
index d28fe72fef62dd..db63d691ff2c23 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.pem
index 64392acf53361a..1991b8dcd9bc5b 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPivqfAJwD4RMwUKRgvQv/tuWLylD5tGEjp+ebp7gp51oAoGCCqGSM49
-AwEHoUQDQgAEO6Kde/ALXgkDHjKKf2LgjDDBxJInZdKlR9mSBh89oU+tnSpKMhMw
-va0qgvqhljIAk9JGlC7AuiHZ5FdxY5U99A==
+MHcCAQEEIJlaAqMEAbIsK+At4sYEXHiGlAWdV4cEsZ4OdoVpnbMhoAoGCCqGSM49
+AwEHoUQDQgAEn3jCq3MmD+cK+bE0VrXrKKlPpizvoNZ82VrkuShuQsPW6s+XCRG4
++wFSubthDoqCNnOBwZ0OD+YJok8CPHj1fA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/test_case_vector.json
index e00695b6363838..b59c8a9840aede 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid Signer Info digest algorithm SHA1.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa0030201020208051fe7a4495a3444300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f3565bafddd34289ad639f2a7595c633682d43cf6fbce4291a62614dd8c574d12a2dff192a18f3beb23d6fec489f6e6cb07e65e5ba2c1608ae75a2fd934869e7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414604e39152485f2be42467558c38859ca5c87eb8b301f0603551d23041830168014c5ffdede6222de3e34197b7196e4127e415bde6e300a06082a8648ce3d040302034800304502204b4779889d8245cada310ab73632d01ee467e4dc833b312dce8d1ff9d76fb890022100b3a2115e5577b21e72731a818af1277ef9f00a58c41387012658ec60ad151746",
-    "pai_cert": "308201d43082017aa0030201020208088ee9e6e44a6151300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043ba29d7bf00b5e09031e328a7f62e08c30c1c4922765d2a547d992061f3da14fad9d2a4a321330bdad2a82faa196320093d246942ec0ba21d9e4577163953df4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414c5ffdede6222de3e34197b7196e4127e415bde6e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205b97789be3895364db245165b802c02a60ae06bb5d91d7373201d27ac565cb790221009e6d78e483f89061ebe3e31ce7a01f63cf28d305fba2b3458c098644eb89050a",
-    "certification_declaration": "3081fd06092a864886f70d010702a081ef3081ec020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe6620181831783076020103801462fa823359acfaa9963e1cfa140addf504f37160300706052b0e03021a300a06082a8648ce3d0403020446304402203fc5cf1930c4ab98ca300233f003094ad71e343ed91fd81bfb80a8a18ef06d36022070280140ed22bb2b2f309d07f836126e926af102833393b59abbdfbfc21a970d",
-    "dac_private_key": "972cd5cbdb9623b080aa44212df2394a46e3a864b7f79476296bc86f46826f08",
-    "dac_public_key": "04f3565bafddd34289ad639f2a7595c633682d43cf6fbce4291a62614dd8c574d12a2dff192a18f3beb23d6fec489f6e6cb07e65e5ba2c1608ae75a2fd934869e7"
+    "dac_cert": "308201e53082018aa00302010202083fd918dfc8b2ab58300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b6387fd34152c23e5441d49ca6908963dcf491c9f52189ddcf989fa7812b91601f3f594a058c10f370df4c083d90d4550eae838af2edc6ae0badf9f97aac4ac8a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e1b81c9f7fcb6b11a16b3d06e2f17436f7ad344b301f0603551d23041830168014bfd5be8cf033ac82dedd9e3eb53982ee1bb1e014300a06082a8648ce3d0403020349003046022100a529d4b2b1134beccf3e85e8919ae0d710d22a05c4052120e7c9a30477406ab7022100b964a21ae055b24328fd7c20c70d0d19e5fd38a835de187b293c6636748e555c",
+    "pai_cert": "308201d53082017aa00302010202083630ed293ceef824300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049f78c2ab73260fe70af9b13456b5eb28a94fa62cefa0d67cd95ae4b9286e42c3d6eacf970911b8fb0152b9bb610e8a82367381c19d0e0fe609a24f023c78f57ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414bfd5be8cf033ac82dedd9e3eb53982ee1bb1e014301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221009223d81d992907e9f7e6edfdd1903a36ce177b0f4175ed7e64e053ce6a36db50022100c6d630576e94cbb8495dc78601277ad8b1988869a43d279cbcde0220a9ff98d9",
+    "certification_declaration": "3081e506092a864886f70d010702a081d73081d4020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600250776982408001831793077020103801462fa823359acfaa9963e1cfa140addf504f37160300706052b0e03021a300a06082a8648ce3d0403020447304502202c35d141be0c27a9bd5a5c69faa663b3f310d87e10899407061cebfd62cd360a022100f99c7b60e2b8d226129b4e87e0b38626fa6ef230539fb00b02d7a4d7123302b1",
+    "dac_private_key": "14607e3207c5c55e2f9ebda9954b5e2dc2c507de62bae5e8ad3f3748318e9fd8",
+    "dac_public_key": "04b6387fd34152c23e5441d49ca6908963dcf491c9f52189ddcf989fa7812b91601f3f594a058c10f370df4c083d90d4550eae838af2edc6ae0badf9f97aac4ac8"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/cd.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/cd.der
index f0f2465d59f6ae..0cb28121387e3f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/cd.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.der
index 5d86ee2c13e975..7af599382d015c 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.pem
index 79a336e4f425fd..e7cfbc1bea98b1 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIISGFsYHOz+DkwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIBEmxugymYQswCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-yEMrM2JO/IeYYiIKYUae9pcwu9v1oeCOcyGCAksjK7eW2ONaA2YXxFYlz0eNwJgc
-SdB2E02pMYXYsBo/6nPVhqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFDEuaoBTadWUiTwYwCP8TKVElCkZMB8GA1UdIwQYMBaAFELV
-jA9yDz0hVWcRtOJ7vSidcrvEMAoGCCqGSM49BAMCA0kAMEYCIQC//FtnRH4l3GXZ
-XAY5HcAnptes5xHR0xLi+ejO0fJOqAIhANoiSjwVl2VTKiHS7M2IujWaQ4PlL0ff
-rRyoEiUMxtfI
+R2GSunh52tkD/eQoGIL9nDGpMpI3lO7COQEe+sgcj0P9Z56xkyFaAcqvveak4kFh
+E1VPiYziDVme/SquDZOfeKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFKjPf8pnW8tWJkFZy6fenlCXbx42MB8GA1UdIwQYMBaAFCV7
+wlFuLo9KSeun/Nz60YEy2J1CMAoGCCqGSM49BAMCA0cAMEQCICN4pAl3ne7xcXkb
+MLi4VUpq15VEfvaN+s1qskVe086NAiBjSPvOzqTDhnpZewhmuDJ8NIW1XhB4z1pS
+rlP1ybUtSw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.der
index 2d85a2a83bf1a2..60013681f7ae52 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.pem
index 1f470845d4baa7..a1ca45d5030101 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIItLKbjkzvglUg+d184s986sS6z2r0+RWpGoKfLgveKMoAoGCCqGSM49
-AwEHoUQDQgAEyEMrM2JO/IeYYiIKYUae9pcwu9v1oeCOcyGCAksjK7eW2ONaA2YX
-xFYlz0eNwJgcSdB2E02pMYXYsBo/6nPVhg==
+MHcCAQEEIBo8D5M1IZcqydlS7f8w/WZevgU0HFLl87cXR3WEhNzXoAoGCCqGSM49
+AwEHoUQDQgAER2GSunh52tkD/eQoGIL9nDGpMpI3lO7COQEe+sgcj0P9Z56xkyFa
+Acqvveak4kFhE1VPiYziDVme/SquDZOfeA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.der
index 0d73c4ae62f13a..047f930317a6bb 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.pem
index 1ef22cb10895de..a39a524ab417dd 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIOMg6ossYXtowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIa5/Srbn6m7cwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT1uxd0MCXtrp5bZTQiNSr2XbhCiy27
-Q+Xbsbmj7JMWU1Vfyy+FMuGvdJOlePYNMJUQlZrcSYrGDaPbnrVhICkgo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQtWM
-D3IPPSFVZxG04nu9KJ1yu8QwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhALRvlNtIp7R/yWGPVe/srqYIOYB/Y2RgY8Gi
-o2UPWxVoAiAGS7/xLRaQBwjvRoUmJYKvchUiC2DusGIWBzDsHcVz5w==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATFbHL6ea2g8hHwwfgJduzEzSDObrEH
+rQlFSzVoTI4uBcMPbvQaW9Y4LR2Fh8XT3EBHog5rnpsOUMQIIXJsJABco2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUJXvC
+UW4uj0pJ66f83PrRgTLYnUIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIge9FIvB3rTE0qV74VVecVGs057iVPSa1Dtfq4
+z9QWahgCIF2wOu9/5o3ASmi4Sk1EWbZrh8C4Eunh4dicq9tyMdK6
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.der
index d49239609b3243..eeb1fe0c4694d4 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.pem
index d39f4446f7e446..c296d1d58abb9b 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBSr3obHmZNcm/i7mi18vepdHtbNvAwnaqaocdlua6q9oAoGCCqGSM49
-AwEHoUQDQgAE9bsXdDAl7a6eW2U0IjUq9l24Qostu0Pl27G5o+yTFlNVX8svhTLh
-r3STpXj2DTCVEJWa3EmKxg2j2561YSApIA==
+MHcCAQEEIJmG8z7LpfdyIywZmuN1gaLKNiq96VHM7JNqQZFLNtxNoAoGCCqGSM49
+AwEHoUQDQgAExWxy+nmtoPIR8MH4CXbsxM0gzm6xB60JRUs1aEyOLgXDD270GlvW
+OC0dhYfF09xAR6IOa56bDlDECCFybCQAXA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/test_case_vector.json
index a135a71cbba7f6..791268974dd2a6 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The subjectKeyIdentifier contains invalid SKID of a certificate unknown by Zigbee Alliance.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa003020102020848616c6073b3f839300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c8432b33624efc879862220a61469ef69730bbdbf5a1e08e732182024b232bb796d8e35a036617c45625cf478dc0981c49d076134da93185d8b01a3fea73d586a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414312e6a805369d594893c18c023fc4ca544942919301f0603551d2304183016801442d58c0f720f3d21556711b4e27bbd289d72bbc4300a06082a8648ce3d0403020349003046022100bffc5b67447e25dc65d95c06391dc027a6d7ace711d1d312e2f9e8ced1f24ea8022100da224a3c159765532a21d2eccd88ba359a4383e52f47dfad1ca812250cc6d7c8",
-    "pai_cert": "308201d43082017aa003020102020838c83aa2cb185eda300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f5bb17743025edae9e5b653422352af65db8428b2dbb43e5dbb1b9a3ec931653555fcb2f8532e1af7493a578f60d309510959adc498ac60da3db9eb561202920a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041442d58c0f720f3d21556711b4e27bbd289d72bbc4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100b46f94db48a7b47fc9618f55efecaea60839807f63646063c1a2a3650f5b15680220064bbff12d16900708ef4685262582af7215220b60eeb062160730ec1dc573e7",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfa56963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502202e972608bd5943d7858d9485321c2001926017de9152db56d8ad7c2ad7b05e2b022100f85818b2cbcfe9a619f0bd8fb3692606315596a2b9df593759e35a866ced9e6a",
-    "dac_private_key": "8b4b29b8e4cef825520f9dd7ce2cf7ceac4bacf6af4f915a91a829f2e0bde28c",
-    "dac_public_key": "04c8432b33624efc879862220a61469ef69730bbdbf5a1e08e732182024b232bb796d8e35a036617c45625cf478dc0981c49d076134da93185d8b01a3fea73d586"
+    "dac_cert": "308201e33082018aa00302010202080449b1ba0ca6610b300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004476192ba7879dad903fde4281882fd9c31a932923794eec239011efac81c8f43fd679eb193215a01caafbde6a4e2416113554f898ce20d599efd2aae0d939f78a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a8cf7fca675bcb56264159cba7de9e50976f1e36301f0603551d23041830168014257bc2516e2e8f4a49eba7fcdcfad18132d89d42300a06082a8648ce3d040302034700304402202378a409779deef171791b30b8b8554a6ad795447ef68dfacd6ab2455ed3ce8d02206348fbcecea4c3867a597b0866b8327c3485b55e1078cf5a52ae53f5c9b52d4b",
+    "pai_cert": "308201d33082017aa00302010202086b9fd2adb9fa9bb7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c56c72fa79ada0f211f0c1f80976ecc4cd20ce6eb107ad09454b35684c8e2e05c30f6ef41a5bd6382d1d8587c5d3dc4047a20e6b9e9b0e50c40821726c24005ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414257bc2516e2e8f4a49eba7fcdcfad18132d89d42301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207bd148bc1deb4c4d2a57be1555e7151acd39ee254f49ad43b5fab8cfd4166a1802205db03aef7fe68dc04a68b84a4d4459b66b87c0b812e9e1e1d89cabdb7231d2ba",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfa56963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100843a5ae80128a72747c4813a2bd3e2d05399efe724c7e9fd96796be90481bdd702204a53adf892aae04987d392968f4e19f1d6b410f2980da7fba91ea64e1be54dcb",
+    "dac_private_key": "1a3c0f933521972ac9d952edff30fd665ebe05341c52e5f3b71747758484dcd7",
+    "dac_public_key": "04476192ba7879dad903fde4281882fd9c31a932923794eec239011efac81c8f43fd679eb193215a01caafbde6a4e2416113554f898ce20d599efd2aae0d939f78"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/cd.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/cd.der
index 7cff080d409c3b..13e2721d37cf83 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/cd.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.der
index 48c6659a148865..62a32f316e808b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.pem
index e6667a75cb5576..80116297ba9bd2 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIdwPo/X6KvXcwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIedhbyGMfpkQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-okUmFX2FmWBOSSDPFWNC69GhPdB6q6a7gYB+t0/qtCOzG/8Ht4NwqIn9wPeHT/tv
-Q7sWpM9Hntslda1EoUaxeaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFLz9et949uyHAi/lSVWHfjzfGWMsMB8GA1UdIwQYMBaAFCPk
-W1kSpdt4u14xV+R+Ia9Z5O4bMAoGCCqGSM49BAMCA0gAMEUCIEale7C0/XSYSiJN
-ZiXSadJ9NFuALbihFlV1i7OvfSZhAiEAuXOTyYIbyzyzoBDTtdiIgJqufKB5vm0q
-KFeHkSsLwB0=
+zD5j1QobbpVkLfcqltkgF7Uos0341pU8m5hILHGUAXy4632Hu7Mmo3tMrAcNus/f
+ux5ksPDAQ4tovXDLYUMWcaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFBSaKQWND4V1MPVGhvmV3gdJQ0y0MB8GA1UdIwQYMBaAFOQl
+McAoVqkQbu7hnunfs7NgZwcIMAoGCCqGSM49BAMCA0kAMEYCIQCKg4CawSEpTDb7
+7gUQR+boWAvC2YvynPMKbDAo56QeCAIhAJNJE/ufQmXFVCRhFp3lbpuWx8g74NAF
+nNHNWr9PTjA1
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.der
index 84c11b37e6279d..084829af76e84f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.pem
index a622ec2eceb4b2..6e7b031008e646 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOnN/RXrDxH6E8z8Syqh2Z0BH3XV5+xdIbDj+gadzf9aoAoGCCqGSM49
-AwEHoUQDQgAEokUmFX2FmWBOSSDPFWNC69GhPdB6q6a7gYB+t0/qtCOzG/8Ht4Nw
-qIn9wPeHT/tvQ7sWpM9Hntslda1EoUaxeQ==
+MHcCAQEEIK9O1C5WXGMBKAfa4w/l+8/0HERIt5Kyktf0r9ijjj/GoAoGCCqGSM49
+AwEHoUQDQgAEzD5j1QobbpVkLfcqltkgF7Uos0341pU8m5hILHGUAXy4632Hu7Mm
+o3tMrAcNus/fux5ksPDAQ4tovXDLYUMWcQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.der
index 8bb1da3282e00c..d305bcbfac98fe 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.pem
index 0b3ebc1cb770ba..6833f0d3439957 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIa8o5gn4gCqcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIcouupBE1gU0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS/4spH2lZiMFxZ8SYg3YPvNCR9MTrO
-qtapZCR1+biobc7QD51sRTQDPqR2sjkYyXCM95rzluLvr57UkqVVyT1To2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUI+Rb
-WRKl23i7XjFX5H4hr1nk7hswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgasZMl9Be7oGznvFWMtE3Ydz2XCJ6MNBUYYPC
-nT+HhBkCIQDmEYgWbs25M1uwCix6bgEk36qU4jrseF2slgbsOUA2Wg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQj2V2UocnkxHNnlfJgw368i3yMbz2+
+Wx+crjgvx3jq2z87JexVBerr/4R+WCDk9tj0cfxFa9vu+9519/MyXrO/o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU5CUx
+wChWqRBu7uGe6d+zs2BnBwgwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJZfmoJEJtjixPIjGAsfFiKuX9lvmYnrwBmU
+K9E6K9K7AiAqOnLkDDZodgL01zqXmFG25R/9lvOf6+QtLh/8uwsWvg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.der
index bb1d9b5dcf3cb7..be47f1d5501243 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.pem
index 41ff6fb57478a3..996bb258feb564 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFgNN/ldSePDHEU8oSPbVJsEk4oLHYJlGUioNpv4wfCHoAoGCCqGSM49
-AwEHoUQDQgAEv+LKR9pWYjBcWfEmIN2D7zQkfTE6zqrWqWQkdfm4qG3O0A+dbEU0
-Az6kdrI5GMlwjPea85bi76+e1JKlVck9Uw==
+MHcCAQEEIEZ7sis5/y01oGhdKqS0r5EWUT5U1qHedBEZxCv1NgW9oAoGCCqGSM49
+AwEHoUQDQgAEI9ldlKHJ5MRzZ5XyYMN+vIt8jG89vlsfnK44L8d46ts/OyXsVQXq
+6/+Eflgg5PbY9HH8RWvb7vvedffzMl6zvw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/test_case_vector.json
index e46296a84bb3a3..18a7ae0cf3a447 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The subjectKeyIdentifier contains SKID of a well-known Zigbee Alliance certificate.",
     "is_success_case": "true",
-    "dac_cert": "308201e43082018aa00302010202087703e8fd7e8abd77300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a24526157d8599604e4920cf156342ebd1a13dd07aaba6bb81807eb74feab423b31bff07b78370a889fdc0f7874ffb6f43bb16a4cf479edb2575ad44a146b179a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bcfd7adf78f6ec87022fe54955877e3cdf19632c301f0603551d2304183016801423e45b5912a5db78bb5e3157e47e21af59e4ee1b300a06082a8648ce3d0403020348003045022046a57bb0b4fd74984a224d6625d269d27d345b802db8a11655758bb3af7d2661022100b97393c9821bcb3cb3a010d3b5d888809aae7ca079be6d2a285787912b0bc01d",
-    "pai_cert": "308201d43082017aa00302010202086bca39827e200aa7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004bfe2ca47da5662305c59f12620dd83ef34247d313aceaad6a9642475f9b8a86dced00f9d6c4534033ea476b23918c9708cf79af396e2efaf9ed492a555c93d53a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041423e45b5912a5db78bb5e3157e47e21af59e4ee1b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502206ac64c97d05eee81b39ef15632d13761dcf65c227a30d0546183c29d3f878419022100e61188166ecdb9335bb00a2c7a6e0124dfaa94e23aec785dac9606ec3940365a",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100a8171660122beb90b233ac983b8352fa6cdeffd755d8857586f8e605e0e4f33602201bdc623eeba2c31dc61be31eafb536ad978404ae4fc0ef242f5d85afdd7c4dea",
-    "dac_private_key": "e9cdfd15eb0f11fa13ccfc4b2aa1d99d011f75d5e7ec5d21b0e3fa069dcdff5a",
-    "dac_public_key": "04a24526157d8599604e4920cf156342ebd1a13dd07aaba6bb81807eb74feab423b31bff07b78370a889fdc0f7874ffb6f43bb16a4cf479edb2575ad44a146b179"
+    "dac_cert": "308201e53082018aa003020102020879d85bc8631fa644300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004cc3e63d50a1b6e95642df72a96d92017b528b34df8d6953c9b98482c7194017cb8eb7d87bbb326a37b4cac070dbacfdfbb1e64b0f0c0438b68bd70cb61431671a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414149a29058d0f857530f54686f995de0749434cb4301f0603551d23041830168014e42531c02856a9106eeee19ee9dfb3b360670708300a06082a8648ce3d04030203490030460221008a83809ac121294c36fbee051047e6e8580bc2d98bf29cf30a6c3028e7a41e08022100934913fb9f4265c5542461169de56e9b96c7c83be0d0059cd1cd5abf4f4e3035",
+    "pai_cert": "308201d43082017aa0030201020208728baea41135814d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000423d95d94a1c9e4c4736795f260c37ebc8b7c8c6f3dbe5b1f9cae382fc778eadb3f3b25ec5505eaebff847e5820e4f6d8f471fc456bdbeefbde75f7f3325eb3bfa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414e42531c02856a9106eeee19ee9dfb3b360670708301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100965f9a824426d8e2c4f223180b1f1622ae5fd96f9989ebc019942bd13a2bd2bb02202a3a72e40c36687602f4d73a979851b6e51ffd96f39febe42d2e1ffcbb0b16be",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022034b2293a7b5613f4cbc8a2f26b7da0ba28bc0915bb0142263d292d71789c271c022100d9039bb5de1d9d7250fe93562fd2adc897b9664bebbfbeb05cbfce5a3ddf3684",
+    "dac_private_key": "af4ed42e565c63012807dae30fe5fbcff41c4448b792b292d7f4afd8a38e3fc6",
+    "dac_public_key": "04cc3e63d50a1b6e95642df72a96d92017b528b34df8d6953c9b98482c7194017cb8eb7d87bbb326a37b4cac070dbacfdfbb1e64b0f0c0438b68bd70cb61431671"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/cd.der b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/cd.der
index baa7581568cea7..0541a1602583ff 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/cd.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.der
index ba17add48795b7..5272b2a69b0c24 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.pem
index 48fcc03abd3076..6e453f915d1281 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5TCCAYqgAwIBAgIIDJ/2BtnbH+AwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIEXkXpYPL1rAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-AIPuPHv0OJP8yUuqFVuj6v+S1pCAAPFf66HOEx3kqnEybomyFAg5YV+e097TAFZM
-NMLYvwzTsAojDYigG2tRWaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFIvmFua2v2OokHxnLektdlJCv+X3MB8GA1UdIwQYMBaAFJl9
-xTnFyvXjNpUcU8XFunMoGN+TMAoGCCqGSM49BAMCA0kAMEYCIQCxTVGWjla6Z7oB
-3Al4L5zF06Gqr1QNV5wE7JMFIuWGFQIhAMw+9UlNFTVUJOrJljv6Y4IH0hj0esQw
-AJVX/vqaejlu
+2TkmLdgqMKmEDw+xFLCX7bgICLe8NO2ZnQSM/GTFTqv6PgwrLOqWJ1OS57afa8Va
+nZ6dOAUpl85H8zFWWiv8KaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFFop9WDJIExuTz3stN4F8Hk9a/0BMB8GA1UdIwQYMBaAFJSR
+1yD0iJv6RIq0mGtEXfActS30MAoGCCqGSM49BAMCA0gAMEUCIQDp8NKDbK03bukV
+LKUfT0LdwIRrFRxH/aT2W+dwRDaRjgIgWL3U3RJljZ/Wo1bQYwmNRwhaBtIJqwwx
+9P5/vVdet24=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.der
index a2c2b9559b7641..311b0c7c168b21 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.pem
index c02d4d8aab0714..7729bb833d01b0 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINGq7lqSAqZFmfov+8LmPFcnqhq0eJrv/iSxG2FCP97zoAoGCCqGSM49
-AwEHoUQDQgAEAIPuPHv0OJP8yUuqFVuj6v+S1pCAAPFf66HOEx3kqnEybomyFAg5
-YV+e097TAFZMNMLYvwzTsAojDYigG2tRWQ==
+MHcCAQEEIGLCd/3oI5wG1JCp9kv6HUcPoVBW5Lht0s5cpS4X5dTsoAoGCCqGSM49
+AwEHoUQDQgAE2TkmLdgqMKmEDw+xFLCX7bgICLe8NO2ZnQSM/GTFTqv6PgwrLOqW
+J1OS57afa8VanZ6dOAUpl85H8zFWWiv8KQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.der
index c8ae41caf4e7cc..39db351380ccf2 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.pem
index 68deb4cfcabe1b..5861c61f07c60f 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIISaU9qI94pY8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIZWtkAFZ4sXEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR9VnMdD77ab4BigMqWI67j/25tRwOg
-GdF/SS1LoWSotnT1pODp1RqxwHPdZ+vR/hkw3tzWwRvXYedyRhYr9KpXo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmX3F
-OcXK9eM2lRxTxcW6cygY35MwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgWCUhnuW0h+gn+KGP/FxukM78oJKXDtHAVWhQ
-lnPtjhwCIQC1jAwYH0kgzSZo0qCr9rfIpkWzSiIyLrIjIdZQSWgoXw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATjUyNom1CuUGfIChoB+MJ4iQVhekt2
+PrsmZgH8XZYmjj5yjhdh4GNI6Jhbs8PgCQxi2kfUqj6ZH/VKdgwz5ap+o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUlJHX
+IPSIm/pEirSYa0Rd8By1LfQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgZicwIcsDnY07RJWK3diLle9Uh7Y/bCWEtjW4
+jDTqnYQCIQCqwyddsp5QD54b7Z3L/IOCdlg3xtmWGhxx+XxvYZ21hQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.der
index a43ca4ca3cf874..13ddba2492f3d6 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.pem
index 785403f16054d2..b12613d5562eb4 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFBFF8TKmgiTiwakAziNuyDvCVVBtN7akeZDAEDyhOlZoAoGCCqGSM49
-AwEHoUQDQgAEfVZzHQ++2m+AYoDKliOu4/9ubUcDoBnRf0ktS6FkqLZ09aTg6dUa
-scBz3Wfr0f4ZMN7c1sEb12HnckYWK/SqVw==
+MHcCAQEEIOn0M3I9sHI875leyz8hNuEbSz7ozrrufYBItucLspnPoAoGCCqGSM49
+AwEHoUQDQgAE41MjaJtQrlBnyAoaAfjCeIkFYXpLdj67JmYB/F2WJo4+co4XYeBj
+SOiYW7PD4AkMYtpH1Ko+mR/1SnYMM+Wqfg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/test_case_vector.json
index 84f74f5c03f38c..5755956e594ceb 100644
--- a/credentials/development/commissioner_dut/struct_cd_signer_info_v2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_signer_info_v2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: Invalid Signer Info version set to v2.",
     "is_success_case": "false",
-    "dac_cert": "308201e53082018aa00302010202080c9ff606d9db1fe0300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040083ee3c7bf43893fcc94baa155ba3eaff92d6908000f15feba1ce131de4aa71326e89b2140839615f9ed3ded300564c34c2d8bf0cd3b00a230d88a01b6b5159a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148be616e6b6bf63a8907c672de92d765242bfe5f7301f0603551d23041830168014997dc539c5caf5e336951c53c5c5ba732818df93300a06082a8648ce3d0403020349003046022100b14d51968e56ba67ba01dc09782f9cc5d3a1aaaf540d579c04ec930522e58615022100cc3ef5494d15355424eac9963bfa638207d218f47ac430009557fefa9a7a396e",
-    "pai_cert": "308201d43082017aa003020102020849a53da88f78a58f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047d56731d0fbeda6f806280ca9623aee3ff6e6d4703a019d17f492d4ba164a8b674f5a4e0e9d51ab1c073dd67ebd1fe1930dedcd6c11bd761e77246162bf4aa57a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414997dc539c5caf5e336951c53c5c5ba732818df93301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205825219ee5b487e827f8a18ffc5c6e90cefca092970ed1c05568509673ed8e1c022100b58c0c181f4920cd2668d2a0abf6b7c8a645b34a22322eb22321d6504968285f",
-    "certification_declaration": "3082010306092a864886f70d010702a081f53081f2020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020102801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210096056729f26231d2d865c71393b0d705cb62d0cdd9133f5b48f4b801d4bc71730221008e9e3b9bcfe5fd2724bd6375228e3021470f441f882ff5ae28368b0e61817a53",
-    "dac_private_key": "d1aaee5a9202a64599fa2ffbc2e63c5727aa1ab4789aeffe24b11b61423fdef3",
-    "dac_public_key": "040083ee3c7bf43893fcc94baa155ba3eaff92d6908000f15feba1ce131de4aa71326e89b2140839615f9ed3ded300564c34c2d8bf0cd3b00a230d88a01b6b5159"
+    "dac_cert": "308201e43082018aa0030201020208117917a583cbd6b0300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d939262dd82a30a9840f0fb114b097edb80808b7bc34ed999d048cfc64c54eabfa3e0c2b2cea96275392e7b69f6bc55a9d9e9d38052997ce47f331565a2bfc29a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604145a29f560c9204c6e4f3decb4de05f0793d6bfd01301f0603551d230418301680149491d720f4889bfa448ab4986b445df01cb52df4300a06082a8648ce3d0403020348003045022100e9f0d2836cad376ee9152ca51f4f42ddc0846b151c47fda4f65be7704436918e022058bdd4dd12658d9fd6a356d063098d47085a06d209ab0c31f4fe7fbd575eb76e",
+    "pai_cert": "308201d43082017aa0030201020208656b64005678b171300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e35323689b50ae5067c80a1a01f8c2788905617a4b763ebb266601fc5d96268e3e728e1761e06348e8985bb3c3e0090c62da47d4aa3e991ff54a760c33e5aa7ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604149491d720f4889bfa448ab4986b445df01cb52df4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022066273021cb039d8d3b44958addd88b95ef5487b63f6c2584b635b88c34ea9d84022100aac3275db29e500f9e1bed9dcbfc8382765837c6d9961a1c71f97c6f619db585",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020102801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ee6175515701e2506a15163c7427596f5cc04af9ed42c0f2e30838d5231c95bb022100a2a6286141b7980fbe899f6b671617d3dc69289e86b6a5214c1c9f6bd78f3ac4",
+    "dac_private_key": "62c277fde8239c06d490a9f64bfa1d470fa15056e4b86dd2ce5ca52e17e5d4ec",
+    "dac_public_key": "04d939262dd82a30a9840f0fb114b097edb80808b7bc34ed999d048cfc64c54eabfa3e0c2b2cea96275392e7b69f6bc55a9d9e9d38052997ce47f331565a2bfc29"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/cd.der b/credentials/development/commissioner_dut/struct_cd_version_number_match/cd.der
index 1f3fbac0b82362..1f5fcd6ea87875 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_match/cd.der and b/credentials/development/commissioner_dut/struct_cd_version_number_match/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.der
index ada0124b6d4a64..ebacb5f53b2b71 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.pem
index 71fd3c6b07b2cc..15359220714b48 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIfeNydAzYBlIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5TCCAYqgAwIBAgIIFiJVHaLU13gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-7JbSzTO5VMyMN3Z4HsnHdyQ4m9SOK9yQQplfEPLQ7k0WuURB6myUK6Rmv7dBEdiJ
-YDXGqvU9p7Vj83didnZNDKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFBOsHE17Ty+/mVb6IOT45gSnnSihMB8GA1UdIwQYMBaAFM9S
-lG2C/k4Jy+J73kVOnd/+L8u1MAoGCCqGSM49BAMCA0cAMEQCIEkhQxxfLyy7wg5d
-HN7Pa/5iyCjyzSGjFpQHoBiy2EosAiBY3dccy9aV2nNVKaBLHgITaLuIN5IFSACQ
-AOZnVp8WTA==
+ipQNxsQO/tURWrTF7KxaB0MM0Hag0UdJKSOhszV1wICMMnJ+7MjFZqOjb9NlMNZt
+UoLZXh0s4gP1B0o3bb651qNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFDFuVYrtD1OgzIi1ytJFnc/pucooMB8GA1UdIwQYMBaAFFGO
+RiUvgIZ/wEaVALTa2UJSorZ+MAoGCCqGSM49BAMCA0kAMEYCIQCPu3SHepLX5yH6
+QBRSiDJC2rQc02HPAtQJ2pySn0cY9QIhAN8J1drqGGN36UP+O5NpcEKHpqTzx596
+uPaT3j0drJ0m
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.der
index 52af5762814825..8dad13d5ab3cfa 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.pem
index 1178096b3fc9e6..1d163a1c22f4f1 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_match/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBA/o+2TnsvVeqFMwW5jj5Mwm36XMIhnhx1y6WIfwfdOoAoGCCqGSM49
-AwEHoUQDQgAE7JbSzTO5VMyMN3Z4HsnHdyQ4m9SOK9yQQplfEPLQ7k0WuURB6myU
-K6Rmv7dBEdiJYDXGqvU9p7Vj83didnZNDA==
+MHcCAQEEIESD8LE/z9oftADzOqBs9N6CtzV5QUgjSyH5pPxkMcSzoAoGCCqGSM49
+AwEHoUQDQgAEipQNxsQO/tURWrTF7KxaB0MM0Hag0UdJKSOhszV1wICMMnJ+7MjF
+ZqOjb9NlMNZtUoLZXh0s4gP1B0o3bb651g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.der
index 8c10bfe257c97c..ff2897198f1a03 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.pem
index e4fbacb804d02d..2764b15b3d08a7 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIfaGEMbCpoq4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIdI6ahBayEuIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASSDXhqmmew/MBlHHUmnyuZcYux6AOj
-9uDXfEgVS3oSN95ErMnMwBCLw5Wqx5G1D88t0+ps0iSeuP6QXeHFvzefo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUz1KU
-bYL+TgnL4nveRU6d3/4vy7UwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMndI9FQNs9wOcUwxp3wCeZJgG3yBJcV9bR1
-BBs6eUq0AiB7wIRRF1ZCzB/Uqur4TBV9FYRlTCpVTdzUn+IdSPEqfQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATLdv2sX6CFkpwbqakQLYjoNYKoWVoN
+tjqVMpppP+Zam1qOudGbUV+y6G7rWtyO875XicIydT8/GGoPqdd7O5y0o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUUY5G
+JS+Ahn/ARpUAtNrZQlKitn4wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgKOw3L1w28ig+oKQaFbLsNF9u9wGBGFmVS7m2
+N2s98WcCIQDlSitYfoYWpBUM/q769rNRs35nJkts1G9B+bTJFshbxw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.der
index cc40c64a4e1eb9..f45e8789575c76 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.pem
index e923c3043dd383..064601ca152cc1 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_match/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKQtD5nMcGn9ebCoeK9ZsnykL3b60NNnwNOoVw2HPV5NoAoGCCqGSM49
-AwEHoUQDQgAEkg14appnsPzAZRx1Jp8rmXGLsegDo/bg13xIFUt6EjfeRKzJzMAQ
-i8OVqseRtQ/PLdPqbNIknrj+kF3hxb83nw==
+MHcCAQEEICNhe7pQxB14l6JASn0zfBJhHSTJjg3Uu61LiqxPFpuOoAoGCCqGSM49
+AwEHoUQDQgAEy3b9rF+ghZKcG6mpEC2I6DWCqFlaDbY6lTKaaT/mWptajrnRm1Ff
+suhu61rcjvO+V4nCMnU/PxhqD6nXezuctA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_match/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_version_number_match/test_case_vector.json
index 23c30d1e8a3faa..40c37bac4d6f63 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_match/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_match/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The version_number field matches the VID and PID used in a DeviceSoftwareVersionModel entry in the DCL matching the certification record associated with the product presenting this CD.",
     "is_success_case": "true",
-    "dac_cert": "308201e33082018aa00302010202087de372740cd80652300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ec96d2cd33b954cc8c3776781ec9c77724389bd48e2bdc9042995f10f2d0ee4d16b94441ea6c942ba466bfb74111d8896035c6aaf53da7b563f3776276764d0ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041413ac1c4d7b4f2fbf9956fa20e4f8e604a79d28a1301f0603551d23041830168014cf52946d82fe4e09cbe27bde454e9ddffe2fcbb5300a06082a8648ce3d040302034700304402204921431c5f2f2cbbc20e5d1cdecf6bfe62c828f2cd21a3169407a018b2d84a2c022058ddd71ccbd695da735529a04b1e021368bb8837920548009000e667569f164c",
-    "pai_cert": "308201d43082017aa00302010202087da18431b0a9a2ae300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004920d786a9a67b0fcc0651c75269f2b99718bb1e803a3f6e0d77c48154b7a1237de44acc9ccc0108bc395aac791b50fcf2dd3ea6cd2249eb8fe905de1c5bf379fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414cf52946d82fe4e09cbe27bde454e9ddffe2fcbb5301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100c9dd23d15036cf7039c530c69df009e649806df2049715f5b475041b3a794ab402207bc08451175642cc1fd4aaeaf84c157d1584654c2a554ddcd49fe21d48f12a7d",
-    "certification_declaration": "3082010106092a864886f70d010702a081f33081f0020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201ad050638ab544e4f68e402486df11d985548b378fdfef37f9e9ab7c906058b7022040c8ec8ca53bdf6679c09e0b3fb1b648f6eca1c58de8c4a2752183a1818778d5",
-    "dac_private_key": "103fa3ed939ecbd57aa14cc16e638f93309b7e97308867871d72e9621fc1f74e",
-    "dac_public_key": "04ec96d2cd33b954cc8c3776781ec9c77724389bd48e2bdc9042995f10f2d0ee4d16b94441ea6c942ba466bfb74111d8896035c6aaf53da7b563f3776276764d0c"
+    "dac_cert": "308201e53082018aa00302010202081622551da2d4d778300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048a940dc6c40efed5115ab4c5ecac5a07430cd076a0d147492923a1b33575c0808c32727eecc8c566a3a36fd36530d66d5282d95e1d2ce203f5074a376dbeb9d6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414316e558aed0f53a0cc88b5cad2459dcfe9b9ca28301f0603551d23041830168014518e46252f80867fc0469500b4dad94252a2b67e300a06082a8648ce3d04030203490030460221008fbb74877a92d7e721fa401452883242dab41cd361cf02d409da9c929f4718f5022100df09d5daea186377e943fe3b9369704287a6a4f3c79f7ab8f693de3d1dac9d26",
+    "pai_cert": "308201d43082017aa0030201020208748e9a8416b212e2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004cb76fdac5fa085929c1ba9a9102d88e83582a8595a0db63a95329a693fe65a9b5a8eb9d19b515fb2e86eeb5adc8ef3be5789c232753f3f186a0fa9d77b3b9cb4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414518e46252f80867fc0469500b4dad94252a2b67e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022028ec372f5c36f2283ea0a41a15b2ec345f6ef701811859954bb9b6376b3df167022100e54a2b587e8616a4150cfeaefaf6b351b37e67264b6cd46f41f9b4c916c85bc7",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022012283adfefbe5c4a23cc33c6ec70201b26fe420a2b3da2f1ac147b70174decea02207dcfc97d3c49892086c6b719d70f82da7fff2220279524cf8c29add1c08f1330",
+    "dac_private_key": "4483f0b13fcfda1fb400f33aa06cf4de82b735794148234b21f9a4fc6431c4b3",
+    "dac_public_key": "048a940dc6c40efed5115ab4c5ecac5a07430cd076a0d147492923a1b33575c0808c32727eecc8c566a3a36fd36530d66d5282d95e1d2ce203f5074a376dbeb9d6"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_version_number_missing/cd.der
index 9a0fdcaa79e260..b5bbf0798b2802 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_version_number_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.der
index 66c4575631f41c..8175cd8c3b94ab 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.pem
index 06639bf77b18c6..ce179612db8e12 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIXxBoxL3QZUYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIandlsIGkAzUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-hb/nkDzg3jfeSTLN4zQD9RMz8selhZ15eDRpclvq2CFw2BtJqmduRG+i+sPnPMHB
-qud3ZX9VR2U2ii06AH9/UaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFAtoTWbqNkaNtB334DgABcNU2yu/MB8GA1UdIwQYMBaAFNHY
-IeEWRpgCz6hcCgxUiYuxA/T2MAoGCCqGSM49BAMCA0cAMEQCIGGmkkqiaZvr6e8p
-Z/tVV7uphJW1NtXI56OJbM3DqD+0AiAo7OJJg1sMom24CmRgCR+3RmftrWWkbIdJ
-Q5uYoM4hmg==
+fjjtNbyZbb7zEs34Xi6t0RxLbDhDElCCch0lkKXl6Il9lbESASDcphjGg9fa3gRi
+PLGkJYzNR6BUKcIotI2HqKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFNqz64LD3gq+8OwlC+kOJuZzUmIoMB8GA1UdIwQYMBaAFDJ0
+5IGTPgATnNTlDn9CzVKkA9ghMAoGCCqGSM49BAMCA0gAMEUCIQDNem0GNelBNjuy
+Qk3znBvo++9Oj097oE3dD7tKAAjv2QIgdEjZsEGoA/a50HeIqq8j4WqxWkTn255X
+PlqSZyHbqOs=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.der
index a2eea19a5b0d65..95c00625869a1f 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.pem
index 684d9f2ffa2f3a..7f473a5a90a523 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMGY0QaOgvwjfzny0/JPTsMhHbw+3MSJpuyDPF0M2Q2FoAoGCCqGSM49
-AwEHoUQDQgAEhb/nkDzg3jfeSTLN4zQD9RMz8selhZ15eDRpclvq2CFw2BtJqmdu
-RG+i+sPnPMHBqud3ZX9VR2U2ii06AH9/UQ==
+MHcCAQEEIAPeuDC3jiQn30/QkJpOCaSSOWh1Kfzz7KxPzqFZSwNJoAoGCCqGSM49
+AwEHoUQDQgAEfjjtNbyZbb7zEs34Xi6t0RxLbDhDElCCch0lkKXl6Il9lbESASDc
+phjGg9fa3gRiPLGkJYzNR6BUKcIotI2HqA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.der
index bdb4a90762757d..23d69626382eef 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.pem
index af44246698186b..f4023943754505 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIWwjFBlkcmr8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIHnN+jlGDcrIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQdunMkednzImnq30CKoIEwL3WMDR9Z
-+HcqqU5gSAAea1FA7ipnIPfZgH19dgJgPC70zu/LlUbVZweiJsYAym5oo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU0dgh
-4RZGmALPqFwKDFSJi7ED9PYwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhALzXzchh1tWrKHkAfsqyU89v2+SoCcrkHVj5
-D6cfmOYsAiAo8NsBDf0jvxZOPxFK6m9cxPS2/JLkre2dpxU57EztXw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQrAxJGOfpNifyiqmbV9nEiB3LRynYF
+0X4krE1+e0e9i9GCqF+hb0Ztf2NfRkmaveohHq7HFGIIzvJckNPGLRTPo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUMnTk
+gZM+ABOc1OUOf0LNUqQD2CEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgKAKxJAjLoxxeCX74ykZIHWxe0i6HZtTASanV
+Ex6BYBgCIQCFoutGC5Y5nf97Rk5UPHDQodVDxa8SXCSmpPAGQvsVOw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.der
index caeccf4b0f67e4..3831da3f5db916 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.pem
index 7d067456162d2a..fe2369b1f9d7f6 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGjZOiHg2e18lJTglmcl2jhm6jGlygzlJ9xba312ilt9oAoGCCqGSM49
-AwEHoUQDQgAEHbpzJHnZ8yJp6t9AiqCBMC91jA0fWfh3KqlOYEgAHmtRQO4qZyD3
-2YB9fXYCYDwu9M7vy5VG1WcHoibGAMpuaA==
+MHcCAQEEIDAhHy3xZe6P5h8KVWXRNtR5IxXqkuCU2lq48Rrde58noAoGCCqGSM49
+AwEHoUQDQgAEKwMSRjn6TYn8oqpm1fZxIgdy0cp2BdF+JKxNfntHvYvRgqhfoW9G
+bX9jX0ZJmr3qIR6uxxRiCM7yXJDTxi0Uzw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_version_number_missing/test_case_vector.json
index 11d5271300088b..09ac52a80ae23f 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The version_number field is missing.",
-    "is_success_case": "true",
-    "dac_cert": "308201e33082018aa00302010202085f1068c4bdd06546300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000485bfe7903ce0de37de4932cde33403f51333f2c7a5859d79783469725bead82170d81b49aa676e446fa2fac3e73cc1c1aae777657f554765368a2d3a007f7f51a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140b684d66ea36468db41df7e0380005c354db2bbf301f0603551d23041830168014d1d821e116469802cfa85c0a0c54898bb103f4f6300a06082a8648ce3d0403020347003044022061a6924aa2699bebe9ef2967fb5557bba98495b536d5c8e7a3896ccdc3a83fb4022028ece249835b0ca26db80a6460091fb74667edad65a46c8749439b98a0ce219a",
-    "pai_cert": "308201d43082017aa00302010202085b08c506591c9abf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041dba732479d9f32269eadf408aa081302f758c0d1f59f8772aa94e6048001e6b5140ee2a6720f7d9807d7d7602603c2ef4ceefcb9546d56707a226c600ca6e68a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d1d821e116469802cfa85c0a0c54898bb103f4f6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100bcd7cdc861d6d5ab2879007ecab253cf6fdbe4a809cae41d58f90fa71f98e62c022028f0db010dfd23bf164e3f114aea6f5cc4f4b6fc92e4aded9da71539ec4ced5f",
-    "certification_declaration": "3081fd06092a864886f70d010702a081ef3081ec020103310d300b0609608648016503040201305a06092a864886f70d010701a04d044b152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d3234240500240600240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402203b7959d51993ded96026d187f75989d284d4249f8d3cc6f649bd397a35f36a59022061b6917d5bda6787087073164360471bcfd77d40ccdd162b72f5248c4e8bfd7c",
-    "dac_private_key": "c198d1068e82fc237f39f2d3f24f4ec3211dbc3edcc489a6ec833c5d0cd90d85",
-    "dac_public_key": "0485bfe7903ce0de37de4932cde33403f51333f2c7a5859d79783469725bead82170d81b49aa676e446fa2fac3e73cc1c1aae777657f554765368a2d3a007f7f51"
+    "is_success_case": "false",
+    "dac_cert": "308201e43082018aa00302010202086a7765b081a40335300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047e38ed35bc996dbef312cdf85e2eadd11c4b6c3843125082721d2590a5e5e8897d95b1120120dca618c683d7dade04623cb1a4258ccd47a05429c228b48d87a8a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414dab3eb82c3de0abef0ec250be90e26e673526228301f0603551d230418301680143274e481933e00139cd4e50e7f42cd52a403d821300a06082a8648ce3d0403020348003045022100cd7a6d0635e941363bb2424df39c1be8fbef4e8f4f7ba04ddd0fbb4a0008efd902207448d9b041a803f6b9d07788aaaf23e16ab15a44e7db9e573e5a926721dba8eb",
+    "pai_cert": "308201d43082017aa00302010202081e737e8e518372b2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042b03124639fa4d89fca2aa66d5f671220772d1ca7605d17e24ac4d7e7b47bd8bd182a85fa16f466d7f635f46499abdea211eaec7146208cef25c90d3c62d14cfa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604143274e481933e00139cd4e50e7f42cd52a403d821301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502202802b12408cba31c5e097ef8ca46481d6c5ed22e8766d4c049a9d5131e81601802210085a2eb460b96399dff7b464e543c70d0a1d543c5af125c24a6a4f00642fb153b",
+    "certification_declaration": "3081e606092a864886f70d010702a081d83081d5020103310d300b0609608648016503040201304106092a864886f70d010701a0340432152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060024080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e2135149a92dbe0ca02398b9dea402d46cc2149e20298050ccbbc102d6a2abdf022100b977c0aad94469db8fbe2305814997e3584494768d3baea235eccbc8ef6b820d",
+    "dac_private_key": "03deb830b78e2427df4fd0909a4e09a49239687529fcf3ecac4fcea1594b0349",
+    "dac_public_key": "047e38ed35bc996dbef312cdf85e2eadd11c4b6c3843125082721d2590a5e5e8897d95b1120120dca618c683d7dade04623cb1a4258ccd47a05429c228b48d87a8"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/cd.der b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/cd.der
index 3c6ce8365c17e5..4174d6c8ea1a08 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/cd.der and b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.der
index 13c8d43f716a0f..a74ea1aca6a28b 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.pem
index 098a0083f786e9..bddef7bfdb52ea 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4zCCAYqgAwIBAgIIO3glKaYArLwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIeDMFHcWfYt0wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-0Dpc83WB3/eyKxLk7yHRkTJt7mAg/TtJy3hFluN/jKlVEDVEJbHOba1/75Iq/QY7
-p5Wo4Lt5G1QgErxR/diXpqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFDygFv36cZA/0HNtio+ZlxOQr9I7MB8GA1UdIwQYMBaAFNkj
-IJMGXTeP+RRKx6CGeT45lCI2MAoGCCqGSM49BAMCA0cAMEQCIE7hQ8zXL2DuxHUc
-PZ0kfXVsf7g0l1JWM4tOxYBQB8VVAiAxsTyMz3LBMYRtzUKp2cgIkqAKF6iuOHEb
-aNd0iYjMEA==
+6Ch5OkHtqNnv3ehTshfFoXwOFuLOFEEgxHgM3CVwBOi/dvMsvVp2KUERr90jz4Bz
+WSx3rYQUxGDGgm87Wp9Ip6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFFzVZu249ok6vU0cBOdGEZMZQdScMB8GA1UdIwQYMBaAFI53
+eAQCKPxin4Xcw/od/hClwsSdMAoGCCqGSM49BAMCA0gAMEUCIQD9BVaVJOkFRCjl
+TAEvpqfWaZr5rnykrwQj0FU0nEwJxQIgMsO5yoIMEg3Ja/pcDFTTkW/dK9s1ehjw
+pwVMk+Whf1A=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.der
index 1f5f0c377fcb6c..2c13b747fc8538 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.pem
index 0b15ea25d96965..8bf6f68e0ca8da 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIwCFX+eY8IayvXDbcWy62FRMFgWzgCPBFEZdXRIPo7koAoGCCqGSM49
-AwEHoUQDQgAE0Dpc83WB3/eyKxLk7yHRkTJt7mAg/TtJy3hFluN/jKlVEDVEJbHO
-ba1/75Iq/QY7p5Wo4Lt5G1QgErxR/diXpg==
+MHcCAQEEINC6pOscTj4z9v613Q9V8FjAa9W/Bm/EChDtpmYB5tLPoAoGCCqGSM49
+AwEHoUQDQgAE6Ch5OkHtqNnv3ehTshfFoXwOFuLOFEEgxHgM3CVwBOi/dvMsvVp2
+KUERr90jz4BzWSx3rYQUxGDGgm87Wp9Ipw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.der
index 0bbf7f4c982270..5793bca0090d66 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.pem
index f37605abca2734..dc2daee70c9c2b 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIeJcidC1ih1wwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIK2bRs0oIww0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQp0+bklPcWoNSCiVlTCMrjW2A6fBy0
-PS/2wQwhA26+35W9xjZGKBloqp8P7/4pA5x+VJJ34LT3zr1ByDX6QQBto2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU2SMg
-kwZdN4/5FErHoIZ5PjmUIjYwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgZHbpRgX3YRoocptPf0jr7C25QuyWju9k9OcW
-pLtmVe8CIQCRU16IozngIwGHZxX/06OVKu1sXRNObHOunUOgls54ug==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATZatgs4btGxGi4TpgAGocE/xGh4HHz
+K8jqk2Im37n+4eSJZ19fSXipAzGiL1nZlNPF43NzEionwGcC5fFqPhYgo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUjnd4
+BAIo/GKfhdzD+h3+EKXCxJ0wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhALkv1XcTAHw9J3SrRxffvolvlOk34AOVhsRw
+g5wW7R3TAiEA6wUh0l0/PyhXccM2JYqOmIEkvlQZ4D1gWMdTGFwUdu4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.der
index d36c298843cf83..528e0807a30bd9 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.pem
index 1e5d89a0799ca9..894dc32d606308 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIA0ZqEbY8baBBTfb13oimJADlTNFOMmhRxAIx9IdPwV/oAoGCCqGSM49
-AwEHoUQDQgAEKdPm5JT3FqDUgolZUwjK41tgOnwctD0v9sEMIQNuvt+VvcY2RigZ
-aKqfD+/+KQOcflSSd+C09869Qcg1+kEAbQ==
+MHcCAQEEIIcStz3BsqHtk+px5TFhJdEzYWMV9JS5DydffAHolLCIoAoGCCqGSM49
+AwEHoUQDQgAE2WrYLOG7RsRouE6YABqHBP8RoeBx8yvI6pNiJt+5/uHkiWdfX0l4
+qQMxoi9Z2ZTTxeNzcxIqJ8BnAuXxaj4WIA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/test_case_vector.json
index ff75af9fc2740a..db9807522e592b 100644
--- a/credentials/development/commissioner_dut/struct_cd_version_number_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_version_number_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The version_number field doesn't match the VID and PID used in a DeviceSoftwareVersionModel entry in the DCL matching the certification record associated with the product presenting this CD.",
     "is_success_case": "false",
-    "dac_cert": "308201e33082018aa00302010202083b782529a600acbc300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d03a5cf37581dff7b22b12e4ef21d191326dee6020fd3b49cb784596e37f8ca95510354425b1ce6dad7fef922afd063ba795a8e0bb791b542012bc51fdd897a6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143ca016fdfa71903fd0736d8a8f99971390afd23b301f0603551d23041830168014d9232093065d378ff9144ac7a086793e39942236300a06082a8648ce3d040302034700304402204ee143ccd72f60eec4751c3d9d247d756c7fb834975256338b4ec5805007c555022031b13c8ccf72c131846dcd42a9d9c80892a00a17a8ae38711b68d7748988cc10",
-    "pai_cert": "308201d43082017aa0030201020208789722742d62875c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000429d3e6e494f716a0d48289595308cae35b603a7c1cb43d2ff6c10c21036ebedf95bdc63646281968aa9f0feffe29039c7e549277e0b4f7cebd41c835fa41006da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d9232093065d378ff9144ac7a086793e39942236301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502206476e94605f7611a28729b4f7f48ebec2db942ec968eef64f4e716a4bb6655ef02210091535e88a339e02301876715ffd3a3952aed6c5d134e6c73ae9d43a096ce78ba",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305e06092a864886f70d010701a051044f152000012501f1ff360205008018250334122c04135a494732303134315a423333303030312d323424050024060025078967240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502210087e62fd2258fcac1b152a4327e21596d6bd32fd0a619b609caf9eb410b14f58a02205be39c074c528bf3357f4913b99f84c760b8261a3001667c111d6fb4f21b873c",
-    "dac_private_key": "8c02157f9e63c21acaf5c36dc5b2eb6151305816ce008f0451197574483e8ee4",
-    "dac_public_key": "04d03a5cf37581dff7b22b12e4ef21d191326dee6020fd3b49cb784596e37f8ca95510354425b1ce6dad7fef922afd063ba795a8e0bb791b542012bc51fdd897a6"
+    "dac_cert": "308201e43082018aa00302010202087833051dc59f62dd300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e828793a41eda8d9efdde853b217c5a17c0e16e2ce144120c4780cdc257004e8bf76f32cbd5a76294111afdd23cf8073592c77ad8414c460c6826f3b5a9f48a7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604145cd566edb8f6893abd4d1c04e74611931941d49c301f0603551d230418301680148e7778040228fc629f85dcc3fa1dfe10a5c2c49d300a06082a8648ce3d0403020348003045022100fd05569524e9054428e54c012fa6a7d6699af9ae7ca4af0423d055349c4c09c5022032c3b9ca820c120dc96bfa5c0c54d3916fdd2bdb357a18f0a7054c93e5a17f50",
+    "pai_cert": "308201d53082017aa00302010202082b66d1b34a08c30d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d96ad82ce1bb46c468b84e98001a8704ff11a1e071f32bc8ea936226dfb9fee1e489675f5f4978a90331a22f59d994d3c5e37373122a27c06702e5f16a3e1620a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148e7778040228fc629f85dcc3fa1dfe10a5c2c49d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b92fd57713007c3d2774ab4717dfbe896f94e937e0039586c470839c16ed1dd3022100eb0521d25d3f3f285771c336258a8e988124be5419e03d6058c753185c1476ee",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507896724080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022020c748c4293aa2b81659b0a91d38d1e35bc3eb41ce36221fdc2fb58dd33a26de02210087aeae2865e0cc513c9911a69a82d6f2c796ed2abfd0c3a2779e79d76447fdab",
+    "dac_private_key": "d0baa4eb1c4e3e33f6feb5dd0f55f058c06bd5bf066fc40a10eda66601e6d2cf",
+    "dac_public_key": "04e828793a41eda8d9efdde853b217c5a17c0e16e2ce144120c4780cdc257004e8bf76f32cbd5a76294111afdd23cf8073592c77ad8414c460c6826f3b5a9f48a7"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/cd.der
index 65f3a9e64c5ad3..f90000890e8496 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.der
index 7f21397118402d..9ce7bf0f1105a0 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.pem
index 65b5bdbee507e7..8cd8fb3c640f3b 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIIuKx6XkmDfMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB5DCCAYqgAwIBAgIIMq2wc33QrNcwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-duJARDw0kFu1NVvKkuZtKHaqolG5A+ohJSLHeqMyhUfHo6MYrIPH6seIy2K+oyhh
-qMtWEJWIkB0lTcVe/9bwDKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFAs2xgEIbHIy2QW9ix6yznXZqo7uMB8GA1UdIwQYMBaAFHqJ
-gEtheXpAWlgMIqri1zqsF8+mMAoGCCqGSM49BAMCA0gAMEUCIGOcbapxJlonyfMo
-JB0WA5nAnRUH5k/706TOLvf+IjiIAiEAkClat+MDKOtzJSAfQezFsOUG0Vins86L
-OYZTLWV2krg=
+FfJpfnh9ABgTVPiY9l9+AYztTBXIYWSmm8910gg3N25SS5kWQawGaisgFEyN4bAL
+ypAgV1I6cwGzLYrExFDaaaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFI8Va+KdqAyCMLF06Og+yZJ6JXYNMB8GA1UdIwQYMBaAFNSL
+LDFlOePUKtKamzuQd163ow4fMAoGCCqGSM49BAMCA0gAMEUCIAe3mM5gyMD+mMBE
+SHXpaPwqHEAoOZiXiYY4V4Ueo9HBAiEA9HPHTMeEFEQxny1vKVcCZkUfc2n3QY9C
++SpUWc2XEUE=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.der
index 8c1638ed7d9f1b..289f16d87b6743 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.pem
index c8c29ce5a63c8e..9fb33481e1e256 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICvKu02wunEmOg4L/E1trjbbF5V6jmOsFS+UGfGhKwP5oAoGCCqGSM49
-AwEHoUQDQgAEduJARDw0kFu1NVvKkuZtKHaqolG5A+ohJSLHeqMyhUfHo6MYrIPH
-6seIy2K+oyhhqMtWEJWIkB0lTcVe/9bwDA==
+MHcCAQEEIGR6HDy3kYSB/DpAz3EZ+TzY+vJgJ9Lpk2MHuvRcAQzroAoGCCqGSM49
+AwEHoUQDQgAEFfJpfnh9ABgTVPiY9l9+AYztTBXIYWSmm8910gg3N25SS5kWQawG
+aisgFEyN4bALypAgV1I6cwGzLYrExFDaaQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.der
index 567fe90f1d75ef..ff368eff19e6d3 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.pem
index dd85a943af4929..7c2b9de00d1cf0 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIGSKgoX9NIEkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIFX+NQAEY3YUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR/oJC2BUTw7P8XTi/v+2NL5Vh8bf+S
-FoP4bAJYUomsB0kn8BG9GSdxKKelow/Aoq7AR9na+enMy6hAax586ZqAo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUeomA
-S2F5ekBaWAwiquLXOqwXz6YwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgYnm5S7xk75obAOXsd5QugAJfgSnFqeSnICiH
-dUCPItMCIDEv525ejFyF9uHEE2X6bkx3sjxnQN8PYjzPvLdEXsNs
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQVMihEBqeRJYCu2nYSSDCWo9xkT/KI
+Lc9uh1AXkNLSVqsr6uKryNB7VjlLDhTUxmMkkzdNz7Z8z7gePIn8xrKko2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU1Iss
+MWU549Qq0pqbO5B3XrejDh8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAIyGi09iH7YxhMEgIqQwUb9zu+mBvO33jES0
+3HhkMjOYAiEAzeSO5UqTwMI3Pypd4wj7wkdpHOkdiiV20E8IUDc+9FE=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.der
index 07d594b7ecb209..e7000ca4720817 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.pem
index 80b13b870101eb..e19b81e98bd8ec 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINEe6p4/hQFm73YvxKkjMwrzinsEOEeHq/8aQRNgW5tuoAoGCCqGSM49
-AwEHoUQDQgAEf6CQtgVE8Oz/F04v7/tjS+VYfG3/khaD+GwCWFKJrAdJJ/ARvRkn
-cSinpaMPwKKuwEfZ2vnpzMuoQGsefOmagA==
+MHcCAQEEIN+xrCJHRcfjdJVPFlRK6yKvQOrEAuROs7UYP6BvfsZCoAoGCCqGSM49
+AwEHoUQDQgAEFTIoRAankSWArtp2EkgwlqPcZE/yiC3PbodQF5DS0larK+riq8jQ
+e1Y5Sw4U1MZjJJM3Tc+2fM+4HjyJ/MaypA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/test_case_vector.json
index 007631589f4cab..8b6321d787ad43 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_vid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The vendor_id field doesn't match the VID in DAC.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020822e2b1e979260df3300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000476e240443c34905bb5355bca92e66d2876aaa251b903ea212522c77aa3328547c7a3a318ac83c7eac788cb62bea32861a8cb56109588901d254dc55effd6f00ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140b36c601086c7232d905bd8b1eb2ce75d9aa8eee301f0603551d230418301680147a89804b61797a405a580c22aae2d73aac17cfa6300a06082a8648ce3d04030203480030450220639c6daa71265a27c9f328241d160399c09d1507e64ffbd3a4ce2ef7fe22388802210090295ab7e30328eb7325201f41ecc5b0e506d158a7b3ce8b3986532d657692b8",
-    "pai_cert": "308201d33082017aa00302010202081922a0a17f4d2049300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047fa090b60544f0ecff174e2feffb634be5587c6dff921683f86c02585289ac074927f011bd19277128a7a5a30fc0a2aec047d9daf9e9cccba8406b1e7ce99a80a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147a89804b61797a405a580c22aae2d73aac17cfa6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402206279b94bbc64ef9a1b00e5ec77942e80025f8129c5a9e4a720288775408f22d30220312fe76e5e8c5c85f6e1c41365fa6e4c77b23c6740df0f623ccfbcb7445ec36c",
-    "certification_declaration": "3082010206092a864886f70d010702a081f43081f1020103310d300b0609608648016503040201305d06092a864886f70d010701a050044e1520000124010e360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b88fedd6477eb447cfcaf0ee58b73c4b3f164246ff0f7c55929b90928204f712022100f14079ed90603b57784dc7742d672d48e223a98d579db1edb801f6e2deb4ed11",
-    "dac_private_key": "2bcabb4db0ba71263a0e0bfc4d6dae36db17957a8e63ac152f9419f1a12b03f9",
-    "dac_public_key": "0476e240443c34905bb5355bca92e66d2876aaa251b903ea212522c77aa3328547c7a3a318ac83c7eac788cb62bea32861a8cb56109588901d254dc55effd6f00c"
+    "dac_cert": "308201e43082018aa003020102020832adb0737dd0acd7300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000415f2697e787d00181354f898f65f7e018ced4c15c86164a69bcf75d20837376e524b991641ac066a2b20144c8de1b00bca902057523a7301b32d8ac4c450da69a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148f156be29da80c8230b174e8e83ec9927a25760d301f0603551d23041830168014d48b2c316539e3d42ad29a9b3b90775eb7a30e1f300a06082a8648ce3d0403020348003045022007b798ce60c8c0fe98c0444875e968fc2a1c402839989789863857851ea3d1c1022100f473c74cc7841444319f2d6f29570266451f7369f7418f42f92a5459cd971141",
+    "pai_cert": "308201d53082017aa0030201020208157f8d400118dd85300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041532284406a7912580aeda7612483096a3dc644ff2882dcf6e87501790d2d256ab2beae2abc8d07b56394b0e14d4c6632493374dcfb67ccfb81e3c89fcc6b2a4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d48b2c316539e3d42ad29a9b3b90775eb7a30e1f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008c868b4f621fb63184c12022a43051bf73bbe981bcedf78c44b4dc7864323398022100cde48ee54a93c0c2373f2a5de308fbc247691ce91d8a2576d04f0850373ef451",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a03704351524000124010e360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c9b82be3af53917e8aff31d191207bedf84b37b38db9c9438c2b0834c4a98f36022022a5fa1ee66e3c620a879b8b64165238c72c136c0358187d3b4727454c105fef",
+    "dac_private_key": "647a1c3cb7918481fc3a40cf7119f93cd8faf26027d2e9936307baf45c010ceb",
+    "dac_public_key": "0415f2697e787d00181354f898f65f7e018ced4c15c86164a69bcf75d20837376e524b991641ac066a2b20144c8de1b00bca902057523a7301b32d8ac4c450da69"
 }
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/cd.der b/credentials/development/commissioner_dut/struct_cd_vid_missing/cd.der
index 4ab65e37335021..5e2a6695800987 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_missing/cd.der and b/credentials/development/commissioner_dut/struct_cd_vid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.der
index 84f885ac23966d..04e020797b75bb 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.pem
index c6d10050f80c12..89bc7daffde103 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYqgAwIBAgIIJ7CM1NMr3qgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB4zCCAYqgAwIBAgIIc2F45hkYl6gwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDgwMDAwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
+gqJ8AgIMBDgwMDAwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYx
 GDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjEx
 FDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-3NBPvwhnU9HJr8A59Xslvr7/ebz37hT0qw4jI9YgdrYAYajKVQaEH4Ywqrah/rHy
-lcVdZTu/AKctEuCgB522dqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
-B4AwHQYDVR0OBBYEFHtD4hksZmpfOKZDLHYEF1YjKn2/MB8GA1UdIwQYMBaAFEu1
-IKKN1Rlc0iecXxVrfoKxrLGFMAoGCCqGSM49BAMCA0gAMEUCIQDH1J1REn/eX3DN
-zJK/Majq2KjCyUSAprI9mFxQXtIMygIgWejTMO7RLgu/qb6hk4TNElodgbmdivPq
-NS78EZwQkdc=
+jj/kA4ONmUak93FXWU7nwoYA83SHgJ+DA9vVZahdsP5VCVbhIdT5zMETuCpIJ4V3
+IbQydKj3YSrUhtA26oexV6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwHQYDVR0OBBYEFEOjKrElMN/wEw1IUXeOiO64CnrlMB8GA1UdIwQYMBaAFLI1
+ACix/HclFuJvBL4i9sljoqIyMAoGCCqGSM49BAMCA0cAMEQCIG7E94S1Li+5o3M6
+OwdMRduEw/qlc7sq755ZZH3WmHFrAiBXZ8bSuvRWe71BIxkCDrJTBJA687W5oIdO
+MDFEx5aTvA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.der
index 148b240cf66810..a48821d8a42828 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.pem
index 32b7d99e88f4a9..65e7913aa4b5d1 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIO/kh8a2zmLLjp0jKrjyfULiqT4xUm9xVyHuQQprRpsAoAoGCCqGSM49
-AwEHoUQDQgAE3NBPvwhnU9HJr8A59Xslvr7/ebz37hT0qw4jI9YgdrYAYajKVQaE
-H4Ywqrah/rHylcVdZTu/AKctEuCgB522dg==
+MHcCAQEEIKQLf3DxloEkTo4+g1wxqqJe4bo4Vx+Hc7YUFQXAYEsOoAoGCCqGSM49
+AwEHoUQDQgAEjj/kA4ONmUak93FXWU7nwoYA83SHgJ+DA9vVZahdsP5VCVbhIdT5
+zMETuCpIJ4V3IbQydKj3YSrUhtA26oexVw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.der
index 99affa311f80e4..6b41da0a719f25 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.pem
index e15a71b9a531ea..bfa029b3b8e4f4 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIVZ5GUukCNmUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIITv0G0FC6KVkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATAXapYbncS/Z13S5jQPuqG2Zxm3gvQ
-A2KQBGf0xEIu9n6NFHHPRnWr2r4iFHbuz6C4TjU+xulJcpm8F4Rn1rm8o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUS7Ug
-oo3VGVzSJ5xfFWt+grGssYUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgXdnOLyLmm2Yu9YZex7BlXFlgVYJpUL7GOBPo
-vlhVWTACIEEe6YgHz/34bd2/sCLDKjbUW/4ezaAxB/45+7OMcWJN
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQFNNLWyRjDqW5j9XvpTOttl7zoq+Li
+0sfTCtnRL+xhov7Q7/E5MyoVLkDvInILPV3AfOHehIlMWEL0ARwubnnzo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUsjUA
+KLH8dyUW4m8EviL2yWOiojIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhALcinJtjDOwsU6HCCYQXqEGPTEhXkzb24MYQ
+jdizhPOIAiEArbgIX0cUkXJ0yT+5GXiVKLptNe3hLkez1OuNa1xfXCo=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.der
index 1d6784b11d1a23..8b5fecbbdd6b93 100644
Binary files a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.pem
index 0599afcb766e59..a1069356fd137e 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_cd_vid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIEwaTLZWHCOReorGO/2lAqrhfDrQA56tno2DjpNMyuJoAoGCCqGSM49
-AwEHoUQDQgAEwF2qWG53Ev2dd0uY0D7qhtmcZt4L0ANikARn9MRCLvZ+jRRxz0Z1
-q9q+IhR27s+guE41PsbpSXKZvBeEZ9a5vA==
+MHcCAQEEIHeoeaSmMeSyzHBTeW6k1BkMBQSbEwkVUgqb5tv51GuioAoGCCqGSM49
+AwEHoUQDQgAEBTTS1skYw6luY/V76UzrbZe86Kvi4tLH0wrZ0S/sYaL+0O/xOTMq
+FS5A7yJyCz1dwHzh3oSJTFhC9AEcLm558w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_cd_vid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_cd_vid_missing/test_case_vector.json
index ad0f07fa333618..d9c704ea4a9a42 100644
--- a/credentials/development/commissioner_dut/struct_cd_vid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_cd_vid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "CD Test Vector: The vendor_id field is missing.",
     "is_success_case": "false",
-    "dac_cert": "308201e43082018aa003020102020827b08cd4d32bdea8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004dcd04fbf086753d1c9afc039f57b25bebeff79bcf7ee14f4ab0e2323d62076b60061a8ca5506841f8630aab6a1feb1f295c55d653bbf00a72d12e0a0079db676a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147b43e2192c666a5f38a6432c76041756232a7dbf301f0603551d230418301680144bb520a28dd5195cd2279c5f156b7e82b1acb185300a06082a8648ce3d0403020348003045022100c7d49d51127fde5f70cdcc92bf31a8ead8a8c2c94480a6b23d985c505ed20cca022059e8d330eed12e0bbfa9bea19384cd125a1d81b99d8af3ea352efc119c1091d7",
-    "pai_cert": "308201d33082017aa0030201020208559e4652e9023665300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c05daa586e7712fd9d774b98d03eea86d99c66de0bd00362900467f4c4422ef67e8d1471cf4675abdabe221476eecfa0b84e353ec6e9497299bc178467d6b9bca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144bb520a28dd5195cd2279c5f156b7e82b1acb185301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402205dd9ce2f22e69b662ef5865ec7b0655c596055826950bec63813e8be585559300220411ee98807cffdf86dddbfb022c32a36d45bfe1ecda03107fe39fbb38c71624d",
-    "certification_declaration": "3081fe06092a864886f70d010702a081f03081ed020103310d300b0609608648016503040201305a06092a864886f70d010701a04d044b15200001360205008018250334122c04135a494732303134315a423333303030312d323424050024060025077698240800360b10140b44cabbc5016577aa8b44ffb90fcca140fe66201818317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502202728c6779f4343cfa4e7b612777559c3ef5d1434cb961be8d0a49881811df5c2022100ff158c6660016f799f5225393ae29cb966d6248eebe425ca46df2d104f6b25e4",
-    "dac_private_key": "efe487c6b6ce62cb8e9d232ab8f27d42e2a93e31526f715721ee410a6b469b00",
-    "dac_public_key": "04dcd04fbf086753d1c9afc039f57b25bebeff79bcf7ee14f4ab0e2323d62076b60061a8ca5506841f8630aab6a1feb1f295c55d653bbf00a72d12e0a0079db676"
+    "dac_cert": "308201e33082018aa0030201020208736178e6191897a8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048e3fe403838d9946a4f77157594ee7c28600f37487809f8303dbd565a85db0fe550956e121d4f9ccc113b82a4827857721b43274a8f7612ad486d036ea87b157a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041443a32ab12530dff0130d4851778e88eeb80a7ae5301f0603551d23041830168014b2350028b1fc772516e26f04be22f6c963a2a232300a06082a8648ce3d040302034700304402206ec4f784b52e2fb9a3733a3b074c45db84c3faa573bb2aef9e59647dd698716b02205767c6d2baf4567bbd412319020eb25304903af3b5b9a0874e303144c79693bc",
+    "pai_cert": "308201d53082017aa00302010202084efd06d050ba2959300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040534d2d6c918c3a96e63f57be94ceb6d97bce8abe2e2d2c7d30ad9d12fec61a2fed0eff139332a152e40ef22720b3d5dc07ce1de84894c5842f4011c2e6e79f3a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b2350028b1fc772516e26f04be22f6c963a2a232301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b7229c9b630cec2c53a1c2098417a8418f4c48579336f6e0c6108dd8b384f388022100adb8085f4714917274c93fb919789528ba6d35ede12e47b3d4eb8d6b5c5f5c2a",
+    "certification_declaration": "3081e606092a864886f70d010702a081d83081d5020103310d300b0609608648016503040201304106092a864886f70d010701a034043215240001360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210099fe1cb4ec023c66da5664313a73149bf5d8c3d4aea85bcb77adce5955b40bbc022100e4861d428bd36d52967a1054c950195e6b9f94baa87b2e3ecf875a74397b429f",
+    "dac_private_key": "a40b7f70f19681244e8e3e835c31aaa25ee1ba38571f8773b6141505c0604b0e",
+    "dac_public_key": "048e3fe403838d9946a4f77157594ee7c28600f37487809f8303dbd565a85db0fe550956e121d4f9ccc113b82a4827857721b43274a8f7612ad486d036ea87b157"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/cd.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/cd.der
index a2fd5c2c03bd6b..a13b7f2182e00d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/cd.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.der
index 1b155a926d463e..f97ae830c443b3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.pem
index 76726fd05c799d..820b9890661ac8 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAQIICVy5BCcv99kwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAQIIO6PrfLb7KlEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQZYjs3lvdF5a/MnwnGpGrhJyv6+yiq
-QmiSnjqrozTmsfwS0WSLiDkB3FiPvlCA+wVrvFXS8TTe456DDOAYx+D8o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUU9YqZWl7P0Ln
-Ww1+6ZMIOOtirRkwHwYDVR0jBBgwFoAUca9IfOH5Y5O48h9yuCwkQvZOLtYwCgYI
-KoZIzj0EAwIDSAAwRQIhAMWG6ay42sxcUEKycCuNFyCi880f9ararLXuP/v3aNyv
-AiBkaANC761Xs9ZeQpW5cSMDgYAMhselPifw4hiW+RxJkw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT1iFoo4xy8YsVnVCw8HIo7VN+UUa/K
+As8nD0toPyMucIdHYzJyLUmB4+m346JvtWHKHe8fKtGqS/w/M1+hzaA3o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUzvwpYDR3gUWN
+Sa6fEN3LEk2L/RMwHwYDVR0jBBgwFoAUT1DdfGyFOsqHYjfZiIsdHsPmC58wCgYI
+KoZIzj0EAwIDSAAwRQIhANBjrUxLO0Hqze3v/wp2Eywi+XSy05GIhjxbORM2Ctox
+AiAYWN2aZd0THmKNPSyIv553LSueBoQAiT/9CxNuZhw/Mw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.der
index f28baa5f60f2d6..d29d42061f5c42 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.pem
index b5822355258849..1158799198daf9 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIB7fnHdZ4HsLjCPxVyPY8ouSVT5PUD85jgaHUQ7QprvtoAoGCCqGSM49
-AwEHoUQDQgAEGWI7N5b3ReWvzJ8JxqRq4Scr+vsoqkJokp46q6M05rH8EtFki4g5
-AdxYj75QgPsFa7xV0vE03uOegwzgGMfg/A==
+MHcCAQEEIJQwkgCLtZRefqFABpApftjxgo0aY/8TpIX8BR+8t8FRoAoGCCqGSM49
+AwEHoUQDQgAE9YhaKOMcvGLFZ1QsPByKO1TflFGvygLPJw9LaD8jLnCHR2Myci1J
+gePpt+Oib7Vhyh3vHyrRqkv8PzNfoc2gNw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.der
index c29f52c807bf01..01ec46b811d28a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.pem
index 39e0d23eaa1226..b1d3c5df1d7942 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIISInkvhWzPA4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIINwKfRk/8EMIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABBEUapC7hsteVsFRg1GgwZFXfL+9F+qcziRjbUs1zj4pl0TFBKQJFRkXPpvQ
-4KGw9gTPPfqruw6ua8TUzoy2L/ujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRxr0h84fljk7jyH3K4LCRC9k4u1jAfBgNV
+A0IABKghehUPN6QDEM+EKerfbIE0wPH4k2bG0vdFV5kPBW9iqkMYdZkw/62gc4hk
+2RPSOba7HiKKZ17NtZ4/j8bdFMyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRPUN18bIU6yodiN9mIix0ew+YLnzAfBgNV
 HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-pqZm2cK+Q9OGvaAuMc30F8VFtg3HNwQ0lpoYH8j+H8cCIBwNjE6FpY/Pp1o+44a7
-xXnBjuwbgWsTmJKSINYEiJwJ
+hZmCE7dyf7NuUAolrwUuctzOa2IO5F5b9clbJoq+XhcCIBWn2u3NZIkZXf5VjaQM
+s7FoLriIPjKNi/TYn4SWWvwB
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.der
index 95eb03475b1daa..6f47384d48d8ca 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.pem
index 3775d46816114c..a45e214b8de941 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIATX/xcuFW8gQ10DHVqjnQLK3zBFYAWPT5PbIdQYeCbtoAoGCCqGSM49
-AwEHoUQDQgAEERRqkLuGy15WwVGDUaDBkVd8v70X6pzOJGNtSzXOPimXRMUEpAkV
-GRc+m9DgobD2BM89+qu7Dq5rxNTOjLYv+w==
+MHcCAQEEIOSLpYc5zaiCo3Ouo79dZHuz19JgF987WJPZiD33I60zoAoGCCqGSM49
+AwEHoUQDQgAEqCF6FQ83pAMQz4Qp6t9sgTTA8fiTZsbS90VXmQ8Fb2KqQxh1mTD/
+raBziGTZE9I5trseIopnXs21nj+Pxt0UzA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/test_case_vector.json
index d2889db76e6d5d..68a341172fa433 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Invalid certificate version field set to v2(1)",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201010208095cb904272ff7d9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000419623b3796f745e5afcc9f09c6a46ae1272bfafb28aa4268929e3aaba334e6b1fc12d1648b883901dc588fbe5080fb056bbc55d2f134dee39e830ce018c7e0fca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041453d62a65697b3f42e75b0d7ee9930838eb62ad19301f0603551d2304183016801471af487ce1f96393b8f21f72b82c2442f64e2ed6300a06082a8648ce3d0403020348003045022100c586e9acb8dacc5c5042b2702b8d1720a2f3cd1ff5aadaacb5ee3ffbf768dcaf022064680342efad57b3d65e4295b971230381800c86c7a53e27f0e21896f91c4993",
-    "pai_cert": "308201be30820164a00302010202084889e4be15b33c0e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000411146a90bb86cb5e56c1518351a0c191577cbfbd17ea9cce24636d4b35ce3e299744c504a4091519173e9bd0e0a1b0f604cf3dfaabbb0eae6bc4d4ce8cb62ffba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041471af487ce1f96393b8f21f72b82c2442f64e2ed6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a6a666d9c2be43d386bda02e31cdf417c545b60dc7370434969a181fc8fe1fc702201c0d8c4e85a58fcfa75a3ee386bbc579c18eec1b816b1398929220d604889c09",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210090e5c2b2074ebdd3c07a6d7252397018c0c8ed5a607b5b7d97a80f0df4e81b5f02210080106205a6678a2e4c80841d81d8b491f0c4d18e83648d515ca9b192f64509ad",
-    "dac_private_key": "1edf9c7759e07b0b8c23f15723d8f28b92553e4f503f398e0687510ed0a6bbed",
-    "dac_public_key": "0419623b3796f745e5afcc9f09c6a46ae1272bfafb28aa4268929e3aaba334e6b1fc12d1648b883901dc588fbe5080fb056bbc55d2f134dee39e830ce018c7e0fc"
+    "dac_cert": "308201ce30820174a00302010102083ba3eb7cb6fb2a51300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f5885a28e31cbc62c567542c3c1c8a3b54df9451afca02cf270f4b683f232e7087476332722d4981e3e9b7e3a26fb561ca1def1f2ad1aa4bfc3f335fa1cda037a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cefc2960347781458d49ae9f10ddcb124d8bfd13301f0603551d230418301680144f50dd7c6c853aca876237d9888b1d1ec3e60b9f300a06082a8648ce3d0403020348003045022100d063ad4c4b3b41eacdedefff0a76132c22f974b2d39188863c5b3913360ada3102201858dd9a65dd131e628d3d2c88bf9e772d2b9e068400893ffd0b136e661c3f33",
+    "pai_cert": "308201be30820164a003020102020837029f464ffc10c2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004a8217a150f37a40310cf8429eadf6c8134c0f1f89366c6d2f74557990f056f62aa4318759930ffada0738864d913d239b6bb1e228a675ecdb59e3f8fc6dd14cca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144f50dd7c6c853aca876237d9888b1d1ec3e60b9f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210085998213b7727fb36e500a25af052e72dcce6b620ee45e5bf5c95b268abe5e17022015a7daedcd6489195dfe558da40cb3b1682eb8883e328d8bf4d89f84965afc01",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502204d3fb38c767492bbdd3811dc1f7457c065a4b670404656ae69f9151c5a03fec002210082239902f8046dee65d2b3354de83f292d4083c6f9dbc8a7487426762ee9c516",
+    "dac_private_key": "943092008bb5945e7ea1400690297ed8f1828d1a63ff13a485fc051fbcb7c151",
+    "dac_public_key": "04f5885a28e31cbc62c567542c3c1c8a3b54df9451afca02cf270f4b683f232e7087476332722d4981e3e9b7e3a26fb561ca1def1f2ad1aa4bfc3f335fa1cda037"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/cd.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/cd.der
index ce647632c36ec6..aca43f2947b50c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/cd.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.der
index f71ca132dda6a8..3b2c13e6ff07f0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.pem
index 0b2a67622635f2..afe561fca70090 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIICJAxPrP/fzowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIGQjvxL8hgiEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT9W7duG5fJVhSXF6u2DwIUTU7gpTyN
-GopDRhD67n/GC4aUKZ4xzr1xYfQt+rQRzVliEZFiPLaXPWvMG8i61wFSo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUWms6AsADEUHi
-pZzQDcQICluN+bwwHwYDVR0jBBgwFoAUeZhx076y1NAoy3o889DeiUSoBBgwCgYI
-KoZIzj0EAwIDSQAwRgIhALwXqM0L/eB3DUb2ThEY5StC5E7eclNLv4GzxpgDrQrk
-AiEA+mHNrZ7wd+5CGXRMV6RkKAYwsVIoJ3a2mOPpqMRv8bo=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR23sli5ZBAAM2fJ78jS+tF9MSnjFOT
+f7jkc4mk9owpVNynjwFl8ZABXJsOT8RYVfP/0dNON+/NtTXJbtuDBjgbo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU8b6RWIN43NdF
+spiHV84V0K2UcbYwHwYDVR0jBBgwFoAU4xYo9Jm/AJhhCtK196Pp3hPS76YwCgYI
+KoZIzj0EAwIDSAAwRQIhAIYDzT+dzHd4Iz1kGzGC3WYdeZF5oPyVVSWWC9DU2Jjc
+AiBJihL3FgsDfqrXEdQWjg1gliQ108+rXb0Mt7ySECBvGQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.der
index 2fb870cdb98c73..88962ab338dbeb 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.pem
index 25dea6737c5522..b84a125060c0b4 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMrNNr5U06vpShkgvo238Rh1P/a+fZkItqVrl+mGfgZhoAoGCCqGSM49
-AwEHoUQDQgAE/Vu3bhuXyVYUlxertg8CFE1O4KU8jRqKQ0YQ+u5/xguGlCmeMc69
-cWH0Lfq0Ec1ZYhGRYjy2lz1rzBvIutcBUg==
+MHcCAQEEIO0r9lASoqB2hIiQ319dSGGXCxeO621l/Tve38mTrMbRoAoGCCqGSM49
+AwEHoUQDQgAEdt7JYuWQQADNnye/I0vrRfTEp4xTk3+45HOJpPaMKVTcp48BZfGQ
+AVybDk/EWFXz/9HTTjfvzbU1yW7bgwY4Gw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.der
index f19fb3d762657a..6e60f292d90a94 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.pem
index 8969d647085153..b7d8abd50452b6 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIeA5sd2rLpNgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIICY6WhoIEm/IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABBkNJHCvZ1I4e44JUjm/KuubWAR2KbIuO0wcz7FW5CFYiHS6VHXg7MhS0JaZ
-F6/SQPURdfBbLkCY1QVi4d4y6nmjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR5mHHTvrLU0CjLejzz0N6JRKgEGDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBK
-7AwliyMxaaOaJo5Ks2FuKNP6GuzkFO1w80rFm6YD5AIhALUe2mKzEYA0vucsd6ya
-FTk7WQba529Vea7u5KmZM8WC
+A0IABCsihQWcQUnA41CJ9kDWDn5vxl3YJGm8GpuTG1B8DtmgPHTy9ihUp3mNiTTw
+zNooLLugWWsGaK3QlOciNQyQLg6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjFij0mb8AmGEK0rX3o+neE9LvpjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBr
+UeCv/URi169JheJ8zyChW6pLi4s9Lf96h5RBl5fXfAIhAIbLWFxa88CTcPQINgs/
+bRP20JAhrli8OrVa8DXleF+b
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.der
index 9abe48c9c1ab07..33948e58edf1b3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.pem
index ab0c5bbfd81931..61ce86d335c9d6 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHQ8b60fZ3mpERzSeX3HIGaL9XmEDh77UCSiP9pH60dxoAoGCCqGSM49
-AwEHoUQDQgAEGQ0kcK9nUjh7jglSOb8q65tYBHYpsi47TBzPsVbkIViIdLpUdeDs
-yFLQlpkXr9JA9RF18FsuQJjVBWLh3jLqeQ==
+MHcCAQEEIDV6kc1U5O0EV0PFUXHzlZ0BFhQXA9Ue7AQDvKZjiK4+oAoGCCqGSM49
+AwEHoUQDQgAEKyKFBZxBScDjUIn2QNYOfm/GXdgkabwam5MbUHwO2aA8dPL2KFSn
+eY2JNPDM2igsu6BZawZordCU5yI1DJAuDg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/test_case_vector.json
index cc89c4a49684a7..5986030ae10785 100644
--- a/credentials/development/commissioner_dut/struct_dac_cert_version_v3/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_cert_version_v3/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Valid certificate version field set to v3(2)",
     "is_success_case": "true",
-    "dac_cert": "308201cf30820174a00302010202080890313eb3ff7f3a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fd5bb76e1b97c956149717abb60f02144d4ee0a53c8d1a8a434610faee7fc60b8694299e31cebd7161f42dfab411cd59621191623cb6973d6bcc1bc8bad70152a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604145a6b3a02c0031141e2a59cd00dc4080a5b8df9bc301f0603551d23041830168014799871d3beb2d4d028cb7a3cf3d0de8944a80418300a06082a8648ce3d0403020349003046022100bc17a8cd0bfde0770d46f64e1118e52b42e44ede72534bbf81b3c69803ad0ae4022100fa61cdad9ef077ee4219744c57a464280630b152282776b698e3e9a8c46ff1ba",
-    "pai_cert": "308201be30820164a0030201020208780e6c776acba4d8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004190d2470af6752387b8e095239bf2aeb9b58047629b22e3b4c1ccfb156e421588874ba5475e0ecc852d0969917afd240f51175f05b2e4098d50562e1de32ea79a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414799871d3beb2d4d028cb7a3cf3d0de8944a80418301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204aec0c258b233169a39a268e4ab3616e28d3fa1aece414ed70f34ac59ba603e4022100b51eda62b3118034bee72c77ac9a15393b5906dae76f5579aeeee4a99933c582",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221008c99c06117c74a180d7be68abf26aa552bf853cb603d9e8969721317d4da209e02210086b9f84da153f87185fa7876d4d779f58009b8180eb03d0aaf3e677a2a879931",
-    "dac_private_key": "cacd36be54d3abe94a1920be8db7f118753ff6be7d9908b6a56b97e9867e0661",
-    "dac_public_key": "04fd5bb76e1b97c956149717abb60f02144d4ee0a53c8d1a8a434610faee7fc60b8694299e31cebd7161f42dfab411cd59621191623cb6973d6bcc1bc8bad70152"
+    "dac_cert": "308201ce30820174a00302010202081908efc4bf218221300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000476dec962e5904000cd9f27bf234beb45f4c4a78c53937fb8e47389a4f68c2954dca78f0165f190015c9b0e4fc45855f3ffd1d34e37efcdb535c96edb8306381ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f1be91588378dcd745b2988757ce15d0ad9471b6301f0603551d23041830168014e31628f499bf0098610ad2b5f7a3e9de13d2efa6300a06082a8648ce3d04030203480030450221008603cd3f9dcc7778233d641b3182dd661d799179a0fc955525960bd0d4d898dc0220498a12f7160b037eaad711d4168e0d60962435d3cfab5dbd0cb7bc9210206f19",
+    "pai_cert": "308201be30820164a0030201020208098e968682049bf2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042b2285059c4149c0e35089f640d60e7e6fc65dd82469bc1a9b931b507c0ed9a03c74f2f62854a7798d8934f0ccda282cbba0596b0668add094e722350c902e0ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414e31628f499bf0098610ad2b5f7a3e9de13d2efa6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502206b51e0affd4462d7af4985e27ccf20a15baa4b8b8b3d2dff7a8794419797d77c02210086cb585c5af3c09370f408360b3f6d13f6d09021ae58bc3ab55af035e5785f9b",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502202ef313c5feb221f1eddd34a97ea43444f9a86f97909e45dd05ec421e7fc3e965022100fdc7b7f459c983863a90cf590db765da9db6f9c83310536770fd3e12b14b78cc",
+    "dac_private_key": "ed2bf65012a2a076848890df5f5d4861970b178eeb6d65fd3bdedfc993acc6d1",
+    "dac_public_key": "0476dec962e5904000cd9f27bf234beb45f4c4a78c53937fb8e47389a4f68c2954dca78f0165f190015c9b0e4fc45855f3ffd1d34e37efcdb535c96edb8306381b"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/cd.der
index 94924eb929da83..9edd0bef241634 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.der
index f45acf319085da..64984c652dd734 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.pem
index 3e18a0c09e06eb..356d22f79c36b9 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Cert.pem
@@ -1,11 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBrDCCAVOgAwIBAgIIVYg89ltBhgIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBrjCCAVOgAwIBAgIIS2ysyijy048wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARdCGRCnWhq6WD1hXzfTvR8Qp82Lw4v
-SOlqnTYqgsURkcCgEsqxR3fJNQvPSJyRLQIHONsM8tIcSbr6HTJXEHDNoz8wPTAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUV9UK5wiT6TgF
-BpMVZaR4XnDBwrYwCgYIKoZIzj0EAwIDRwAwRAIgefWv48b2Ju5d2vnbiMqNsRik
-/WR2USVc+uA1fHnM9r0CIDH0wvVCiCAL68ajWdI3nNUUWhLZHT421ruLhYrZLDnw
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQNZ46ry20uyv/UhXfsfWzjLO5/u4P9
+iKAmHbSKMRykREIg1AZdmmN7aAFGtRtYquuVE5HmLUttnmsWUkGNrvO7oz8wPTAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU7fb3AKzuicMB
+gbUs3HzgNYhsWPwwCgYIKoZIzj0EAwIDSQAwRgIhAOOd52RLxsffK+5upne+Qw7F
+Uetr5Gb8Mqgyc7Xegr6qAiEAmJCv8W1Loh8eSChr6Qtw43ox9ea5baJTx2L+EebH
+5g8=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.der
index e9f14f18337d11..4b1199ecd03799 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.pem
index 8d7ec5c01dcf85..b1c49d1ba47d09 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOyB25CKBQyU/r3pvCVAYYRy417t2F1VCG8TbVWcmM4SoAoGCCqGSM49
-AwEHoUQDQgAEXQhkQp1oaulg9YV83070fEKfNi8OL0jpap02KoLFEZHAoBLKsUd3
-yTULz0ickS0CBzjbDPLSHEm6+h0yVxBwzQ==
+MHcCAQEEIDbZJt4CafLXz1TSynQmO0nnVO034ESjGHvBYcLyhvy0oAoGCCqGSM49
+AwEHoUQDQgAEDWeOq8ttLsr/1IV37H1s4yzuf7uD/YigJh20ijEcpERCINQGXZpj
+e2gBRrUbWKrrlROR5i1LbZ5rFlJBja7zuw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.der
index 5b8388ba9326a9..7d4661f6d66c0f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.pem
index dedeeb52cb4725..541efe80054c14 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIVWLE8NYmDWAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvTCCAWSgAwIBAgIIQirEcEdWZ4owCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABG5LJPaqyvTKTUm9yTU72Nbx3jjPMuFSQ/86GjptioVvFmUBFNOiEiEERm67
-bKImsZr14zkRb6ZlGCdIOdt25majZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSPXdYtA2hsAY2XmCyIQZm7AKs7gjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiB7
-YfTP6Tg+ZTK7Bm2l85/IuMv3G/Uxt3EPTs3XnATAIQIgGKW37sd6bPk11GLd8c3p
-zmgRnoQC1Vmvn9wHB1jpYMk=
+A0IABD1jgptlGQaDTYgDzKP3J1oZsBB1iOzQLv0VqQ6slLy1bdx8pT+QvWxjegKw
+gfom7xSxYwhwP/4iEg7Y04sVXryjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQcs0aWFmMICjZsB+Xakybstdg5PDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBU
+gW/xazo8ao+/toxxIe1QTw2MmCDjLl0KAa2bAdUjawIgdISRqCDMOb5N2l13czCb
+TzdZVSpdo1jr42hOmGMg+sE=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.der
index 94db86cf89752e..48742ce10ef128 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.pem
index 87750d1c80c95c..f02d617bb48181 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAiT5hbAK1x/sZe6byERRuNdqvmFyFihFdoK0SiJaZEjoAoGCCqGSM49
-AwEHoUQDQgAEbksk9qrK9MpNSb3JNTvY1vHeOM8y4VJD/zoaOm2KhW8WZQEU06IS
-IQRGbrtsoiaxmvXjORFvpmUYJ0g523bmZg==
+MHcCAQEEIB6dA9caZ8ZpG9ZzZx9UOKLZLnxixftzyRezALZuIHqAoAoGCCqGSM49
+AwEHoUQDQgAEPWOCm2UZBoNNiAPMo/cnWhmwEHWI7NAu/RWpDqyUvLVt3HylP5C9
+bGN6ArCB+ibvFLFjCHA//iISDtjTixVevA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/test_case_vector.json
index e7caa73e4c2087..58210e49605c04 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate doesn't include Authority Key ID (AKID) extension",
     "is_success_case": "false",
-    "dac_cert": "308201ac30820153a003020102020855883cf65b418602300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045d0864429d686ae960f5857cdf4ef47c429f362f0e2f48e96a9d362a82c51191c0a012cab14777c9350bcf489c912d020738db0cf2d21c49bafa1d32571070cda33f303d300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041457d50ae70893e9380506931565a4785e70c1c2b6300a06082a8648ce3d0403020347003044022079f5afe3c6f626ee5ddaf9db88ca8db118a4fd647651255cfae0357c79ccf6bd022031f4c2f54288200bebc6a359d2379cd5145a12d91d3e36d6bb8b858ad92c39f0",
-    "pai_cert": "308201bd30820164a00302010202085562c4f0d6260d60300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200046e4b24f6aacaf4ca4d49bdc9353bd8d6f1de38cf32e15243ff3a1a3a6d8a856f16650114d3a2122104466ebb6ca226b19af5e339116fa66518274839db76e666a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148f5dd62d03686c018d97982c884199bb00ab3b82301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207b61f4cfe9383e6532bb066da5f39fc8b8cbf71bf531b7710f4ecdd79c04c021022018a5b7eec77a6cf935d462ddf1cde9ce68119e8402d559af9fdc070758e960c9",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c16e6a810773e669ccd301ee9b8e37ff5dc94c7ed1f88e2ab7b47209a3fa4e8302210089c9c70829ca2a43907c9a461debecfcdd3cf2cc6a7e1a292d71014f1f20d5ac",
-    "dac_private_key": "ec81db908a050c94febde9bc2540618472e35eedd85d55086f136d559c98ce12",
-    "dac_public_key": "045d0864429d686ae960f5857cdf4ef47c429f362f0e2f48e96a9d362a82c51191c0a012cab14777c9350bcf489c912d020738db0cf2d21c49bafa1d32571070cd"
+    "dac_cert": "308201ae30820153a00302010202084b6cacca28f2d38f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040d678eabcb6d2ecaffd48577ec7d6ce32cee7fbb83fd88a0261db48a311ca4444220d4065d9a637b680146b51b58aaeb951391e62d4b6d9e6b1652418daef3bba33f303d300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414edf6f700acee89c30181b52cdc7ce035886c58fc300a06082a8648ce3d0403020349003046022100e39de7644bc6c7df2bee6ea677be430ec551eb6be466fc32a83273b5de82beaa0221009890aff16d4ba21f1e48286be90b70e37a31f5e6b96da253c762fe11e6c7e60f",
+    "pai_cert": "308201bd30820164a0030201020208422ac4704756678a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200043d63829b651906834d8803cca3f7275a19b0107588ecd02efd15a90eac94bcb56ddc7ca53f90bd6c637a02b081fa26ef14b16308703ffe22120ed8d38b155ebca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141cb346961663080a366c07e5da9326ecb5d8393c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022054816ff16b3a3c6a8fbfb68c7121ed504f0d8c9820e32e5d0a01ad9b01d5236b0220748491a820cc39be4dda5d7773309b4f3759552a5da358ebe3684e986320fac1",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d94c50f3261628f77100cea34594e5b67acbefaa7e3ada07a5f74079bfd19203022100d96e258ae4ccc2bcc8bcf51537756e4e36046339f01e149bbe873129ea7af420",
+    "dac_private_key": "36d926de0269f2d7cf54d2ca74263b49e754ed37e044a3187bc161c2f286fcb4",
+    "dac_public_key": "040d678eabcb6d2ecaffd48577ec7d6ce32cee7fbb83fd88a0261db48a311ca4444220d4065d9a637b680146b51b58aaeb951391e62d4b6d9e6b1652418daef3bb"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/cd.der
index c47125dcf981e5..e123ae353be510 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.der
index 781efc23a97355..d5716d38487779 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.pem
index 2dc4ee0bd259db..d1f9b817818af0 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICBzCCAaygAwIBAgIILwJUrVSiHwkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIICBjCCAaygAwIBAgIIDwrbdQ1Y1pAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASUXPmld4Fl9lZgshv63Df/LmtjQNkz
-hyIXy4v9JhSJ9Gc2IJhBu1d5XF8HjhVssVATTMHDnpyiACNE5GToJZp4o4GXMIGU
-MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBROQjz/cGho
-B6HDHYwRzRmaZuiSzDAfBgNVHSMEGDAWgBSdt5KmEWBtitfLRQfYZ1gdR+OzjDA0
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR80Lx65BliKQgUPn3UTlghD2D0D5AV
+O4UBRA2e8cCZjAQsBuwtMV/7/xYb82nx4nmKQcMnTrAk+Se+xgGeEVvdo4GXMIGU
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTLc4F+i1E0
+iQkB9kr7mUfuwEG6uDAfBgNVHSMEGDAWgBREO6957SzorBIb4yLFkWltfEiMzDA0
 BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmV4YW1wbGUu
-Y29tLzAKBggqhkjOPQQDAgNJADBGAiEA3AECM2iYa+FUdqI0EIX31iOszjXPli+7
-1vd9/yUzMBcCIQCubK+Aci7wgu5jMbJPREvvWfKVW9NcXaaq1LS7cce9+w==
+Y29tLzAKBggqhkjOPQQDAgNIADBFAiAuEGVhdiCkzVL+apW+5efpO3MfdcXGDi9s
+SVUz40qT5AIhAJD84z/5IRabXpD4FRbxBYP324YQgmUeysA1unj5qqSp
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.der
index 12c439dfb23176..256798bd8d2d32 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.pem
index b09b89b0f8489b..d34838b4a8a807 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBDEGxc4/J+Z2C0ORqr3YWv1l7F8zeFGf67ucqiuMU8MoAoGCCqGSM49
-AwEHoUQDQgAElFz5pXeBZfZWYLIb+tw3/y5rY0DZM4ciF8uL/SYUifRnNiCYQbtX
-eVxfB44VbLFQE0zBw56cogAjRORk6CWaeA==
+MHcCAQEEIJ0CmTG8FvZspT3ZZWdXrHwkkri983ZvkVRMdQgud2/AoAoGCCqGSM49
+AwEHoUQDQgAEfNC8euQZYikIFD591E5YIQ9g9A+QFTuFAUQNnvHAmYwELAbsLTFf
++/8WG/Np8eJ5ikHDJ06wJPknvsYBnhFb3Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.der
index dd719edf35fd91..7eab1a07a9276f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.pem
index ac03a419dac477..f1ca02cfb4cd7e 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIR+YomzkbdZcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvTCCAWSgAwIBAgIIKrnBOeNpf4EwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABPgdEwRy3308d7AqkJ/AuTmxuy3cLN/MIJ0YdIIFDsC2H7G2+QNM2VH9ho5m
-9uBQ29kYr662BHKQ2k5QmXNIWYyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSdt5KmEWBtitfLRQfYZ1gdR+OzjDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAF
-mJLl80vk843e5EG0WPLbWbqrqbSla23NQKTrfc0R5QIhAKbfHxqywDjfHq3PnbbH
-Zknb3lhgUzttWwABGZnd58jy
+A0IABDg7vdXvv0ORhNuUd5vIhy5hMCnuJBydoShwoobBoimuQAVjOMdd4H1TiXNp
+L6UTx/3lwtNccmFEEVY7CoLrQHSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBREO6957SzorBIb4yLFkWltfEiMzDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAu
+nLaCEUD/Q1J5XvUuO5XJfqg2CoQFhVvHQ5+wDrIsUAIgXb8NBPnXQRhGfmVC1Z4Z
+Qy6CS9Gpv7PYgl+tkYijKmI=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.der
index c2d6e800aa19a9..389b0888b2b6e3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.pem
index 78f73e79b35506..a4e1846a8ef233 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOzet/glGWaDi4EDee8lM8yE1cHgn8wh88dzkcBPMwx/oAoGCCqGSM49
-AwEHoUQDQgAE+B0TBHLffTx3sCqQn8C5ObG7Ldws38wgnRh0ggUOwLYfsbb5A0zZ
-Uf2Gjmb24FDb2RivrrYEcpDaTlCZc0hZjA==
+MHcCAQEEIG3m/7vHQdnSeZJudOi5FIo0j2cYCUxv3IQmjpm6JoRCoAoGCCqGSM49
+AwEHoUQDQgAEODu91e+/Q5GE25R3m8iHLmEwKe4kHJ2hKHCihsGiKa5ABWM4x13g
+fVOJc2kvpRPH/eXC01xyYUQRVjsKgutAdA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/test_case_vector.json
index 314004bb37475f..3438843c7872dd 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_authority_info_access_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate includes optional Authority Information Access extension",
     "is_success_case": "true",
-    "dac_cert": "30820207308201aca00302010202082f0254ad54a21f09300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004945cf9a5778165f65660b21bfadc37ff2e6b6340d933872217cb8bfd261489f46736209841bb57795c5f078e156cb150134cc1c39e9ca2002344e464e8259a78a38197308194300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144e423cff70686807a1c31d8c11cd199a66e892cc301f0603551d230418301680149db792a611606d8ad7cb4507d867581d47e3b38c303406082b0601050507010104283026302406082b060105050730018618687474703a2f2f6f6373702e6578616d706c652e636f6d2f300a06082a8648ce3d0403020349003046022100dc01023368986be15476a2341085f7d623acce35cf962fbbd6f77dff25333017022100ae6caf80722ef082ee6331b24f444bef59f2955bd35c5da6aad4b4bb71c7bdfb",
-    "pai_cert": "308201be30820164a003020102020847e6289b391b7597300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f81d130472df7d3c77b02a909fc0b939b1bb2ddc2cdfcc209d187482050ec0b61fb1b6f9034cd951fd868e66f6e050dbd918afaeb6047290da4e50997348598ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604149db792a611606d8ad7cb4507d867581d47e3b38c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220059892e5f34be4f38ddee441b458f2db59baaba9b4a56b6dcd40a4eb7dcd11e5022100a6df1f1ab2c038df1eadcf9db6c76649dbde5860533b6d5b00011999dde7c8f2",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ae3b7824e980e6c00453ca1bb12b1cbe06e34afa33481586e34a7fd4b6d8be2a022020cb829d5c1942faca77c3bb3393b5b4f9ff6873659c6635124a4f7235b5b808",
-    "dac_private_key": "10c41b1738fc9f99d82d0e46aaf7616bf597b17ccde1467faeee72a8ae314f0c",
-    "dac_public_key": "04945cf9a5778165f65660b21bfadc37ff2e6b6340d933872217cb8bfd261489f46736209841bb57795c5f078e156cb150134cc1c39e9ca2002344e464e8259a78"
+    "dac_cert": "30820206308201aca00302010202080f0adb750d58d690300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047cd0bc7ae419622908143e7dd44e58210f60f40f90153b8501440d9ef1c0998c042c06ec2d315ffbff161bf369f1e2798a41c3274eb024f927bec6019e115bdda38197308194300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cb73817e8b5134890901f64afb9947eec041bab8301f0603551d23041830168014443baf79ed2ce8ac121be322c591696d7c488ccc303406082b0601050507010104283026302406082b060105050730018618687474703a2f2f6f6373702e6578616d706c652e636f6d2f300a06082a8648ce3d040302034800304502202e1065617620a4cd52fe6a95bee5e7e93b731f75c5c60e2f6c495533e34a93e402210090fce33ff921169b5e90f81516f10583f7db861082651ecac035ba78f9aaa4a9",
+    "pai_cert": "308201bd30820164a00302010202082ab9c139e3697f81300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004383bbdd5efbf439184db94779bc8872e613029ee241c9da12870a286c1a229ae40056338c75de07d538973692fa513c7fde5c2d35c72614411563b0a82eb4074a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414443baf79ed2ce8ac121be322c591696d7c488ccc301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402202e9cb6821140ff4352795ef52e3b95c97ea8360a8405855bc7439fb00eb22c5002205dbf0d04f9d74118467e6542d59e19432e824bd1a9bfb3d8825fad9188a32a62",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100a4978fe543e824a18c9a3c3f54ebd419893b4e4a22abdabcdc3fd6dce32869e3022100e22b532c829406ce468c0206c1b995a30801cb8a52b70b9278055c6f868e6930",
+    "dac_private_key": "9d029931bc16f66ca53dd9656757ac7c2492b8bdf3766f91544c75082e776fc0",
+    "dac_public_key": "047cd0bc7ae419622908143e7dd44e58210f60f40f90153b8501440d9ef1c0998c042c06ec2d315ffbff161bf369f1e2798a41c3274eb024f927bec6019e115bdd"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/cd.der
index 4cd64789aca510..4a603fef515b88 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.der
index 4d61c67154f81a..d5d93673234846 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.pem
index 2f19ea8c95f5cd..7ad149f5031520 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0jCCAXegAwIBAgIIHM+1x4oQaBEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0TCCAXegAwIBAgIIKolyP21ogmowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARG3y/2jZ9ygg3ZDdWsypx+ImMT1bL+
-CbCLTsRAoPd9/6H24hgRdhoxbFLOCF00QHu6mmDvblBLMD8CjFwJdqpao2MwYTAP
-BgNVHRMBAf8EBTADAgEAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUde/udeQe
-vlI2Zlj3pzrKLwmgPTwwHwYDVR0jBBgwFoAUzFKQJHx/BAY3nw/zVCcDFoAot68w
-CgYIKoZIzj0EAwIDSQAwRgIhAMeGa5cxsjtnA1BnZT89NWdtAStfJGTuSEotweXP
-84PwAiEAoq2+yK45WKiWTNkLx0YSFF8YZV3Cyt4j18a4h5tz80g=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASoWTsOuVmSUpS3lJBDNfsuGJBXcDOu
+6uI9GWEYWCwuaxznFlE1u5L0QW5ngesRaUWfpP1LNlIe+NSo9rnKK45Bo2MwYTAP
+BgNVHRMBAf8EBTADAgEAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUiyel/dbS
+IVkZC+/Af6wS3hwzGiQwHwYDVR0jBBgwFoAUBGR8TOq4JzHmPVpyIto2rWwoTsgw
+CgYIKoZIzj0EAwIDSAAwRQIgY7r53Ft/tyD8TkmugOZizmSDSXlFPdpBllw7OWCx
+HA0CIQCqbTyTGn1bHaQeVxYSfOt2LKTBdX9ya304L10FYCZpxQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.der
index d68aa345744421..eb099ba2d6bb7f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.pem
index ea6ffcb711a443..05c1e130f44a74 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDA48/R2A3SsjXAO/+kPOuzgC9+gb8G4nij5qCDMp2OqoAoGCCqGSM49
-AwEHoUQDQgAERt8v9o2fcoIN2Q3VrMqcfiJjE9Wy/gmwi07EQKD3ff+h9uIYEXYa
-MWxSzghdNEB7uppg725QSzA/AoxcCXaqWg==
+MHcCAQEEIMAqfDkpgwiEVWXTSRbRi3/jAUncqGwxEFHoEfndQLYvoAoGCCqGSM49
+AwEHoUQDQgAEqFk7DrlZklKUt5SQQzX7LhiQV3AzruriPRlhGFgsLmsc5xZRNbuS
+9EFuZ4HrEWlFn6T9SzZSHvjUqPa5yiuOQQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.der
index 27dcfd8130d63d..3f7638b4c84458 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.pem
index c9728d3e52f8c3..45ac3c9a47ed3a 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIF2W5cF8wxR4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIFdyS6185ppUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABEMfCeWkqmW8aQ4CCMoVhi08kVxTsqdexG6yYYU5RV2e0lYxNnGFolJNn+GG
-gbCuz14lWTe+rIcOgZu6LKZCQJujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTMUpAkfH8EBjefD/NUJwMWgCi3rzAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-4C5fZawiJyZT/NN+7VreIc4lAfJP3LidROkilu8eGZMCIQDUbjaVcUISEm6+Xdsb
-efFlDIMNgECHyEEn1Z4uIWnmpw==
+A0IABBntSQWpDNHquSuXT+7M2oFuPDVW9Gex/XZRWoi60XOQC4XqAny+dVtvXVjM
+QVt/v7GduGvesKvF+9KiyHg6mZyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQEZHxM6rgnMeY9WnIi2jatbChOyDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiB4
+WfVCcTwqDnVpg7SoYIZFBFbUjTidH/MdCu2L76IwxwIhAK+jCE/13SH/PLFO+cpX
+rvoYLNlfpz1B88W5qttqi+Lm
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.der
index 14a16352ad5abb..a58116fb61f92e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.pem
index 6cc33b3cc3f74d..7152666090d573 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEII94hAL6ZY5SYpILGWu+tviBE8c/wVs+OT1oL4cznmN4oAoGCCqGSM49
-AwEHoUQDQgAEQx8J5aSqZbxpDgIIyhWGLTyRXFOyp17EbrJhhTlFXZ7SVjE2cYWi
-Uk2f4YaBsK7PXiVZN76shw6Bm7ospkJAmw==
+MHcCAQEEIP7cdoBjqoxcIenLCnXTJrB7WvjA1mJeApRBMaOCY7zxoAoGCCqGSM49
+AwEHoUQDQgAEGe1JBakM0eq5K5dP7szagW48NVb0Z7H9dlFaiLrRc5ALheoCfL51
+W29dWMxBW3+/sZ24a96wq8X70qLIeDqZnA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/test_case_vector.json
index 5dd8d94b7fa5bc..3b4c95122e1235 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension CA field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201d230820177a00302010202081ccfb5c78a106811300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000446df2ff68d9f72820dd90dd5acca9c7e226313d5b2fe09b08b4ec440a0f77dffa1f6e21811761a316c52ce085d34407bba9a60ef6e504b303f028c5c0976aa5aa3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020780301d0603551d0e0416041475efee75e41ebe52366658f7a73aca2f09a03d3c301f0603551d23041830168014cc5290247c7f0406379f0ff3542703168028b7af300a06082a8648ce3d0403020349003046022100c7866b9731b23b67035067653f3d35676d012b5f2464ee484a2dc1e5cff383f0022100a2adbec8ae3958a8964cd90bc74612145f18655dc2cade23d7c6b8879b73f348",
-    "pai_cert": "308201bf30820164a00302010202081765b9705f30c51e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004431f09e5a4aa65bc690e0208ca15862d3c915c53b2a75ec46eb2618539455d9ed25631367185a2524d9fe18681b0aecf5e255937beac870e819bba2ca642409ba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414cc5290247c7f0406379f0ff3542703168028b7af301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100e02e5f65ac22272653fcd37eed5ade21ce2501f24fdcb89d44e92296ef1e1993022100d46e3695714212126ebe5ddb1b79f1650c830d804087c84127d59e2e2169e6a7",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201e3834e2e4fffbf3e1fd9056a76e64cc69e10471ab11c9ec20b6eed1bb765097022100ddddbce8c76cf6574c9c0f0734693a15a5c07b05a68b997ef673901c86a1d975",
-    "dac_private_key": "3038f3f4760374ac8d700effe90f3aece00bdfa06fc1b89e28f9a820cca763aa",
-    "dac_public_key": "0446df2ff68d9f72820dd90dd5acca9c7e226313d5b2fe09b08b4ec440a0f77dffa1f6e21811761a316c52ce085d34407bba9a60ef6e504b303f028c5c0976aa5a"
+    "dac_cert": "308201d130820177a00302010202082a89723f6d68826a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a8593b0eb959925294b794904335fb2e1890577033aeeae23d196118582c2e6b1ce7165135bb92f4416e6781eb1169459fa4fd4b36521ef8d4a8f6b9ca2b8e41a3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020780301d0603551d0e041604148b27a5fdd6d22159190befc07fac12de1c331a24301f0603551d2304183016801404647c4ceab82731e63d5a7222da36ad6c284ec8300a06082a8648ce3d0403020348003045022063baf9dc5b7fb720fc4e49ae80e662ce64834979453dda41965c3b3960b11c0d022100aa6d3c931a7d5b1da41e5716127ceb762ca4c1757f726b7d382f5d05602669c5",
+    "pai_cert": "308201be30820164a003020102020815dc92eb5f39a695300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000419ed4905a90cd1eab92b974feeccda816e3c3556f467b1fd76515a88bad173900b85ea027cbe755b6f5d58cc415b7fbfb19db86bdeb0abc5fbd2a2c8783a999ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041404647c4ceab82731e63d5a7222da36ad6c284ec8301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207859f542713c2a0e756983b4a86086450456d48d389d1ff31d0aed8befa230c7022100afa3084ff5dd21ff3cb14ef9ca57aefa182cd95fa73d41f3c5b9aadb6a8be2e6",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502207582b5c46b19b264491a5bf4ea91dcba332fd38777c09255c71b16261127f96d02210080f3dab3e24ebb6e37586c3213e3d8227d7b72895188addc678548e09ff055de",
+    "dac_private_key": "c02a7c39298308845565d34916d18b7fe30149dca86c311051e811f9dd40b62f",
+    "dac_public_key": "04a8593b0eb959925294b794904335fb2e1890577033aeeae23d196118582c2e6b1ce7165135bb92f4416e6781eb1169459fa4fd4b36521ef8d4a8f6b9ca2b8e41"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/cd.der
index db82b28139c3d1..964d682853a464 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.der
index e039c377a9d417..9b3cfccd8f092a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.pem
index 63b2d589d49984..f1bf41c9d6ca48 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0DCCAXegAwIBAgIIYDv0govTSL4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0TCCAXegAwIBAgIIO1akPd0zZmcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ68mLdQUPLgiTxhiGYWU88Tvck5PCp
-XiOtAl3blSMLkWOTF02PaQaCo7mFnUPtJG7Pln07JuHrcyMw9zqLiGx2o2MwYTAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUJ/7vyorp
-L55iy13xkTelvmt7acAwHwYDVR0jBBgwFoAUZR7kiMphwM7KNzyWEMyuq2jx6lUw
-CgYIKoZIzj0EAwIDRwAwRAIgSuayLoaQvR/R+nPrIu3Sr1dpbbgKon85NstW4yWg
-1YwCIFjJ9awIf8QHSbsVYWD64I8WtKqSuZw4bp3xu/VG2WHg
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARFtLK+R+2bJg3LPnCDti2CamXXmPUX
+ParkN9Q6ROvEcc36b3clkmJkMEGTZSLw7DXISj65WJ7ZUnnrqa+o2Bu9o2MwYTAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU2g53CqUV
+FL4jWEK6NElIZ/CofTUwHwYDVR0jBBgwFoAUXSJ7evI4nfzwOL4FnQOohF+llY4w
+CgYIKoZIzj0EAwIDSAAwRQIhAPTRbARcO5SqRLRRX/4NsK8AOi7fmHQsFhQBuxIj
+pq7nAiAjqX/8HXJwQSLsA26UBLeaNj0lvZ3XXhQgvKsz5yTE1w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.der
index d2239e2cba4e40..8aad6549035e18 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.pem
index b053f024d055bf..5decc5c080dd51 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAmocsUjI9+ewP/5DUMbd3CJiM8TNPP2p+BRj17o+cdBoAoGCCqGSM49
-AwEHoUQDQgAEOvJi3UFDy4Ik8YYhmFlPPE73JOTwqV4jrQJd25UjC5FjkxdNj2kG
-gqO5hZ1D7SRuz5Z9Oybh63MjMPc6i4hsdg==
+MHcCAQEEIAtpN4OjwV4awO2yKF2N/ZyGLYLkcIxCD2Bx54oaluz+oAoGCCqGSM49
+AwEHoUQDQgAERbSyvkftmyYNyz5wg7Ytgmpl15j1Fz2q5DfUOkTrxHHN+m93JZJi
+ZDBBk2Ui8Ow1yEo+uVie2VJ566mvqNgbvQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.der
index 09b153a5030190..afa6e3cff1a72b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.pem
index 200255027a4e33..b56b0286b49e9b 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIMf3KCOuLkoUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIOZzJkACQYKMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABO1zteIvYZQunR+a3zyrKJTlDtVWAsogrRXzhJLnQTqDDmo425/sxUQ3FvKu
-ulx4NnWXKA2v2Gy2dpoBAuvmNsqjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlHuSIymHAzso3PJYQzK6raPHqVTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-gkrpA/ghgf5oVtgQ4TktcrDFAb/BDoeJlkELc0RLdW0CIQDV6PSD9cAVaAi01PEe
-gdFk+LXsf+e6yiU4gqYqjY4i/A==
+A0IABDYyP/uUAXm3eV8o97B3fV6SyKuPwlji+rXv19wJVAIRHE2atgqbO812H/DJ
+fqiMOUkafhEO+yFnQHoMHZXq+V2jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRdInt68jid/PA4vgWdA6iEX6WVjjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAD
+i3hcLYoeITZguGDXgbSXlDmahSuzA/W7s0xeayR8xgIhAOY7o37LcvEPjLAQdZI6
+PwBoCP+Ez4uMmX2mV9fhpuPw
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.der
index 8d5855b8df9899..571794d0b34f47 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.pem
index 41ee7eab9f4cf5..8c7db4dc88c010 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICwDKzfq/bE+PJ99AiHYhJiAe+AsDeFdiLnHp/1q6ZKSoAoGCCqGSM49
-AwEHoUQDQgAE7XO14i9hlC6dH5rfPKsolOUO1VYCyiCtFfOEkudBOoMOajjbn+zF
-RDcW8q66XHg2dZcoDa/YbLZ2mgEC6+Y2yg==
+MHcCAQEEIBQj8SFNvoKVJYQHJhJkndVvmA1QlGEnbfK7jfuT36qJoAoGCCqGSM49
+AwEHoUQDQgAENjI/+5QBebd5Xyj3sHd9XpLIq4/CWOL6te/X3AlUAhEcTZq2Cps7
+zXYf8Ml+qIw5SRp+EQ77IWdAegwdler5XQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/test_case_vector.json
index 7258c25f029245..c7911dec9b82f6 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension CA field is wrong (TRUE for DAC and FALSE for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201d030820177a0030201020208603bf4828bd348be300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043af262dd4143cb8224f1862198594f3c4ef724e4f0a95e23ad025ddb95230b916393174d8f690682a3b9859d43ed246ecf967d3b26e1eb732330f73a8b886c76a3633061300f0603551d130101ff040530030101ff300e0603551d0f0101ff040403020780301d0603551d0e0416041427feefca8ae92f9e62cb5df19137a5be6b7b69c0301f0603551d23041830168014651ee488ca61c0ceca373c9610ccaeab68f1ea55300a06082a8648ce3d040302034700304402204ae6b22e8690bd1fd1fa73eb22edd2af57696db80aa27f3936cb56e325a0d58c022058c9f5ac087fc40749bb156160fae08f16b4aa92b99c386e9df1bbf546d961e0",
-    "pai_cert": "308201bf30820164a003020102020831fdca08eb8b9285300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ed73b5e22f61942e9d1f9adf3cab2894e50ed55602ca20ad15f38492e7413a830e6a38db9fecc5443716f2aeba5c78367597280dafd86cb6769a0102ebe636caa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414651ee488ca61c0ceca373c9610ccaeab68f1ea55301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100824ae903f82181fe6856d810e1392d72b0c501bfc10e878996410b73444b756d022100d5e8f483f5c0156808b4d4f11e81d164f8b5ec7fe7baca253882a62a8d8e22fc",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502205b8a7e92c77a7c2a76aaa8797080eb2f44cfd9367ad29285325233fd79307ab3022100dc70ccffe0debdf2b82de33da69b66cbf62d04d801c3c4750ccbc168f8d21892",
-    "dac_private_key": "09a872c52323df9ec0fff90d431b77708988cf1334f3f6a7e0518f5ee8f9c741",
-    "dac_public_key": "043af262dd4143cb8224f1862198594f3c4ef724e4f0a95e23ad025ddb95230b916393174d8f690682a3b9859d43ed246ecf967d3b26e1eb732330f73a8b886c76"
+    "dac_cert": "308201d130820177a00302010202083b56a43ddd336667300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000445b4b2be47ed9b260dcb3e7083b62d826a65d798f5173daae437d43a44ebc471cdfa6f77259262643041936522f0ec35c84a3eb9589ed95279eba9afa8d81bbda3633061300f0603551d130101ff040530030101ff300e0603551d0f0101ff040403020780301d0603551d0e04160414da0e770aa51514be235842ba34494867f0a87d35301f0603551d230418301680145d227b7af2389dfcf038be059d03a8845fa5958e300a06082a8648ce3d0403020348003045022100f4d16c045c3b94aa44b4515ffe0db0af003a2edf98742c161401bb1223a6aee7022023a97ffc1d72704122ec036e9404b79a363d25bd9dd75e1420bcab33e724c4d7",
+    "pai_cert": "308201be30820164a0030201020208399cc990009060a3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000436323ffb940179b7795f28f7b0777d5e92c8ab8fc258e2fab5efd7dc095402111c4d9ab60a9b3bcd761ff0c97ea88c39491a7e110efb2167407a0c1d95eaf95da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145d227b7af2389dfcf038be059d03a8845fa5958e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220038b785c2d8a1e213660b860d781b49794399a852bb303f5bbb34c5e6b247cc6022100e63ba37ecb72f10f8cb01075923a3f006808ff84cf8b8c997da657d7e1a6e3f0",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022028cc0043c6f627c9aaef3441800fa99746c1a5728157df2aeb4946fc6c071ffe022100b03185ac043cbb929dcdb20274350c5290128b214027235e4b5480d3ee559e8c",
+    "dac_private_key": "0b693783a3c15e1ac0edb2285d8dfd9c862d82e4708c420f6071e78a1a96ecfe",
+    "dac_public_key": "0445b4b2be47ed9b260dcb3e7083b62d826a65d798f5173daae437d43a44ebc471cdfa6f77259262643041936522f0ec35c84a3eb9589ed95279eba9afa8d81bbd"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/cd.der
index c59aff0c1350cc..a4626258c62c14 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.der
index 57efdef8cf1370..4646a50cc7502a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.pem
index 373814c9a327ef..c7254418e1fbd1 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByjCCAXGgAwIBAgIIYUVqBat3UlIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIByzCCAXGgAwIBAgIIPDne5q1EP3gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR8didUZO1tRZKcTPCrwJdzUfj58tiO
-o7XRWQyeQpt3iPsQWko+6u7sWKREsB4JPu1KHI1NZvwxlTFmIqgOWKl1o10wWzAJ
-BgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUz0YnuNfwk364m4gW
-hLP/Y6HbgEgwHwYDVR0jBBgwFoAUrjChQeLZ/zXQGY9HKDyAftv45M4wCgYIKoZI
-zj0EAwIDRwAwRAIgF8RIXiTe6pR1YSsVrGAV6i6YLFyM44GQ46gXBxpJENECIGgZ
-/Db58vRH45/b42W17p9gQmLdcj42z0E7j9y0/GKm
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARdYZmRIK1zS8JMjD6akKhMtrUa8W4N
+N94mPK+vKNHZCbeYV20lqiTVYmvsHF0LTCZX4Ns5jJTQulT/5rlzQknPo10wWzAJ
+BgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUdHdw7zStMHygcJBm
+MfyyX8IkDmowHwYDVR0jBBgwFoAU3oCyTMVw0FvLVrMMPKlGEJcapZcwCgYIKoZI
+zj0EAwIDSAAwRQIhAOehso0eApqytLz7DxshKIvDe7JcVCNK+fXLKiuhMXT7AiBt
+pTW4nJUB56mafavwKYG2H+gYQfzaBP2PimdCHMW3sQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.der
index 398d4aa2f85d31..b889c91403ce3e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.pem
index ea6395d9481439..ee5064923df008 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGeDi47VKYxUpw97cwmhYgiNDsgZ4SjMk96194vN+zEkoAoGCCqGSM49
-AwEHoUQDQgAEfHYnVGTtbUWSnEzwq8CXc1H4+fLYjqO10VkMnkKbd4j7EFpKPuru
-7FikRLAeCT7tShyNTWb8MZUxZiKoDlipdQ==
+MHcCAQEEIAtbzd4frimRqH5m/Rk/s+7Em3u9Vtpia/9OUsrpUzcDoAoGCCqGSM49
+AwEHoUQDQgAEXWGZkSCtc0vCTIw+mpCoTLa1GvFuDTfeJjyvryjR2Qm3mFdtJaok
+1WJr7BxdC0wmV+DbOYyU0LpU/+a5c0JJzw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.der
index ebd1df89925686..7bd3501009ae80 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.pem
index d3fc04e37771aa..a6017a954cc9d5 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIekf5VYbSaokwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIdWaX0c6U9VQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABOeN9kH5SAM0yFVQYHv5h4fH9VySytxKrnrGl8mVZWKDL0Vup2eg5BAU5j+j
-HVrcDS50mgzqoA4odvM0VBQI+cSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSuMKFB4tn/NdAZj0coPIB+2/jkzjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-3pDq2EJc7E8UzoR/r03tYA9kJFiiPhxIox241dKZlsICIQCo9eJ7JDKTLlrCNSWB
-P5OMrrXezPcLLZ5isSTd69YjOQ==
+A0IABDQANYo732I2xD9NKjFQSbQ5yRKcnNAK9PUrALMoEsJn+8EXyvVoO2jrJSsB
+QwyYlrxJsVgVRtmq/0Zmw0nMmF+jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTegLJMxXDQW8tWsww8qUYQlxqllzAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+7IZdJmGmtppE70zXrXz3/a+m2CEw5n2jef6k1HfUDAgCIFjrSi6/uUC3Hwr6lfdh
+mpEefgUatEtd5pShgKFYx7EV
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.der
index fab553694693ba..35306a4d6adc94 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.pem
index ff5533f40ff024..f9db216776a6bb 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHacyaSktwlxCJv92ckRgnsQM6RGa5VxXCtRLVVr8n5DoAoGCCqGSM49
-AwEHoUQDQgAE5432QflIAzTIVVBge/mHh8f1XJLK3EquesaXyZVlYoMvRW6nZ6Dk
-EBTmP6MdWtwNLnSaDOqgDih28zRUFAj5xA==
+MHcCAQEEIH531Gb56at6uRXi1k4EdWruewvMw2u+lohgeLnd0TADoAoGCCqGSM49
+AwEHoUQDQgAENAA1ijvfYjbEP00qMVBJtDnJEpyc0Ar09SsAsygSwmf7wRfK9Wg7
+aOslKwFDDJiWvEmxWBVG2ar/RmbDScyYXw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/test_case_vector.json
index 2b3f53434d5f2d..18ddcb21e3562e 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension critical field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201ca30820171a003020102020861456a05ab775252300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047c76275464ed6d45929c4cf0abc0977351f8f9f2d88ea3b5d1590c9e429b7788fb105a4a3eeaeeec58a444b01e093eed4a1c8d4d66fc3195316622a80e58a975a35d305b30090603551d1304023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cf4627b8d7f0937eb89b881684b3ff63a1db8048301f0603551d23041830168014ae30a141e2d9ff35d0198f47283c807edbf8e4ce300a06082a8648ce3d0403020347003044022017c4485e24deea9475612b15ac6015ea2e982c5c8ce38190e3a817071a4910d102206819fc36f9f2f447e39fdbe365b5ee9f604262dd723e36cf413b8fdcb4fc62a6",
-    "pai_cert": "308201bf30820164a00302010202087a47f95586d26a89300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004e78df641f9480334c85550607bf98787c7f55c92cadc4aae7ac697c9956562832f456ea767a0e41014e63fa31d5adc0d2e749a0ceaa00e2876f334541408f9c4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ae30a141e2d9ff35d0198f47283c807edbf8e4ce301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100de90ead8425cec4f14ce847faf4ded600f642458a23e1c48a31db8d5d29996c2022100a8f5e27b2432932e5ac23525813f938caeb5deccf70b2d9e62b124ddebd62339",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100cd6f9b77b80ec9104183434625d7512e08438e45f76ff1f195a49a14e8ce9ce60220735f431410deaffbbaf82c09b7d94e66431889549a2c9ef1256e43e6fffec131",
-    "dac_private_key": "67838b8ed5298c54a70f7b7309a162088d0ec819e128cc93deb5f78bcdfb3124",
-    "dac_public_key": "047c76275464ed6d45929c4cf0abc0977351f8f9f2d88ea3b5d1590c9e429b7788fb105a4a3eeaeeec58a444b01e093eed4a1c8d4d66fc3195316622a80e58a975"
+    "dac_cert": "308201cb30820171a00302010202083c39dee6ad443f78300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045d61999120ad734bc24c8c3e9a90a84cb6b51af16e0d37de263cafaf28d1d909b798576d25aa24d5626bec1c5d0b4c2657e0db398c94d0ba54ffe6b9734249cfa35d305b30090603551d1304023000300e0603551d0f0101ff040403020780301d0603551d0e04160414747770ef34ad307ca070906631fcb25fc2240e6a301f0603551d23041830168014de80b24cc570d05bcb56b30c3ca94610971aa597300a06082a8648ce3d0403020348003045022100e7a1b28d1e029ab2b4bcfb0f1b21288bc37bb25c54234af9f5cb2a2ba13174fb02206da535b89c9501e7a99a7dabf02981b61fe81841fcda04fd8f8a67421cc5b7b1",
+    "pai_cert": "308201be30820164a0030201020208756697d1ce94f554300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200043400358a3bdf6236c43f4d2a315049b439c9129c9cd00af4f52b00b32812c267fbc117caf5683b68eb252b01430c9896bc49b1581546d9aaff4666c349cc985fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414de80b24cc570d05bcb56b30c3ca94610971aa597301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ec865d2661a6b69a44ef4cd7ad7cf7fdafa6d82130e67da379fea4d477d40c08022058eb4a2ebfb940b71f0afa95f7619a911e7e051ab44b5de694a180a158c7b115",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502202490a27b9cb1b226d0b0995ccbcb6512a24d34dc49892d7bd9c8394776061e2b022100de5cc2332376522eb1dfee5e6fc9cd5933e5b9770b2ea597289a211f4b66fd21",
+    "dac_private_key": "0b5bcdde1fae2991a87e66fd193fb3eec49b7bbd56da626bff4e52cae9533703",
+    "dac_public_key": "045d61999120ad734bc24c8c3e9a90a84cb6b51af16e0d37de263cafaf28d1d909b798576d25aa24d5626bec1c5d0b4c2657e0db398c94d0ba54ffe6b9734249cf"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/cd.der
index f47e6aa158939b..c64e348464d3b2 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.der
index d34c1b0842f702..5e96e6f06e4d42 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.pem
index 41ab8e21b18953..7695220ea77b2b 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByzCCAXGgAwIBAgIIeQ4VkymbXcIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIByzCCAXGgAwIBAgIIUdSl0Iyx+E0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATZzYl2shqWZeyK7/T17BHLaKE7jSjp
-gUf6I/a/RmqI9hMLqOsj/IbvLfucdY6P+wOW6+8Vu8C0MUAM7ul5Vweso10wWzAJ
-BgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUL2cIlHYXJrQ4O+F+
-b4xMm96GUvgwHwYDVR0jBBgwFoAUFpHmCYvYwP+0PkmFcs2aHLG71ogwCgYIKoZI
-zj0EAwIDSAAwRQIgLkXshsyfm0wy2GZwiiwZz7B/ru5JcvlJa8O0ftfSd/QCIQD1
-MsoKaZtNTruEmhEJ8Klib49rrvLFumCWvEPL+KicLA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASaqXU6MP88ZP0a0IfasNF63s5hgwHk
+Fp3FOu2wPG2+qoKza7RaM7sMKy6gQBFZXY2aYf5DGu0H18oPabFqcZDWo10wWzAJ
+BgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUGJPgajaJpq5Me54+
+g2m4yU70V6QwHwYDVR0jBBgwFoAUlKQJFSpa8WsuANE8Vq+AogMi+o8wCgYIKoZI
+zj0EAwIDSAAwRQIhAPasvJtN8nilvr1XDiYb+kVqAe7R7KSaDA6aDWA5eNW/AiAH
+t2nlRKjjz0aEKBIPgD4NS0GCpnoDKUq0+rzTNddu7w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.der
index 9ce84ac91bad47..c0da50ba0a1b53 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.pem
index 5e59d9645fac25..7c97ddb52f0cec 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMzc7NIQPk751e9n2DuUA40y503ZYMqUQaxDVTV14fB3oAoGCCqGSM49
-AwEHoUQDQgAE2c2JdrIalmXsiu/09ewRy2ihO40o6YFH+iP2v0ZqiPYTC6jrI/yG
-7y37nHWOj/sDluvvFbvAtDFADO7peVcHrA==
+MHcCAQEEIFuEEExSJlAIU6jZEWj2iglT+U5IPBm0nohHueP65QmEoAoGCCqGSM49
+AwEHoUQDQgAEmql1OjD/PGT9GtCH2rDRet7OYYMB5BadxTrtsDxtvqqCs2u0WjO7
+DCsuoEARWV2NmmH+QxrtB9fKD2mxanGQ1g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.der
index 7e21afa5fe27ce..a285db3fb6f4da 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.pem
index 010576cf3fa474..be83a4f5921572 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIJSXTwP8CmrkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWSgAwIBAgIISrlodA0paBQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABHGc9XLZuE66ShNp/uPCJe+xFIj7iU/nb7fd1uWUxJpw6bHRayTv6UZKXnW6
-pvKTGCXiyo8Q/IhQDL8JuGOU3xOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQWkeYJi9jA/7Q+SYVyzZocsbvWiDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBC
-7BwhCq8pc64zVD/V2BSdJNRNAOwOidDG6jhpNvtOXgIhAJjfeOIp0Zjn77tEAsXm
-6+9qU+PUSjem9jPoeJfDZHhz
+A0IABC+iu5/uw6ADQ2k92NatAY+BAX54JNrze6ZLza9sVnX/ENf7zdraz05EMOCY
+2oyEx1qcmvQScLyUEpnn2wRkLs6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSUpAkVKlrxay4A0TxWr4CiAyL6jzAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+ukDTyNHdwUZDewrOgW4mm+syQP92+FGUTfFpNCgta0ACIQD/7oce4X90b436zd7P
+MKoahu7tinrDGkZ6Nz7qGZmcWg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.der
index 3929cdd525a625..c494c4d3094076 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.pem
index 1b75ab5f5b72f3..0d499483928e5a 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMRNA5knfFa8Ear5IAn8nndPjAlp/mYhdl3TWZr1xEKxoAoGCCqGSM49
-AwEHoUQDQgAEcZz1ctm4TrpKE2n+48Il77EUiPuJT+dvt93W5ZTEmnDpsdFrJO/p
-Rkpedbqm8pMYJeLKjxD8iFAMvwm4Y5TfEw==
+MHcCAQEEIP6MFX67mMXt881LwX64h1BvPuluqIR8MCl+4ogzrEuuoAoGCCqGSM49
+AwEHoUQDQgAEL6K7n+7DoANDaT3Y1q0Bj4EBfngk2vN7pkvNr2xWdf8Q1/vN2trP
+TkQw4JjajITHWpya9BJwvJQSmefbBGQuzg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/test_case_vector.json
index 1aa3dafd3c7577..d350034e1f0bb5 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension critical field is set as 'non-critical'",
     "is_success_case": "false",
-    "dac_cert": "308201cb30820171a0030201020208790e1593299b5dc2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d9cd8976b21a9665ec8aeff4f5ec11cb68a13b8d28e98147fa23f6bf466a88f6130ba8eb23fc86ef2dfb9c758e8ffb0396ebef15bbc0b431400ceee9795707aca35d305b30090603551d1304023000300e0603551d0f0101ff040403020780301d0603551d0e041604142f670894761726b4383be17e6f8c4c9bde8652f8301f0603551d230418301680141691e6098bd8c0ffb43e498572cd9a1cb1bbd688300a06082a8648ce3d040302034800304502202e45ec86cc9f9b4c32d866708a2c19cfb07faeee4972f9496bc3b47ed7d277f4022100f532ca0a699b4d4ebb849a1109f0a9626f8f6baef2c5ba6096bc43cbf8a89c2c",
-    "pai_cert": "308201be30820164a00302010202082525d3c0ff029ab9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004719cf572d9b84eba4a1369fee3c225efb11488fb894fe76fb7ddd6e594c49a70e9b1d16b24efe9464a5e75baa6f2931825e2ca8f10fc88500cbf09b86394df13a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141691e6098bd8c0ffb43e498572cd9a1cb1bbd688301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022042ec1c210aaf2973ae33543fd5d8149d24d44d00ec0e89d0c6ea386936fb4e5e02210098df78e229d198e7efbb4402c5e6ebef6a53e3d44a37a6f633e87897c3647873",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402207bae9411164196fae2ad98ccabdac3dbc8284507d3012e553303bd958e02fcd6022037c1e5c24eeb4ecc2d74281e92c4a21ca66a40fe34c99758056d4b29cce5dcd5",
-    "dac_private_key": "ccdcecd2103e4ef9d5ef67d83b94038d32e74dd960ca9441ac43553575e1f077",
-    "dac_public_key": "04d9cd8976b21a9665ec8aeff4f5ec11cb68a13b8d28e98147fa23f6bf466a88f6130ba8eb23fc86ef2dfb9c758e8ffb0396ebef15bbc0b431400ceee9795707ac"
+    "dac_cert": "308201cb30820171a003020102020851d4a5d08cb1f84d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049aa9753a30ff3c64fd1ad087dab0d17adece618301e4169dc53aedb03c6dbeaa82b36bb45a33bb0c2b2ea04011595d8d9a61fe431aed07d7ca0f69b16a7190d6a35d305b30090603551d1304023000300e0603551d0f0101ff040403020780301d0603551d0e041604141893e06a3689a6ae4c7b9e3e8369b8c94ef457a4301f0603551d2304183016801494a409152a5af16b2e00d13c56af80a20322fa8f300a06082a8648ce3d0403020348003045022100f6acbc9b4df278a5bebd570e261bfa456a01eed1eca49a0c0e9a0d603978d5bf022007b769e544a8e3cf468428120f803e0d4b4182a67a03294ab4fabcd335d76eef",
+    "pai_cert": "308201bf30820164a00302010202084ab968740d296814300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042fa2bb9feec3a00343693dd8d6ad018f81017e7824daf37ba64bcdaf6c5675ff10d7fbcddadacf4e4430e098da8c84c75a9c9af41270bc941299e7db04642ecea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041494a409152a5af16b2e00d13c56af80a20322fa8f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100ba40d3c8d1ddc146437b0ace816e269beb3240ff76f851944df16934282d6b40022100ffee871ee17f746f8dfacddecf30aa1a86eeed8a7ac31a467a373eea19999c5a",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402207a3b2f30fdcc229d11dce2e6ed02f9517603b40df5ed43453e4cb8c66ba8a87602202cd7245305a1091e35fe40d5e65214a6be88045f9ac85647579f45262606e85e",
+    "dac_private_key": "5b84104c5226500853a8d91168f68a0953f94e483c19b49e8847b9e3fae50984",
+    "dac_public_key": "049aa9753a30ff3c64fd1ad087dab0d17adece618301e4169dc53aedb03c6dbeaa82b36bb45a33bb0c2b2ea04011595d8d9a61fe431aed07d7ca0f69b16a7190d6"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/cd.der
index 1b4c0f60ce6ba3..fc969876dbb301 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.der
index 093e682d36a8d7..1f6b8e3084fae4 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.pem
index 175274f930411a..a9b9f7e6a39387 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWagAwIBAgIIfAk8Qci1coIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWagAwIBAgIIVCzL+drUPLowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATur9Bvnp5hXk8LxJFGEuJCSO2NpDQo
-NTqlzpKVZWNzIaCMMzE19eH+v5CjkN6gKB0T7Xf+MGmnvc6Jg9fiuAiEo1IwUDAO
-BgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFFgzzji8raFTMmA8ccTjRffph4XAMB8G
-A1UdIwQYMBaAFGDO8h7A1JGRzS+o6FIGnmgs2HvOMAoGCCqGSM49BAMCA0cAMEQC
-IBXq9QZSH9828eCOALqxhV3fFi+J/xcN8vxOH31fwKDsAiA7sJVcWzxUSK0/wh1n
-5sjDBzWqLZDFM7cT3WIC4frCIA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQx4dCk84Bs+Ei8Z4ar3fBBQ2jJ6OUr
++SyLKXJ/Ue0Slm1aYtx/HLWTo8rZOap6l8WcwJMzY+lkAxuRlycQZePLo1IwUDAO
+BgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFENrY8GOMNgUuHG7NHSlhzpEEsRMMB8G
+A1UdIwQYMBaAFF8oe2WP2adZFnPYDNEfUAGLuQNfMAoGCCqGSM49BAMCA0cAMEQC
+ICaBTBqZOVSTM4IcaRIFlh/7coU8FyHMMLLkUAsdjMoFAiALTCPrQq2UvqnjWvxE
+0NCEqJTc/VNDXsrdm3VAwtzggg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.der
index 4758555b46c650..851ee8345e0fc6 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.pem
index dfbbfccea6b673..7a7a7b569c3fa2 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEI5k5bNUiAAHt2imW0VFiHELalNfGU27bVzWGqFNLbKoAoGCCqGSM49
-AwEHoUQDQgAE7q/Qb56eYV5PC8SRRhLiQkjtjaQ0KDU6pc6SlWVjcyGgjDMxNfXh
-/r+Qo5DeoCgdE+13/jBpp73OiYPX4rgIhA==
+MHcCAQEEIKcPsaTR/MI+ic3ijHTH8dYLYXkXl2lEAoOrZkPzE4RkoAoGCCqGSM49
+AwEHoUQDQgAEMeHQpPOAbPhIvGeGq93wQUNoyejlK/ksiylyf1HtEpZtWmLcfxy1
+k6PK2TmqepfFnMCTM2PpZAMbkZcnEGXjyw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.der
index 5ef92e1f09af17..dadf86d74e7661 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.pem
index 722c47283fc4b5..abdf9cdee41a7b 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIF6TrjZMKUu0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWSgAwIBAgIIb5/YqYq5hnswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABICNlJs3kQS0w4bliK8vfGzZ0+Nj6C1NsfrJsKOCEucfw0LeoujbKg4vOjYX
-QpjJaMZIEoMubpbspXR+3RRn8/mjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRgzvIewNSRkc0vqOhSBp5oLNh7zjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-hq+0zeW68ii/PkX1K9uZUXwxdrE7N5UumJs4eM0721UCIFcQoy3VjK9OlTumY2ZY
-U7qsuFdUOlDJmaACGEiz8uZh
+A0IABPD6/fIfWnkQ/B6M6tMP/iNh0MzeAaWbQ2Qun5odLi361HwHbzdCZysmghtQ
+Ic72sq7PgBlMt8G6axGpqEb4XuOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRfKHtlj9mnWRZz2AzRH1ABi7kDXzAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+ukUM4tvDhjxUNAXLt2W42tKOFylSHFA1h9O5BowGQZUCIQCAVQlQ8FcqoHZ4BXN7
+D339k+oRowgY7vBx45VD3lniXg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.der
index 16bd26f8f145bf..ff54bb283b1c16 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.pem
index 1077998e414a5f..67cae8e1bb29c1 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIH88UhgUEU17SkrYkfroPRvE2JtbqPuEhYb0nTgqL+nFoAoGCCqGSM49
-AwEHoUQDQgAEgI2UmzeRBLTDhuWIry98bNnT42PoLU2x+smwo4IS5x/DQt6i6Nsq
-Di86NhdCmMloxkgSgy5uluyldH7dFGfz+Q==
+MHcCAQEEIOxJomNXxy+jS4Q2wrkEe2wcaFdqdLSwYTx0IDIdA37HoAoGCCqGSM49
+AwEHoUQDQgAE8Pr98h9aeRD8Hozq0w/+I2HQzN4BpZtDZC6fmh0uLfrUfAdvN0Jn
+KyaCG1Ahzvayrs+AGUy3wbprEamoRvhe4w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/test_case_vector.json
index 13d9670ed62f58..03aa9b93626d01 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate doesn't include Basic Constraint extension",
     "is_success_case": "false",
-    "dac_cert": "308201bf30820166a00302010202087c093c41c8b57282300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004eeafd06f9e9e615e4f0bc4914612e24248ed8da43428353aa5ce929565637321a08c333135f5e1febf90a390dea0281d13ed77fe3069a7bdce8983d7e2b80884a3523050300e0603551d0f0101ff040403020780301d0603551d0e041604145833ce38bcada15332603c71c4e345f7e98785c0301f0603551d2304183016801460cef21ec0d49191cd2fa8e852069e682cd87bce300a06082a8648ce3d0403020347003044022015eaf506521fdf36f1e08e00bab1855ddf162f89ff170df2fc4e1f7d5fc0a0ec02203bb0955c5b3c5448ad3fc21d67e6c8c30735aa2d90c533b713dd6202e1fac220",
-    "pai_cert": "308201be30820164a003020102020817a4eb8d930a52ed300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004808d949b379104b4c386e588af2f7c6cd9d3e363e82d4db1fac9b0a38212e71fc342dea2e8db2a0e2f3a36174298c968c64812832e6e96eca5747edd1467f3f9a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041460cef21ec0d49191cd2fa8e852069e682cd87bce301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210086afb4cde5baf228bf3e45f52bdb99517c3176b13b37952e989b3878cd3bdb5502205710a32dd58caf4e953ba663665853baacb857543a50c999a0021848b3f2e661",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100e7374f9f6e12792a65b2cb6c3f99a9507d046bbb675cafefa90ba8a1120a3a3602207d27c01bfe5d468b0f6ded348a3ee52464c3c4d3cd17fe2cc6a8b03250c08b09",
-    "dac_private_key": "42399396cd5220001edda2996d151621c42da94d7c6536edb573586a8534b6ca",
-    "dac_public_key": "04eeafd06f9e9e615e4f0bc4914612e24248ed8da43428353aa5ce929565637321a08c333135f5e1febf90a390dea0281d13ed77fe3069a7bdce8983d7e2b80884"
+    "dac_cert": "308201bf30820166a0030201020208542ccbf9dad43cba300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000431e1d0a4f3806cf848bc6786abddf0414368c9e8e52bf92c8b29727f51ed12966d5a62dc7f1cb593a3cad939aa7a97c59cc0933363e964031b9197271065e3cba3523050300e0603551d0f0101ff040403020780301d0603551d0e04160414436b63c18e30d814b871bb3474a5873a4412c44c301f0603551d230418301680145f287b658fd9a7591673d80cd11f50018bb9035f300a06082a8648ce3d0403020347003044022026814c1a9939549333821c691205961ffb72853c1721cc30b2e4500b1d8cca0502200b4c23eb42ad94bea9e35afc44d0d084a894dcfd53435ecadd9b7540c2dce082",
+    "pai_cert": "308201bf30820164a00302010202086f9fd8a98ab9867b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f0fafdf21f5a7910fc1e8cead30ffe2361d0ccde01a59b43642e9f9a1d2e2dfad47c076f3742672b26821b5021cef6b2aecf80194cb7c1ba6b11a9a846f85ee3a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145f287b658fd9a7591673d80cd11f50018bb9035f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100ba450ce2dbc3863c543405cbb765b8dad28e1729521c503587d3b9068c06419502210080550950f0572aa0767805737b0f7dfd93ea11a30818eef071e39543de59e25e",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022049da2eccffd79253257db90af188605d300f91ffee448766e7268e17f8ba9308022100f29e915e4a179959d7f0192d2459a8e7b534f0abe60219de6a8ad7c9200abd37",
+    "dac_private_key": "a70fb1a4d1fcc23e89cde28c74c7f1d60b6179179769440283ab6643f3138464",
+    "dac_public_key": "0431e1d0a4f3806cf848bc6786abddf0414368c9e8e52bf92c8b29727f51ed12966d5a62dc7f1cb593a3cad939aa7a97c59cc0933363e964031b9197271065e3cb"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/cd.der
index 6c9a2565f37529..0288e3cf202927 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.der
index ead5da90d9a888..317617f29818f6 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.pem
index b12f9b807eb3fb..2bbbb9086cae53 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIaREobzqbP1UwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0TCCAXegAwIBAgIIcRdESSFd32IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASlyFRzQ7Bep3QoNUNB9Pjve36JVkoc
-UapOPW31jHVJZ/9AUhyDL8LBUlaqdbfEt6IQ4BylnKAmebPPhHQbe3sOo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU+QhnErgSgADD
-gzh8QmxtEvuKyTIwHwYDVR0jBBgwFoAUYaIbv+zZ9MfI3MD9hBG7a1P+ZZEwCgYI
-KoZIzj0EAwIDSAAwRQIge/fFk83ukvKAoBea3Vl7p9k2eU+2wpdDZXjWPmH+iQkC
-IQCzoBUAcHW1BieeHKK05TQ2Cs84sszK3l1j2+gh9kPKdQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQptYoHz1Kz9u+7M5xjt7lGyCcSX5mh
+I2pMGfV/qu+u7JdIzD0YoslBb+DuI0ydZedlPFogpowd5F5I86Kqw0a1o2MwYTAP
+BgNVHRMBAf8EBTADAgEAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUbvkLDI4S
+LcQk713cnDb5Is1iFkAwHwYDVR0jBBgwFoAU6is/c8cNHpFIWipMLszE74jwzJUw
+CgYIKoZIzj0EAwIDSAAwRQIgJTkMUM5S/PWCUc69bCGjX6ovdg5Wup+lU7/bD9DU
+4p0CIQCfMNWyCsCPhUPrtN1qccGInBXrgCnaozsrfYEHXUF0nw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.der
index 5e258ae2f17057..8b5dcbd4b69019 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.pem
index 12f08726724b26..68b4cc856d53f4 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDdxyhZwDfeHPAbutmnUXItWWJH/djFApydiVnMMsQbJoAoGCCqGSM49
-AwEHoUQDQgAEpchUc0OwXqd0KDVDQfT473t+iVZKHFGqTj1t9Yx1SWf/QFIcgy/C
-wVJWqnW3xLeiEOAcpZygJnmzz4R0G3t7Dg==
+MHcCAQEEIGkWZg2R+RA8/lDxa9axCOTHsAazx7V+bpUno4NkqyhUoAoGCCqGSM49
+AwEHoUQDQgAEKbWKB89Ss/bvuzOcY7e5RsgnEl+ZoSNqTBn1f6rvruyXSMw9GKLJ
+QW/g7iNMnWXnZTxaIKaMHeReSPOiqsNGtQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.der
index 47da29a8e5cf6f..d9cbfe8b7b86ae 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.pem
index 18b15d82bad51f..7e818153bf56e9 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIYH7YaArNPm4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIRnjLvzjmVt4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABFkKTCTMFwY01qyBWbiZyxHhWedyvBWB7nElqB0IIZrj0IjFTWibUxSGT7N7
-FBR3JWkrhWOLSPV4A2nJ2OAXL7+jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRhohu/7Nn0x8jcwP2EEbtrU/5lkTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAR
-/Qu1fTlubnoRd/BB/rwjheEhemMH2zhFvj4laREBawIgZFpi07oNIgV9ve1KpN2j
-ew/h2GOkQ7jsSjjzXM6wU3A=
+A0IABCyRTFISm38fS1giBZJnc2duC8EPV/iWiJ5GA2DXMHNFI9f7YU2nM4NFnBss
+ANH10hZBRfISfSPkFIu+FCIR/aejZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTqKz9zxw0ekUhaKkwuzMTviPDMlTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+vbKTrMC7OhqlzU07TJ/Fkjm4aEkykyNlu0IEBXGuX5gCIDbpvCKW1uQei7uMTnlg
++NkRlmROSvz1P7jr+GjVShcR
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.der
index b5fee19b37904b..49a0ee6a3ac02b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.pem
index 41ef5a7439aa9b..f385f88abede99 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJ3Ln7ZNU9h9E8uYTKPxZ40/nhwNe+HwErGKu8AUjdKtoAoGCCqGSM49
-AwEHoUQDQgAEWQpMJMwXBjTWrIFZuJnLEeFZ53K8FYHucSWoHQghmuPQiMVNaJtT
-FIZPs3sUFHclaSuFY4tI9XgDacnY4Bcvvw==
+MHcCAQEEIBq6fF8zBFsb6ie4cdzio6qHBMobCgbMD03fT2nlphsMoAoGCCqGSM49
+AwEHoUQDQgAELJFMUhKbfx9LWCIFkmdzZ24LwQ9X+JaInkYDYNcwc0Uj1/thTacz
+g0WcGywA0fXSFkFF8hJ9I+QUi74UIhH9pw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/test_case_vector.json
index 5b3cdbd9aa4c3b..289f278da85469 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension PathLen field set to 0",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202086911286f3a9b3f55300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a5c8547343b05ea77428354341f4f8ef7b7e89564a1c51aa4e3d6df58c754967ff40521c832fc2c15256aa75b7c4b7a210e01ca59ca02679b3cf84741b7b7b0ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f9086712b8128000c383387c426c6d12fb8ac932301f0603551d2304183016801461a21bbfecd9f4c7c8dcc0fd8411bb6b53fe6591300a06082a8648ce3d040302034800304502207bf7c593cdee92f280a0179add597ba7d936794fb6c297436578d63e61fe8909022100b3a015007075b506279e1ca2b4e534360acf38b2cccade5d63dbe821f643ca75",
-    "pai_cert": "308201bd30820164a0030201020208607ed8680acd3e6e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004590a4c24cc170634d6ac8159b899cb11e159e772bc1581ee7125a81d08219ae3d088c54d689b5314864fb37b14147725692b85638b48f5780369c9d8e0172fbfa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041461a21bbfecd9f4c7c8dcc0fd8411bb6b53fe6591301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022011fd0bb57d396e6e7a1177f041febc2385e1217a6307db3845be3e256911016b0220645a62d3ba0d22057dbded4aa4dda37b0fe1d863a443b8ec4a38f35cceb05370",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100cf465aaf5e38fdbc317fbcd613243876c537c86f3807fceda88ca497b02b9bb4022005cc82dcfe4c77a7aed04b073fc8c9e1391ed25697fb646d6d402138051fff85",
-    "dac_private_key": "3771ca16700df7873c06eeb669d45c8b565891ff763140a7276256730cb106c9",
-    "dac_public_key": "04a5c8547343b05ea77428354341f4f8ef7b7e89564a1c51aa4e3d6df58c754967ff40521c832fc2c15256aa75b7c4b7a210e01ca59ca02679b3cf84741b7b7b0e"
+    "dac_cert": "308201d130820177a003020102020871174449215ddf62300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000429b58a07cf52b3f6efbb339c63b7b946c827125f99a1236a4c19f57faaefaeec9748cc3d18a2c9416fe0ee234c9d65e7653c5a20a68c1de45e48f3a2aac346b5a3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020780301d0603551d0e041604146ef90b0c8e122dc424ef5ddc9c36f922cd621640301f0603551d23041830168014ea2b3f73c70d1e91485a2a4c2eccc4ef88f0cc95300a06082a8648ce3d0403020348003045022025390c50ce52fcf58251cebd6c21a35faa2f760e56ba9fa553bfdb0fd0d4e29d0221009f30d5b20ac08f8543ebb4dd6a71c1889c15eb8029daa33b2b7d81075d41749f",
+    "pai_cert": "308201be30820164a00302010202084678cbbf38e656de300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042c914c52129b7f1f4b582205926773676e0bc10f57f896889e460360d730734523d7fb614da73383459c1b2c00d1f5d2164145f2127d23e4148bbe142211fda7a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ea2b3f73c70d1e91485a2a4c2eccc4ef88f0cc95301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100bdb293acc0bb3a1aa5cd4d3b4c9fc59239b8684932932365bb42040571ae5f98022036e9bc2296d6e41e8bbb8c4e7960f8d91196644e4afcf53fb8ebf868d54a1711",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502200cbe95b5a51390421af00f726fb09796e4afc87cc64e6aa234cefdda1ff1b404022100d303c3cf20f95ddbade9090b6bb8862bad9068b721165a370d15a1f93db4ebd5",
+    "dac_private_key": "6916660d91f9103cfe50f16bd6b108e4c7b006b3c7b57e6e9527a38364ab2854",
+    "dac_public_key": "0429b58a07cf52b3f6efbb339c63b7b946c827125f99a1236a4c19f57faaefaeec9748cc3d18a2c9416fe0ee234c9d65e7653c5a20a68c1de45e48f3a2aac346b5"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/cd.der
index b2381a9775a37f..20904ce031843d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.der
index 64fb51da8c7b43..4b1fc8ef90b094 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.pem
index 6e8ec24ffd8e64..fea5da706f9aea 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIKfSKrtFa17MwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0DCCAXegAwIBAgIIb8WPzkl/T8EwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASDoAdK8YBIYtFITTmhQFRBjeKqmt6A
-VYDBw0wh987fth2jMcg+DVRDM2jh/FIRw5Ra5gWWlXjOlU8Nz4PSKNrYo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUf0fFOhhIdz4x
-3IFoGTlVimiKdP4wHwYDVR0jBBgwFoAUj8U/H4Gl3B5mx/94RVwUGFdtOogwCgYI
-KoZIzj0EAwIDSAAwRQIgSrebPPsQdWxsPuJ3QRPVsG6tdXznpy+DJHBU18Z5d78C
-IQCUDG2mkE0/lZjCl+qUV0nerruiJ2kQE6jLTf/mwpxJ2g==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQwhXge16ul8HSYWiUmGHA7xqWQoBIy
+VwkbEysw6kH29s/2ckXJKEIBpdyT+eeQ5AYXwrEgH4yQ27aqwrZFDHAzo2MwYTAP
+BgNVHRMBAf8EBTADAgEBMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU8QIC/STw
+E6mIVrL2uOBzcFCoT/cwHwYDVR0jBBgwFoAUy8qrVdtHeM4lOqAWxNsBpnsdg9Qw
+CgYIKoZIzj0EAwIDRwAwRAIgd/dsBj6z1h4Wgtg1cbFcwa81soKB0Tz8VK3vo77K
+G/wCIBZmYeOAwhT+0hmNZWp4KKlSXl5e+iFTr52jxHBsciYo
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.der
index 4e44c73ac51597..fbc4d7b16931fa 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.pem
index 51742c87443489..5a9de03eaffed3 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHfL+dEHbB0TsKZPgxwPHn7IhW7kpzD/lkKptBPukelqoAoGCCqGSM49
-AwEHoUQDQgAEg6AHSvGASGLRSE05oUBUQY3iqpregFWAwcNMIffO37YdozHIPg1U
-QzNo4fxSEcOUWuYFlpV4zpVPDc+D0ija2A==
+MHcCAQEEIGbbJMR8mYAvsE+bDPv5TlGEIwzuGrVnM9TKb36EYsQaoAoGCCqGSM49
+AwEHoUQDQgAEMIV4HterpfB0mFolJhhwO8alkKASMlcJGxMrMOpB9vbP9nJFyShC
+AaXck/nnkOQGF8KxIB+MkNu2qsK2RQxwMw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.der
index 1b1f2eb6a9ec67..8336d9c0116a55 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.pem
index ef35f565ddb428..a502074a3adc30 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIcPcXoAaIgCMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIJ53ciZDbduAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABC8U8VpD4Cs58yQb9l2Ir+pqBS6y1zJM78y4H5g6m5vETYwkTpsdpRnemPpD
-UqgOnb1jR1ZadeFvUVi+9Tw896yjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSPxT8fgaXcHmbH/3hFXBQYV206iDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-j6+zOKNSibs0AigYlKtNpp0o87GNrikIN9l+vP+UfnYCIQC79W32m7hhlZZl/Ygq
-P/H5ej5d9wKi6c1ZN5esxwMgyg==
+A0IABOp/kEcyTPDTgO/aS4RIf58lMZQ2h4vuqtlzxjeP/gaP56Q5xoluhPlukRMJ
+4zF5P8zMVJCTmSOBNui249D6aE6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLyqtV20d4ziU6oBbE2wGmex2D1DAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+kLXWZv1fyVcvtimkTBYC5FxRLNedb90H/QATfwpLx14CIH2eKf6Nv1MP95lQ9b9j
+voTjSeMrKWkvqUyobE1tLVkQ
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.der
index a932c07ba8d801..becc88ab46d801 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.pem
index ac235c9a65124b..cf566c0855b507 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHNiBNQZfHeGHDCB9SoPfERyfwf4Jw84Px+yIh1tCiatoAoGCCqGSM49
-AwEHoUQDQgAELxTxWkPgKznzJBv2XYiv6moFLrLXMkzvzLgfmDqbm8RNjCROmx2l
-Gd6Y+kNSqA6dvWNHVlp14W9RWL71PDz3rA==
+MHcCAQEEIBpR3dBRx0o9h/cXqUNzDwIf6av1SNRIWSqL8tf1WJ2moAoGCCqGSM49
+AwEHoUQDQgAE6n+QRzJM8NOA79pLhEh/nyUxlDaHi+6q2XPGN4/+Bo/npDnGiW6E
++W6REwnjMXk/zMxUkJOZI4E26Lbj0PpoTg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/test_case_vector.json
index 025436fef66714..b707f4cdf72563 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension PathLen field set to 1",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020829f48aaed15ad7b3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000483a0074af1804862d1484d39a14054418de2aa9ade805580c1c34c21f7cedfb61da331c83e0d54433368e1fc5211c3945ae605969578ce954f0dcf83d228dad8a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147f47c53a1848773e31dc81681939558a688a74fe301f0603551d230418301680148fc53f1f81a5dc1e66c7ff78455c1418576d3a88300a06082a8648ce3d040302034800304502204ab79b3cfb10756c6c3ee2774113d5b06ead757ce7a72f83247054d7c67977bf022100940c6da6904d3f9598c297ea945749deaebba227691013a8cb4dffe6c29c49da",
-    "pai_cert": "308201bf30820164a003020102020870f717a006888023300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042f14f15a43e02b39f3241bf65d88afea6a052eb2d7324cefccb81f983a9b9bc44d8c244e9b1da519de98fa4352a80e9dbd6347565a75e16f5158bef53c3cf7aca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148fc53f1f81a5dc1e66c7ff78455c1418576d3a88301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008fafb338a35289bb3402281894ab4da69d28f3b18dae290837d97ebcff947e76022100bbf56df69bb861959665fd882a3ff1f97a3e5df702a2e9cd593797acc70320ca",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220424153f75255e6b2617f5056880aa41de2c274d56daed676ad0af4a60c6228300221008b576d2f67722b72556f2bd2a9478fb7cf8d7268b99831e035ed4784b126307d",
-    "dac_private_key": "77cbf9d1076c1d13b0a64f831c0f1e7ec8856ee4a730ff9642a9b413ee91e96a",
-    "dac_public_key": "0483a0074af1804862d1484d39a14054418de2aa9ade805580c1c34c21f7cedfb61da331c83e0d54433368e1fc5211c3945ae605969578ce954f0dcf83d228dad8"
+    "dac_cert": "308201d030820177a00302010202086fc58fce497f4fc1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043085781ed7aba5f074985a252618703bc6a590a0123257091b132b30ea41f6f6cff67245c9284201a5dc93f9e790e40617c2b1201f8c90dbb6aac2b6450c7033a3633061300f0603551d130101ff04053003020101300e0603551d0f0101ff040403020780301d0603551d0e04160414f10202fd24f013a98856b2f6b8e0737050a84ff7301f0603551d23041830168014cbcaab55db4778ce253aa016c4db01a67b1d83d4300a06082a8648ce3d0403020347003044022077f76c063eb3d61e1682d83571b15cc1af35b28281d13cfc54adefa3beca1bfc0220166661e380c214fed2198d656a7828a9525e5e5efa2153af9da3c4706c722628",
+    "pai_cert": "308201be30820164a0030201020208279ddc8990db76e0300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ea7f9047324cf0d380efda4b84487f9f25319436878beeaad973c6378ffe068fe7a439c6896e84f96e911309e331793fcccc54909399238136e8b6e3d0fa684ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414cbcaab55db4778ce253aa016c4db01a67b1d83d4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210090b5d666fd5fc9572fb629a44c1602e45c512cd79d6fdd07fd00137f0a4bc75e02207d9e29fe8dbf530ff79950f5bf63be84e349e32b29692fa94ca86c4d6d2d5910",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100a1c34943dfe859c5f0a5359796dc6a10c04d39c7ef5098ae80faac357ffecd1b02203fe70b403dfb6f3437101f389dcb56bdc09add14897c222b6bf28cbbc4577d29",
+    "dac_private_key": "66db24c47c99802fb04f9b0cfbf94e5184230cee1ab56733d4ca6f7e8462c41a",
+    "dac_public_key": "043085781ed7aba5f074985a252618703bc6a590a0123257091b132b30ea41f6f6cff67245c9284201a5dc93f9e790e40617c2b1201f8c90dbb6aac2b6450c7033"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/cd.der
index ed2a8849a92feb..961c5a5e46e0ba 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.der
index ece409bc80fff0..b5af94f00fb4fd 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.pem
index ac3935be963afc..27a596e929f025 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIIEYZMjpEeEK4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0TCCAXegAwIBAgIIdJuEjen8b8gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATxWMJAtxFB9AIllZlnvctMTvBU5qvS
-E3jB0xhFhpEizDEhvTVJw7cZX0TcqCgc+mYsKC0aZMvr1IKGkjE821huo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUzV49oOoB6+h0
-/V8cpljtli8xu8wwHwYDVR0jBBgwFoAUAayvo+3PJi8nKGsPUHbi0NgSKqQwCgYI
-KoZIzj0EAwIDSQAwRgIhAIH3/DnFzOmfKkmCdTXR6dJuFcEQPdOmZWhiVopET87n
-AiEAv8bUsd8mMn3WnFmpOfYxm4fpZE8rSv/AChmg4uo8Um4=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASf/Dk0jhLJo8ueRHO6qGew6hejASFX
+DboZt2TJbN6B3i0KFIO77kPxphH4w7q4A7Ag+RnxNc0FIQbY7kRX26AYo2MwYTAP
+BgNVHRMBAf8EBTADAgECMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUeKXokstu
+wT4kdRxhHXVoDB2Imz0wHwYDVR0jBBgwFoAUbLp2SGm8oqdwjGArgQtaf7fP3Yow
+CgYIKoZIzj0EAwIDSAAwRQIhAJXUfvyOXBy5/IdGbe/xd3s2n9teG7tGmGeUt2VG
+1EgtAiB0cN2rZ2GLHGhP0bYqUrdIcEujcL/Fi74Rwh/mAMytEA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.der
index 8b48400b4a87f3..32ce74b793fa33 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.pem
index a1a476559f093c..6216a7f7d22ef5 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPD5waj509NXPByjMsGcsJe5szdXK2MPiHtZyUTRy5vJoAoGCCqGSM49
-AwEHoUQDQgAE8VjCQLcRQfQCJZWZZ73LTE7wVOar0hN4wdMYRYaRIswxIb01ScO3
-GV9E3KgoHPpmLCgtGmTL69SChpIxPNtYbg==
+MHcCAQEEIFl3b3lqROo1jjSGv4trOoy9PYBxJaNk+SCGiIqs8W29oAoGCCqGSM49
+AwEHoUQDQgAEn/w5NI4SyaPLnkRzuqhnsOoXowEhVw26GbdkyWzegd4tChSDu+5D
+8aYR+MO6uAOwIPkZ8TXNBSEG2O5EV9ugGA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.der
index 65c7a38223b54f..89d312710e7386 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.pem
index 7df238c3a91fd7..309d818af8fa25 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIPSv6JCluFLEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIINg9DQ7e399AwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABMkw4xwx7UXEayIghnfbTVu79zzkX27kmWWr6xgFz/uM9b6m1kgYAhN7/tRz
-GftNB2V7lUkWs+au3oG1pg1cBYOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQBrK+j7c8mLycoaw9QduLQ2BIqpDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-/dhUQQpCn7/7rj2qaT3hCLzXHTok58bQ38z55bsVr7UCIQDtwWzFJ9DqZoCfnf3V
-dI24fzfI14iqazQT+H+A25LrfA==
+A0IABKsfO2MIolZfou5DiAqSQsAmH5CgbsmlfxGpsywihRLUiG9aL+3g5AH9vp/7
+IiYPOeYTvO4mUEtDIjhiRdYmg2OjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRsunZIabyip3CMYCuBC1p/t8/dijAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBb
+CEPN8+kJ+Zkc6PtU2Uocob/OQtPQRMADWMrJPBJ35QIhAMiArpbquQzT+lSTnpdj
+Gi5RCGVx2/VmIZt/qdBt0B4q
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.der
index 416827329999de..5cc6a0ccf9c072 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.pem
index d5a9c3d3ffdc16..1cde39e5fc6b31 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMUgfpCkg0qIfg0ycuQ8LXoQJ8K9Apof074llp7N1KR0oAoGCCqGSM49
-AwEHoUQDQgAEyTDjHDHtRcRrIiCGd9tNW7v3PORfbuSZZavrGAXP+4z1vqbWSBgC
-E3v+1HMZ+00HZXuVSRaz5q7egbWmDVwFgw==
+MHcCAQEEILIN3Taaxkw0wj90+kNhQZL2QNYhmHRqii1zHKPnz/8hoAoGCCqGSM49
+AwEHoUQDQgAEqx87YwiiVl+i7kOICpJCwCYfkKBuyaV/EamzLCKFEtSIb1ov7eDk
+Af2+n/siJg855hO87iZQS0MiOGJF1iaDYw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/test_case_vector.json
index 54d9af195d662a..c21db084383862 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension PathLen field set to 2",
     "is_success_case": "false",
-    "dac_cert": "308201cf30820174a003020102020811864c8e911e10ae300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f158c240b71141f40225959967bdcb4c4ef054e6abd21378c1d31845869122cc3121bd3549c3b7195f44dca8281cfa662c282d1a64cbebd4828692313cdb586ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cd5e3da0ea01ebe874fd5f1ca658ed962f31bbcc301f0603551d2304183016801401acafa3edcf262f27286b0f5076e2d0d8122aa4300a06082a8648ce3d040302034900304602210081f7fc39c5cce99f2a49827535d1e9d26e15c1103dd3a6656862568a444fcee7022100bfc6d4b1df26327dd69c59a939f6319b87e9644f2b4affc00a19a0e2ea3c526e",
-    "pai_cert": "308201bf30820164a00302010202083d2bfa24296e14b1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004c930e31c31ed45c46b22208677db4d5bbbf73ce45f6ee49965abeb1805cffb8cf5bea6d6481802137bfed47319fb4d07657b954916b3e6aede81b5a60d5c0583a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041401acafa3edcf262f27286b0f5076e2d0d8122aa4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100fdd854410a429fbffbae3daa693de108bcd71d3a24e7c6d0dfccf9e5bb15afb5022100edc16cc527d0ea66809f9dfdd5748db87f37c8d788aa6b3413f87f80db92eb7c",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ff43228d7af9ed2fd97e638f5a425b7a3df3f0a75c975a724094fc42437b22a0022100870b2e11ad9332e05f88f061c025648aa863544a618f157a6968c187e52c52a0",
-    "dac_private_key": "f0f9c1a8f9d3d3573c1ca332c19cb097b9b337572b630f887b59c944d1cb9bc9",
-    "dac_public_key": "04f158c240b71141f40225959967bdcb4c4ef054e6abd21378c1d31845869122cc3121bd3549c3b7195f44dca8281cfa662c282d1a64cbebd4828692313cdb586e"
+    "dac_cert": "308201d130820177a0030201020208749b848de9fc6fc8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049ffc39348e12c9a3cb9e4473baa867b0ea17a30121570dba19b764c96cde81de2d0a1483bbee43f1a611f8c3bab803b020f919f135cd052106d8ee4457dba018a3633061300f0603551d130101ff04053003020102300e0603551d0f0101ff040403020780301d0603551d0e0416041478a5e892cb6ec13e24751c611d75680c1d889b3d301f0603551d230418301680146cba764869bca2a7708c602b810b5a7fb7cfdd8a300a06082a8648ce3d040302034800304502210095d47efc8e5c1cb9fc87466deff1777b369fdb5e1bbb46986794b76546d4482d02207470ddab67618b1c684fd1b62a52b748704ba370bfc58bbe11c21fe600ccad10",
+    "pai_cert": "308201be30820164a0030201020208360f4343b7b7f7d0300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ab1f3b6308a2565fa2ee43880a9242c0261f90a06ec9a57f11a9b32c228512d4886f5a2fede0e401fdbe9ffb22260f39e613bcee26504b4322386245d6268363a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146cba764869bca2a7708c602b810b5a7fb7cfdd8a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205b0843cdf3e909f9991ce8fb54d94a1ca1bfce42d3d044c00358cac93c1277e5022100c880ae96eab90cd3fa54939e97631a2e51086571dbf566219b7fa9d06dd01e2a",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206f199c1ec502d8f15804f9ab1ea5fbb9a0f5cd6461d84cddb0f825702a6dc60f022100d57a257aaa10244c511b870fd9f803123e0df10b24e4edf669656ed1a0bdb9ed",
+    "dac_private_key": "59776f796a44ea358e3486bf8b6b3a8cbd3d807125a364f92086888aacf16dbd",
+    "dac_public_key": "049ffc39348e12c9a3cb9e4473baa867b0ea17a30121570dba19b764c96cde81de2d0a1483bbee43f1a611f8c3bab803b020f919f135cd052106d8ee4457dba018"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/cd.der
index 1f432733da69a0..70bce4210b2f2b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.der
index d7d0e7add720cc..f06f91206607b5 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.pem
index f2597f35c87da7..3e53d000cb6a4d 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0jCCAXegAwIBAgIIdjiFm/WqJb8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0TCCAXegAwIBAgIIfSJUjJUJ/SMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASpzVceAh96CllLNR+C27EbmK3bozsG
-cDsvlGukwCeSntoW9CxA2/Tqh+twpj/pBjohuI1wD614QPScSIE0fcROo2MwYTAP
-BgNVHRMBAf8EBTADAgEAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUjHdKkVJc
-NdMyDfVcZexP0v+oodswHwYDVR0jBBgwFoAUxkyFMyLS3QcxxI+IdWKS6471yGIw
-CgYIKoZIzj0EAwIDSQAwRgIhAJhvfWdxmrky2XWbrqjMK2EeK0vCMYH5O5T1rTuV
-KEeUAiEAoWvsAs4ZBaU5KEjdMcp+gtt47ZmNdX5tVSFQRorOkNQ=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR6X5RvrxysTSbUQuAazsdXuyMDPtIf
+GqnWY4CgVwWWq5gzIaZiLEGHjlpePXJ05szlGeBnOql0RQuiYWVUn2K9o2MwYTAP
+BgNVHRMBAf8EBTADAgEAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUvpeCvMaF
+/6Q0j01Uj54pUrw8zi4wHwYDVR0jBBgwFoAUqoxSGh9FtMWjUrr5uWfJohieu+cw
+CgYIKoZIzj0EAwIDSAAwRQIhAJcuUPJFwFHq+z83uVGobSFBOrWi0vBZQMXRZPh4
+/yqoAiAJZIt0Hx5nKijfjC92ox2ZOWY3tVU4SKq1QTUMBZxPHA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.der
index 1ec7c9d29d46d8..97f0285944f84b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.pem
index fd700740535063..a1f68abd37a8a4 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILJs6rJofdBXSp+x7gsP2Zi5DSPh9SzcEmgA23/TNEB9oAoGCCqGSM49
-AwEHoUQDQgAEqc1XHgIfegpZSzUfgtuxG5it26M7BnA7L5RrpMAnkp7aFvQsQNv0
-6ofrcKY/6QY6IbiNcA+teED0nEiBNH3ETg==
+MHcCAQEEIEYopCOK12av/jEJRbc5zU43t0yZCI0QhSLZc3mfo8faoAoGCCqGSM49
+AwEHoUQDQgAEel+Ub68crE0m1ELgGs7HV7sjAz7SHxqp1mOAoFcFlquYMyGmYixB
+h45aXj1ydObM5RngZzqpdEULomFlVJ9ivQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.der
index 15c9a1571c4be3..f1c65823119822 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.pem
index 66401d0962fd9e..976e28e8286a15 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIF54TRlmudiMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWSgAwIBAgIIRZmuYr7P16IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABEyXiZDS9DLKQVy5ssFI9DbcRI/pHSI39IqfDJuweCscvSfLdly1wdFLJLkd
-p/rGQl+Ga0m+MATK4w0j4q8cv62jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTGTIUzItLdBzHEj4h1YpLrjvXIYjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBR
-EQOiuI+IR7yyL7PwyDnoZljT5f1b0kyayP1LvxHd7AIgGWgsVVoYTd3zU0fSCCFa
-Doq3I9Qr1Pq7CdEbtoS74wY=
+A0IABB7LbwbMUriib5ubTs8/sNMh0SvRlXywPkZrfwzSqPumlrxSELMKy/LEg9fU
+IEOCq/TWb4EwPJaBj+SFy5sToy2jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSqjFIaH0W0xaNSuvm5Z8miGJ675zAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+sdJvQuPk8EnJ5dbDUi6BiYKwTlnLCnoxsYyFvxHq/ZMCIQDjbZvulN5Sr50wGlxs
+MxP0jinENGb6jSEXUdDm06vdJg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.der
index c5febcd2ec17db..c2f1a81ef86095 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.pem
index 0131bdffc3f318..de8167cf8a72b0 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOJDGsphSX82vj5n7HTM60F3JauHYZd7tredI81iicOEoAoGCCqGSM49
-AwEHoUQDQgAETJeJkNL0MspBXLmywUj0NtxEj+kdIjf0ip8Mm7B4Kxy9J8t2XLXB
-0UskuR2n+sZCX4ZrSb4wBMrjDSPirxy/rQ==
+MHcCAQEEILuBmg5buAv9YZQB25hEzI3rER2ep+YlmTMfrFhXwgLOoAoGCCqGSM49
+AwEHoUQDQgAEHstvBsxSuKJvm5tOzz+w0yHRK9GVfLA+Rmt/DNKo+6aWvFIQswrL
+8sSD19QgQ4Kr9NZvgTA8loGP5IXLmxOjLQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/test_case_vector.json
index 0d54c07a309370..d253e27cbc5c7d 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Basic Constraint extension PathLen field presence is wrong (present for DAC not present for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201d230820177a00302010202087638859bf5aa25bf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004a9cd571e021f7a0a594b351f82dbb11b98addba33b06703b2f946ba4c027929eda16f42c40dbf4ea87eb70a63fe9063a21b88d700fad7840f49c4881347dc44ea3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020780301d0603551d0e041604148c774a91525c35d3320df55c65ec4fd2ffa8a1db301f0603551d23041830168014c64c853322d2dd0731c48f88756292eb8ef5c862300a06082a8648ce3d0403020349003046022100986f7d67719ab932d9759baea8cc2b611e2b4bc23181f93b94f5ad3b95284794022100a16bec02ce1905a5392848dd31ca7e82db78ed998d757e6d552150468ace90d4",
-    "pai_cert": "308201bd30820164a0030201020208179e134659ae7623300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044c978990d2f432ca415cb9b2c148f436dc448fe91d2237f48a9f0c9bb0782b1cbd27cb765cb5c1d14b24b91da7fac6425f866b49be3004cae30d23e2af1cbfada366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414c64c853322d2dd0731c48f88756292eb8ef5c862301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220511103a2b88f8847bcb22fb3f0c839e86658d3e5fd5bd24c9ac8fd4bbf11ddec022019682c555a184dddf35347d208215a0e8ab723d42bd4fabb09d11bb684bbe306",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402206effa86913725581332ff6f0bf85f3c9cccecb1ba488e3e81ffa85e78a90a4bb022040158dad8a550347d8412009f3767c25afd8dbfc7d5c2c6f051a687585d5f3ba",
-    "dac_private_key": "b26ceab2687dd0574a9fb1ee0b0fd998b90d23e1f52cdc126800db7fd334407d",
-    "dac_public_key": "04a9cd571e021f7a0a594b351f82dbb11b98addba33b06703b2f946ba4c027929eda16f42c40dbf4ea87eb70a63fe9063a21b88d700fad7840f49c4881347dc44e"
+    "dac_cert": "308201d130820177a00302010202087d22548c9509fd23300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047a5f946faf1cac4d26d442e01acec757bb23033ed21f1aa9d66380a0570596ab983321a6622c41878e5a5e3d7274e6cce519e0673aa974450ba26165549f62bda3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020780301d0603551d0e04160414be9782bcc685ffa4348f4d548f9e2952bc3cce2e301f0603551d23041830168014aa8c521a1f45b4c5a352baf9b967c9a2189ebbe7300a06082a8648ce3d0403020348003045022100972e50f245c051eafb3f37b951a86d21413ab5a2d2f05940c5d164f878ff2aa8022009648b741f1e672a28df8c2f76a31d99396637b5553848aab541350c059c4f1c",
+    "pai_cert": "308201bf30820164a00302010202084599ae62becfd7a2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200041ecb6f06cc52b8a26f9b9b4ecf3fb0d321d12bd1957cb03e466b7f0cd2a8fba696bc5210b30acbf2c483d7d4204382abf4d66f81303c96818fe485cb9b13a32da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414aa8c521a1f45b4c5a352baf9b967c9a2189ebbe7301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b1d26f42e3e4f049c9e5d6c3522e818982b04e59cb0a7a31b18c85bf11eafd93022100e36d9bee94de52af9d301a5c6c3313f48e29c43466fa8d211751d0e6d3abdd26",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022019367fc550de0d8f86325e9b3a1fe8a062894e97ad0088159c25421640d68631022100e78d14dfb028254f05a496eb027541ff71c13428f1bc6e2e56a4677852845eac",
+    "dac_private_key": "4628a4238ad766affe310945b739cd4e37b74c99088d108522d973799fa3c7da",
+    "dac_public_key": "047a5f946faf1cac4d26d442e01acec757bb23033ed21f1aa9d66380a0570596ab983321a6622c41878e5a5e3d7274e6cce519e0673aa974450ba26165549f62bd"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/cd.der
index 544f3abd645590..e95a306cd9e523 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.der
index 4a981d9ddae278..b852427650631c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.pem
index a0efd66b366ae5..f655811eb98507 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB8zCCAZigAwIBAgIIWDONXuj76jYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB8zCCAZigAwIBAgIIJsB+E/2tr3QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQnXDa46R3KZLG0hou5YyiukEs7mUIl
-ohDdBBkuILcTGFi5Smn0iVgZjoGQE19eQt4ZVNv5vSIff7TeTnn8QJQ+o4GDMIGA
-MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTPH5JIU+QL
-77aKrEL6cPZ2MoNgATAfBgNVHSMEGDAWgBThzsCuybQQmaQCZKH2U2uD1JN7xjAg
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATBr3PzGq34ckHtz1CaLoBHgcRUP4me
+eY61EXUMPLTchF753Is3FCrIb1gFYDhAcAsDiDeWCX5MXEXtCA6bw7rQo4GDMIGA
+MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTGYZm6pzx9
+b5bPEs57Zc9gJQTmTjAfBgNVHSMEGDAWgBToO+7euLiWk19RgScSl8du3aXQwjAg
 BgNVHSUBAf8EFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwCgYIKoZIzj0EAwIDSQAw
-RgIhAJU/0RsCiVdggEuH/hR+DmA5vmoQvv4s74fHM+C5n5zsAiEA3GafhI/7gXRj
-b3JmEDPKgi2LOQ48YoYgH1hRVPlpM9A=
+RgIhAPX70bQSYUUaRLAja3adn5c+gIN2G9VtJG/cLiXW0e1xAiEA5M3DYWa6eFk7
+uQeyBlJng4pZWuR+3YBCfosDQgH4yOI=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.der
index c33a23380f616c..0bea110bc63d9f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.pem
index 97e224c94830cb..d19ab363b85e1f 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDY2v47hW6tdo/Hsni6u4zo4jMKt9s5cv8TNQ9Wa0fK4oAoGCCqGSM49
-AwEHoUQDQgAEJ1w2uOkdymSxtIaLuWMorpBLO5lCJaIQ3QQZLiC3ExhYuUpp9IlY
-GY6BkBNfXkLeGVTb+b0iH3+03k55/ECUPg==
+MHcCAQEEIKkIW4XqiTl2QadUTTq3Hfp02k7BMQl+St6b2KhBDaidoAoGCCqGSM49
+AwEHoUQDQgAEwa9z8xqt+HJB7c9Qmi6AR4HEVD+JnnmOtRF1DDy03IRe+dyLNxQq
+yG9YBWA4QHALA4g3lgl+TFxF7QgOm8O60A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.der
index 72b1c82d0d47d2..f95ce35b0e04f9 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.pem
index 12e3bb9b5f915b..24cccf025b38a8 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIJDVEI6w5ioQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIBnbj1I+vVIUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABBSJZHXRo/wsw+oBeyRN8NBuky+nn4YS78KoPSrwWcvTsPfb3F2E49m8qGdG
-sz3eRA10ZF9ZfQS9/TWVwnh6ucSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBThzsCuybQQmaQCZKH2U2uD1JN7xjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-xnB78VqJo3dhy4LQJgK7vHTNVCLIv9a+yRdJM+sfHD4CIQDkXSPikDnKK6NeJGlO
-NOHTMSBSlw6vLrH5tyvnWIM4nQ==
+A0IABG+ml06RajE2ovuzUmhjh7v6A87QD0/vj+A7xS75hQVksIm8SFNekXdFPID7
+bV0ctikkpS2H/8k7zno4Qag7STGjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBToO+7euLiWk19RgScSl8du3aXQwjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAf
+Mrg39fpXa5HKpr72riUA3lGwuRE0dPNuTd6Lz7k2lAIhANAFRm7KN9lBpjKbj3kE
+l/oU9IduZugFqn9ekUiVDB0N
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.der
index 28b47018f60428..64a19c49bb8379 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.pem
index 625dfbc255af63..5466f02574770a 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIETezfeEOHrMWjdUXrqNgSpV+T4u5Gy9AECrWmDygoaUoAoGCCqGSM49
-AwEHoUQDQgAEFIlkddGj/CzD6gF7JE3w0G6TL6efhhLvwqg9KvBZy9Ow99vcXYTj
-2byoZ0azPd5EDXRkX1l9BL39NZXCeHq5xA==
+MHcCAQEEIBgkbSH/M0gQHcF1gELwrsPwr8ovuMzvm8MV/ZkPs+SgoAoGCCqGSM49
+AwEHoUQDQgAEb6aXTpFqMTai+7NSaGOHu/oDztAPT++P4DvFLvmFBWSwibxIU16R
+d0U8gPttXRy2KSSlLYf/yTvOejhBqDtJMQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/test_case_vector.json
index cd49de1ce784e2..d50e7b59d3422f 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_extended_key_usage_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate includes optional Extended Key Usage extension",
     "is_success_case": "true",
-    "dac_cert": "308201f330820198a003020102020858338d5ee8fbea36300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004275c36b8e91dca64b1b4868bb96328ae904b3b994225a210dd04192e20b7131858b94a69f48958198e8190135f5e42de1954dbf9bd221f7fb4de4e79fc40943ea38183308180300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cf1f924853e40befb68aac42fa70f67632836001301f0603551d23041830168014e1cec0aec9b41099a40264a1f6536b83d4937bc630200603551d250101ff0416301406082b0601050507030206082b06010505070301300a06082a8648ce3d0403020349003046022100953fd11b02895760804b87fe147e0e6039be6a10befe2cef87c733e0b99f9cec022100dc669f848ffb8174636f72661033ca822d8b390e3c6286201f585154f96933d0",
-    "pai_cert": "308201bf30820164a003020102020824354423ac398a84300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000414896475d1a3fc2cc3ea017b244df0d06e932fa79f8612efc2a83d2af059cbd3b0f7dbdc5d84e3d9bca86746b33dde440d74645f597d04bdfd3595c2787ab9c4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414e1cec0aec9b41099a40264a1f6536b83d4937bc6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c6707bf15a89a37761cb82d02602bbbc74cd5422c8bfd6bec9174933eb1f1c3e022100e45d23e29039ca2ba35e24694e34e1d3312052970eaf2eb1f9b72be75883389d",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022048b9a7103173404b47ffe6d07cba9338ea826a9f82c6a2266026dbeb8b5c6c2902203428dc3d61cac04e53430c6f00ee86d69f57866bbaa2c165f7a43d0835f3a606",
-    "dac_private_key": "3636bf8ee15bab5da3f1ec9e2eaee33a388cc2adf6ce5cbfc4cd43d59ad1f2b8",
-    "dac_public_key": "04275c36b8e91dca64b1b4868bb96328ae904b3b994225a210dd04192e20b7131858b94a69f48958198e8190135f5e42de1954dbf9bd221f7fb4de4e79fc40943e"
+    "dac_cert": "308201f330820198a003020102020826c07e13fdadaf74300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c1af73f31aadf87241edcf509a2e804781c4543f899e798eb511750c3cb4dc845ef9dc8b37142ac86f5805603840700b03883796097e4c5c45ed080e9bc3bad0a38183308180300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c66199baa73c7d6f96cf12ce7b65cf602504e64e301f0603551d23041830168014e83beedeb8b896935f5181271297c76edda5d0c230200603551d250101ff0416301406082b0601050507030206082b06010505070301300a06082a8648ce3d0403020349003046022100f5fbd1b41261451a44b0236b769d9f973e8083761bd56d246fdc2e25d6d1ed71022100e4cdc36166ba78593bb907b2065267838a595ae47edd80427e8b034201f8c8e2",
+    "pai_cert": "308201be30820164a00302010202080676e3d48faf5485300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200046fa6974e916a3136a2fbb352686387bbfa03ced00f4fef8fe03bc52ef9850564b089bc48535e9177453c80fb6d5d1cb62924a52d87ffc93bce7a3841a83b4931a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414e83beedeb8b896935f5181271297c76edda5d0c2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502201f32b837f5fa576b91caa6bef6ae2500de51b0b9113474f36e4dde8bcfb93694022100d005466eca37d941a6329b8f790497fa14f4876e66e805aa7f5e9148950c1d0d",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c3dceb4a5486a898f6620304bd70b3030ea9b419455aca2f5a67ca9e192b5ba3022100b7adae5df4362351230f9579dbee9af8946fce3b64b5bf9d596c838e3ffe57bb",
+    "dac_private_key": "a9085b85ea89397641a7544d3ab71dfa74da4ec131097e4ade9bd8a8410da89d",
+    "dac_public_key": "04c1af73f31aadf87241edcf509a2e804781c4543f899e798eb511750c3cb4dc845ef9dc8b37142ac86f5805603840700b03883796097e4c5c45ed080e9bc3bad0"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/cd.der
index 20f406019d8bd2..7e8fbfcf88fef1 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.der
index a2f6f62ba0f483..5ed1f431599682 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.pem
index cc13a5163a4ec4..35ff129ce2571c 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXGgAwIBAgIICD29n0uEuaUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIByzCCAXGgAwIBAgIIU0i3HVeHm2EwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATIgKBf2vixVN8MknKU2dqJ4bgFUgJG
-JHQwbrN8+7czOxl7n3TOwkjALx/qeI1CEVIxmrtTv/5PwkP3kP/jAFIro10wWzAM
-BgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQUaZih5aGpfxnxsuho
-Z5fBoZP1jmswHwYDVR0jBBgwFoAUgb10r/Jx1uLpC+1J31cNAxHCHEEwCgYIKoZI
-zj0EAwIDSQAwRgIhAJH8C7IVDtWZS/F0/QUFtq7Ov242AgwKQiiQ3Md/AUEuAiEA
-nDZmbhO2YYeuy1tZdrhDwMKGfaKf1vRSqb+V3bkOLKw=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQE1jXVvgfEMINmFW4iCaX9v5TMGPEe
+PHJNlpPY8eO6oSVoKC9Cu7Ve7eM4xS3UXBEq2AdBtoZWpwWAiOQTje++o10wWzAM
+BgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQUzF6lj8ZhNhCJSa+v
+0ErjUO6RcwAwHwYDVR0jBBgwFoAUPMWOxhmJnugcFjroveRlRM/gM44wCgYIKoZI
+zj0EAwIDSAAwRQIgN25qH3dMu8AUbP2wOFxjnyN6mpJWyfCR5kAAb6MHSAgCIQDb
+fVpnkUzIqYelvOPw6Fy3PZ9EUC5bGELVeTmOzG8zYQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.der
index 02be067f8660cd..5645a4f2589eca 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.pem
index 708c194d78e9b6..ea962b3fac263c 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOWHVTEaIgzM29oQ/a69kqtRGh3oxlaqaiFDU5ZnBpE2oAoGCCqGSM49
-AwEHoUQDQgAEyICgX9r4sVTfDJJylNnaieG4BVICRiR0MG6zfPu3MzsZe590zsJI
-wC8f6niNQhFSMZq7U7/+T8JD95D/4wBSKw==
+MHcCAQEEICSPv1pr27dGd0jcX85UTSQ5UNTa1jA61PoaDkZyKNROoAoGCCqGSM49
+AwEHoUQDQgAEBNY11b4HxDCDZhVuIgml/b+UzBjxHjxyTZaT2PHjuqElaCgvQru1
+Xu3jOMUt1FwRKtgHQbaGVqcFgIjkE43vvg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.der
index e462107e582bd0..e2657b60c9e759 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.pem
index 345e2baf47d1c8..6b9ae997908c00 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIF0ISKdLRvkMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIPW+12KmML+IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABE5C1XdbjU9Otv8iQvz9jVoN8y5reIGA/BkOazsf/O7SwBYNlkG0Q/uWxF/i
-kO7YuRZAHYxMAAACS+PoGCOUBu6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSBvXSv8nHW4ukL7UnfVw0DEcIcQTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-li6QUWEglbY3mg/fu+aTlaYdkAbGvips2KT4c3m6tcwCIEyOKuIqHmXOQok7o1aZ
-JFhO4IFHpQnaXZ+sfRJWzopT
+A0IABA3ZI9DeRpKFurvEey89yGL3iRimvuMnk3m0WxOd/EqmwfKW3py0mV/FN9/u
+hBpKn5n+3OID9XlDYS8NDxlGvJ+jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQ8xY7GGYme6BwWOui95GVEz+AzjjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBF
+/QUUvO0J8+dwzfceVlUj3XwZi9wabIfR0GCr4jh8dAIhAInCWGVPGon4/usPDuQv
+vZwM0+65h4UkpuZKxnZ7TgWL
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.der
index 129618e07b7090..a574156601ffc3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.pem
index 8adefd4cf6e640..bab72fb0a7cfba 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFVAx1lhhAglufmTpF3NUFs4K09XbeThYReS5WuUoRlloAoGCCqGSM49
-AwEHoUQDQgAETkLVd1uNT062/yJC/P2NWg3zLmt4gYD8GQ5rOx/87tLAFg2WQbRD
-+5bEX+KQ7ti5FkAdjEwAAAJL4+gYI5QG7g==
+MHcCAQEEIIpWmNro8ppkDUctUl0mnttHhs+gTGKlIPfGCQieiGTvoAoGCCqGSM49
+AwEHoUQDQgAEDdkj0N5GkoW6u8R7Lz3IYveJGKa+4yeTebRbE538SqbB8pbenLSZ
+X8U33+6EGkqfmf7c4gP1eUNhLw0PGUa8nw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/test_case_vector.json
index 3a16775c782edb..0617f430376521 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Key Usage extension critical field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201cc30820171a0030201020208083dbd9f4b84b9a5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c880a05fdaf8b154df0c927294d9da89e1b8055202462474306eb37cfbb7333b197b9f74cec248c02f1fea788d421152319abb53bffe4fc243f790ffe300522ba35d305b300c0603551d130101ff04023000300b0603551d0f040403020780301d0603551d0e041604146998a1e5a1a97f19f1b2e8686797c1a193f58e6b301f0603551d2304183016801481bd74aff271d6e2e90bed49df570d0311c21c41300a06082a8648ce3d040302034900304602210091fc0bb2150ed5994bf174fd0505b6aecebf6e36020c0a422890dcc77f01412e0221009c36666e13b66187aecb5b5976b843c0c2867da29fd6f452a9bf95ddb90e2cac",
-    "pai_cert": "308201be30820164a003020102020817421229d2d1be43300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044e42d5775b8d4f4eb6ff2242fcfd8d5a0df32e6b788180fc190e6b3b1ffceed2c0160d9641b443fb96c45fe290eed8b916401d8c4c0000024be3e818239406eea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041481bd74aff271d6e2e90bed49df570d0311c21c41301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100962e9051612095b6379a0fdfbbe69395a61d9006c6be2a6cd8a4f87379bab5cc02204c8e2ae22a1e65ce42893ba3569924584ee08147a509da5d9fac7d1256ce8a53",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210081ff40388849dde6a1e15c01e23b3017de4a262af8c150583956d0399405cde9022100fb9d7b29b86570de3d720c9da26ef05d97ef8b98bed27fd36c6de96942ee9c6e",
-    "dac_private_key": "e58755311a220cccdbda10fdaebd92ab511a1de8c656aa6a2143539667069136",
-    "dac_public_key": "04c880a05fdaf8b154df0c927294d9da89e1b8055202462474306eb37cfbb7333b197b9f74cec248c02f1fea788d421152319abb53bffe4fc243f790ffe300522b"
+    "dac_cert": "308201cb30820171a00302010202085348b71d57879b61300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000404d635d5be07c4308366156e2209a5fdbf94cc18f11e3c724d9693d8f1e3baa12568282f42bbb55eede338c52dd45c112ad80741b68656a7058088e4138defbea35d305b300c0603551d130101ff04023000300b0603551d0f040403020780301d0603551d0e04160414cc5ea58fc66136108949afafd04ae350ee917300301f0603551d230418301680143cc58ec619899ee81c163ae8bde46544cfe0338e300a06082a8648ce3d04030203480030450220376e6a1f774cbbc0146cfdb0385c639f237a9a9256c9f091e640006fa3074808022100db7d5a67914cc8a987a5bce3f0e85cb73d9f44502e5b1842d579398ecc6f3361",
+    "pai_cert": "308201be30820164a00302010202083d6fb5d8a98c2fe2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200040dd923d0de469285babbc47b2f3dc862f78918a6bee3279379b45b139dfc4aa6c1f296de9cb4995fc537dfee841a4a9f99fedce203f57943612f0d0f1946bc9fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604143cc58ec619899ee81c163ae8bde46544cfe0338e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022045fd0514bced09f3e770cdf71e565523dd7c198bdc1a6c87d1d060abe2387c7402210089c258654f1a89f8feeb0f0ee42fbd9c0cd3eeb9878524a6e64ac6767b4e058b",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022074621792528816a56829309de1dccf9d15d6346f2023f1a664a16b647fe97a43022100eb2eb9a4b1f738d462c578c18737bb30d321a2a89ca2d496f9dd4b5cbfc9fb28",
+    "dac_private_key": "248fbf5a6bdbb7467748dc5fce544d243950d4dad6303ad4fa1a0e467228d44e",
+    "dac_public_key": "0404d635d5be07c4308366156e2209a5fdbf94cc18f11e3c724d9693d8f1e3baa12568282f42bbb55eede338c52dd45c112ad80741b68656a7058088e4138defbe"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/cd.der
index 26ac4430a419fe..6adfc359a17632 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.der
index 808e5644882b38..31e39b04269d6e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.pem
index 90e16dfc2c6f32..a27e655ed353a9 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXGgAwIBAgIIHyc4fp/l248wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIByzCCAXGgAwIBAgIICZlZM0Z3/TQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ+JJlPhwbcOhtrKnHpTHkU50McaYJO
-MMHmxw37EoXPrMaPxcSVP+16kVrjjDcVSizTRBGPsbyGBo+fa5/u67pyo10wWzAM
-BgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQUh5MQbaepE+pfJJ3z
-kAD0lkKgkjwwHwYDVR0jBBgwFoAUEPHENTVRAuv5ZWOOPUy4z9Z4ZMkwCgYIKoZI
-zj0EAwIDSQAwRgIhAMqiSkrgvN2YfF9xNBYYzT1AlNpPKZ5Jwd9UWK0D2dg8AiEA
-jUq+ZkJzTZulGgPY8S1xfoAu6Fs2MKOEDIHiZFNlC+w=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATpzPb4wgjJVc4+JpJJMv8Xbz15JT4B
+M13s0+sFAF4HBVLJrpw6m1osQLPag7vXj6UdsEV5+Z06jh6AnLRBUduVo10wWzAM
+BgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQUJ+WQrvxURuAZWUzS
+GKJN2VJ71kcwHwYDVR0jBBgwFoAU9fQgz0+JaJYcqt1tgSKB2h5EdFAwCgYIKoZI
+zj0EAwIDSAAwRQIgRjZB6c4cNxvVgnrZ0sBd+ssh1JBrIwk6LQaxrffh7nYCIQCq
+l1odt6kMexfMggKReuI7/19hgPK/UT/4MTA3vNNBrw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.der
index aa71db8affd587..e102407def8414 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.pem
index 4cc6c6b462ad0c..77c5fc1aaf58ac 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPZ9KD83yq2KBKY4hHGsUw7OM9s7xEpwXRkyx5pB7ePUoAoGCCqGSM49
-AwEHoUQDQgAEPiSZT4cG3Dobaypx6Ux5FOdDHGmCTjDB5scN+xKFz6zGj8XElT/t
-epFa44w3FUos00QRj7G8hgaPn2uf7uu6cg==
+MHcCAQEEICewEpSBSxPfcbscSIzzmBDURhxHNwRxMGob8pAVoPuPoAoGCCqGSM49
+AwEHoUQDQgAE6cz2+MIIyVXOPiaSSTL/F289eSU+ATNd7NPrBQBeBwVSya6cOpta
+LECz2oO714+lHbBFefmdOo4egJy0QVHblQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.der
index 69d052b584a051..bb92ad28b56744 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.pem
index 1d01db923230e7..b36c07c3a2eabe 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIPzuxCtiGqRwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIdkfbc9deJ/gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABC5tmEEv4F7Dueh6yFoGrH+iprSb+bRe7mhAaHTHr/uuPyIAwqTViNtB02HF
-PIs8eZXqjyHczCpumgoNKX3jqSOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQQ8cQ1NVEC6/llY449TLjP1nhkyTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-2O3kAUHuRLl2yFZQEwChpswYzHhaiSt7Ie0rYEJ0f+wCIE1cteBlRIEM3TQa8h+u
-poQkrqtluOOZKQaTcgTusCUB
+A0IABDXUwRHti2Ua4k05pm11NMHOglX58U6K0GDcvJaWmg9/SaTdgn7G/MkluprF
+X/t6OgAde6+wOjQYwZggmbX8zR6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBT19CDPT4lolhyq3W2BIoHaHkR0UDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBr
+MkHQbUQ/iJYrkmirj8LnRWwDilkaKfLvVP+76fmrJQIhAM49p6UjVDW2h/oXrgLc
+h451YHDDgIwKNWsy+RLrHs9c
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.der
index c0c3bc0f7deddf..67c7a695f2429f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.pem
index 3a01ddd43dbc06..0ddbb10a75bee8 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINDZDOz/vG0l0EMygJh7nrvmg2yO5snHRxWH3E3PbjL8oAoGCCqGSM49
-AwEHoUQDQgAELm2YQS/gXsO56HrIWgasf6KmtJv5tF7uaEBodMev+64/IgDCpNWI
-20HTYcU8izx5leqPIdzMKm6aCg0pfeOpIw==
+MHcCAQEEICTLzJ8L0FAMCuyBH3WcamLT4iMHnC4iJ+KOADOrj0ReoAoGCCqGSM49
+AwEHoUQDQgAENdTBEe2LZRriTTmmbXU0wc6CVfnxTorQYNy8lpaaD39JpN2Cfsb8
+ySW6msVf+3o6AB17r7A6NBjBmCCZtfzNHg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/test_case_vector.json
index b49276fe7cefbc..ca136fa6d03771 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate Key Usage extension critical field is set as 'non-critical'",
     "is_success_case": "false",
-    "dac_cert": "308201cc30820171a00302010202081f27387e9fe5db8f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043e24994f8706dc3a1b6b2a71e94c7914e7431c69824e30c1e6c70dfb1285cfacc68fc5c4953fed7a915ae38c37154a2cd344118fb1bc86068f9f6b9feeebba72a35d305b300c0603551d130101ff04023000300b0603551d0f040403020780301d0603551d0e041604148793106da7a913ea5f249df39000f49642a0923c301f0603551d2304183016801410f1c435355102ebf965638e3d4cb8cfd67864c9300a06082a8648ce3d0403020349003046022100caa24a4ae0bcdd987c5f71341618cd3d4094da4f299e49c1df5458ad03d9d83c0221008d4abe6642734d9ba51a03d8f12d717e802ee85b3630a3840c81e26453650bec",
-    "pai_cert": "308201be30820164a00302010202083f3bb10ad886a91c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042e6d98412fe05ec3b9e87ac85a06ac7fa2a6b49bf9b45eee68406874c7affbae3f2200c2a4d588db41d361c53c8b3c7995ea8f21dccc2a6e9a0a0d297de3a923a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041410f1c435355102ebf965638e3d4cb8cfd67864c9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100d8ede40141ee44b976c856501300a1a6cc18cc785a892b7b21ed2b6042747fec02204d5cb5e06544810cdd341af21faea68424aeab65b8e3992906937204eeb02501",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022063f24991658339818362b591093d81af99b0fc5f62b0b207d49a9fbd1c1dd7a00221008b04dc9c94a0d53e8a9b8c96645ed146f8c464b46498f9ff24cd31fabb2b09ca",
-    "dac_private_key": "f67d283f37caad8a04a6388471ac530ece33db3bc44a705d1932c79a41ede3d4",
-    "dac_public_key": "043e24994f8706dc3a1b6b2a71e94c7914e7431c69824e30c1e6c70dfb1285cfacc68fc5c4953fed7a915ae38c37154a2cd344118fb1bc86068f9f6b9feeebba72"
+    "dac_cert": "308201cb30820171a0030201020208099959334677fd34300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e9ccf6f8c208c955ce3e26924932ff176f3d79253e01335decd3eb05005e070552c9ae9c3a9b5a2c40b3da83bbd78fa51db04579f99d3a8e1e809cb44151db95a35d305b300c0603551d130101ff04023000300b0603551d0f040403020780301d0603551d0e0416041427e590aefc5446e019594cd218a24dd9527bd647301f0603551d23041830168014f5f420cf4f8968961caadd6d812281da1e447450300a06082a8648ce3d04030203480030450220463641e9ce1c371bd5827ad9d2c05dfacb21d4906b23093a2d06b1adf7e1ee76022100aa975a1db7a90c7b17cc8202917ae23bff5f6180f2bf513ff8313037bcd341af",
+    "pai_cert": "308201be30820164a00302010202087647db73d75e27f8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000435d4c111ed8b651ae24d39a66d7534c1ce8255f9f14e8ad060dcbc96969a0f7f49a4dd827ec6fcc925ba9ac55ffb7a3a001d7bafb03a3418c1982099b5fccd1ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f5f420cf4f8968961caadd6d812281da1e447450301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502206b3241d06d443f88962b9268ab8fc2e7456c038a591a29f2ef54ffbbe9f9ab25022100ce3da7a5235435b687fa17ae02dc878e756070c3808c0a356b32f912eb1ecf5c",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220298b626198b5038bb9a7f79ba3ccc271208db7c3df475f3697807ee601e273390220121e915fecc02bf1715a32ed36bf696c62bbf89cba7747d9be787a7dba7cb353",
+    "dac_private_key": "27b01294814b13df71bb1c488cf39810d4461c47370471306a1bf29015a0fb8f",
+    "dac_public_key": "04e9ccf6f8c208c955ce3e26924932ff176f3d79253e01335decd3eb05005e070552c9ae9c3a9b5a2c40b3da83bbd78fa51db04579f99d3a8e1e809cb44151db95"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/cd.der
index 9166a85b28fd2e..b0898ec112d533 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.der
index 2e53ec30c5db79..3d9d9a6c201aee 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.pem
index b74a99658052b2..4fd910bfcd1fbc 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIINUZUEUcUPdEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIaODawAn0xwswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATyB9zkYmG0infcmClC3M5FxUhHA6UX
-LWzYMp6V3JuzUGivsugwbs1NAc3rVCDMDl3bqwnZFWIdpu41Q/AGVDs1o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIBgjAdBgNVHQ4EFgQUhrjpulwxu4PY
-LNnnMOUnOrmSwvswHwYDVR0jBBgwFoAUYrhZT57g3WGNSFQWQhpMZR8nYMIwCgYI
-KoZIzj0EAwIDSAAwRQIhAN6nOB8+LHfJ8pvan4PSMmcCDQI+3ywp30wfkdLclvba
-AiB0gZ/rXbwASJy6RyG0w7RavzJGNr9I7Jf9zSciZttEYQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARV4/1UgudGun/dWijgHljwLFhBaBtc
+lBNODTOG5IRbWXZfBl1FHgG6CJt6bV1Kpx6ChLDJz1YSWCgoKXxF117xo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIBgjAdBgNVHQ4EFgQUP3qqkta3bcM2
+R/aJwcWzjc8cFVkwHwYDVR0jBBgwFoAUW3QMVqwl2Qu8zHP4e2PNURpXzZUwCgYI
+KoZIzj0EAwIDSAAwRQIgRhIggLlPx3Z/y0O30rd+ZqkY/A+NeSq0EZEmUsg4JZwC
+IQCp6rUEbbyu+NKpGTGGqG/L7UK2UcbHT22m5SQ0m7wp3Q==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.der
index 35e4b6c5970e3c..625b9e9da89993 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.pem
index b7f6787f0ccf83..d1b3c499006ca3 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHBpgrjvSJKgTvtHczXdcUZdL+/BpXkwHQSCZ+WWXTq2oAoGCCqGSM49
-AwEHoUQDQgAE8gfc5GJhtIp33JgpQtzORcVIRwOlFy1s2DKeldybs1Bor7LoMG7N
-TQHN61QgzA5d26sJ2RViHabuNUPwBlQ7NQ==
+MHcCAQEEIGPZLhpqEKRTV66BEQcMv0NqXkI+hvqD6InMa/0yL/stoAoGCCqGSM49
+AwEHoUQDQgAEVeP9VILnRrp/3Voo4B5Y8CxYQWgbXJQTTg0zhuSEW1l2XwZdRR4B
+ugibem1dSqcegoSwyc9WElgoKCl8Rdde8Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.der
index 091719a13da44d..6bdb1c2e2b566e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.pem
index cc6bf7e94d2ef3..9c187d4b8e78f8 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIaR0KphHGlMYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIFXyM/lAN65EwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABOGay5ski9GjXnvF8ZZmFHWsM1e8H7lcqa/g0d8gd+AddLZ+jMSePM9QV97h
-cokjE9GOqxIy+7I3euk87PK4uMujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRiuFlPnuDdYY1IVBZCGkxlHydgwjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-xM/R5IWllfyd95IzkI19CvpalbE5LVToqiZiLv/SfLoCIQDmPUTZAn1bShuOG/wg
-roHGq/XLfIEfWCbEkm6xi7DZVw==
+A0IABC3PNWgETJSBzSxrCtS2dAUAYpoTGMi3OnQfF65jn7X1nxbHFc2yfpldOdzn
+i7gF7VCZ1oETEWtB+aeKLrTG1KSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRbdAxWrCXZC7zMc/h7Y81RGlfNlTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiA7
+IzUSr9qRN4jnQM4n/Abt3aYuBjSaywZrkKnxGjkEQwIhAI+oGYKQYr/YTY6Ccy6J
+Hc8+fGR1/l2DQeDrkYUiTJgn
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.der
index 0e814212e8a755..372a62415b0ccb 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.pem
index 225863a86a930f..779a149736413d 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJJ+YptyZIQIgD3Itq0HxfggBkcAfPojFf9uMTp38C3xoAoGCCqGSM49
-AwEHoUQDQgAE4ZrLmySL0aNee8XxlmYUdawzV7wfuVypr+DR3yB34B10tn6MxJ48
-z1BX3uFyiSMT0Y6rEjL7sjd66Tzs8ri4yw==
+MHcCAQEEICdJuQGdl8HKbTL3CJmeh5q1zGFFKfhQuQnx0bgLln9yoAoGCCqGSM49
+AwEHoUQDQgAELc81aARMlIHNLGsK1LZ0BQBimhMYyLc6dB8XrmOftfWfFscVzbJ+
+mV053OeLuAXtUJnWgRMRa0H5p4outMbUpA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/test_case_vector.json
index ba62fe2d54cde3..4066f7d309dddb 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
-    "description": "DAC Test Vector: Certificate Key Usage extension cRLSign field is wrong (present for DAC and not present for PAI",
+    "description": "DAC Test Vector: Certificate Key Usage extension cRLSign field is wrong (present for DAC and not present for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202083546541147143dd1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f207dce46261b48a77dc982942dcce45c5484703a5172d6cd8329e95dc9bb35068afb2e8306ecd4d01cdeb5420cc0e5ddbab09d915621da6ee3543f006543b35a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020182301d0603551d0e0416041486b8e9ba5c31bb83d82cd9e730e5273ab992c2fb301f0603551d2304183016801462b8594f9ee0dd618d485416421a4c651f2760c2300a06082a8648ce3d0403020348003045022100dea7381f3e2c77c9f29bda9f83d23267020d023edf2c29df4c1f91d2dc96f6da022074819feb5dbc00489cba4721b4c3b45abf324636bf48ec97fdcd272266db4461",
-    "pai_cert": "308201bf30820164a0030201020208691d0aa611c694c6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004e19acb9b248bd1a35e7bc5f196661475ac3357bc1fb95ca9afe0d1df2077e01d74b67e8cc49e3ccf5057dee172892313d18eab1232fbb2377ae93cecf2b8b8cba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041462b8594f9ee0dd618d485416421a4c651f2760c2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c4cfd1e485a595fc9df79233908d7d0afa5a95b1392d54e8aa26622effd27cba022100e63d44d9027d5b4a1b8e1bfc20ae81c6abf5cb7c811f5826c4926eb18bb0d957",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220397729bafdf75b1e98119268fbb593c5b7dcb1642938c6de4151652c98c30a22022100bbef4ad93734d15b544269d34aee23a9775cf505a2b1e861db09d43e8c7a4d19",
-    "dac_private_key": "706982b8ef4892a04efb477335dd71465d2fefc1a579301d048267e5965d3ab6",
-    "dac_public_key": "04f207dce46261b48a77dc982942dcce45c5484703a5172d6cd8329e95dc9bb35068afb2e8306ecd4d01cdeb5420cc0e5ddbab09d915621da6ee3543f006543b35"
+    "dac_cert": "308201ce30820174a003020102020868e0dac009f4c70b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000455e3fd5482e746ba7fdd5a28e01e58f02c5841681b5c94134e0d3386e4845b59765f065d451e01ba089b7a6d5d4aa71e8284b0c9cf5612582828297c45d75ef1a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020182301d0603551d0e041604143f7aaa92d6b76dc33647f689c1c5b38dcf1c1559301f0603551d230418301680145b740c56ac25d90bbccc73f87b63cd511a57cd95300a06082a8648ce3d0403020348003045022046122080b94fc7767fcb43b7d2b77e66a918fc0f8d792ab411912652c838259c022100a9eab5046dbcaef8d2a9193186a86fcbed42b651c6c74f6da6e524349bbc29dd",
+    "pai_cert": "308201be30820164a0030201020208157c8cfe500deb91300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042dcf3568044c9481cd2c6b0ad4b6740500629a1318c8b73a741f17ae639fb5f59f16c715cdb27e995d39dce78bb805ed5099d68113116b41f9a78a2eb4c6d4a4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145b740c56ac25d90bbccc73f87b63cd511a57cd95301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502203b233512afda913788e740ce27fc06eddda62e06349acb066b90a9f11a3904430221008fa819829062bfd84d8e82732e891dcf3e7c6475fe5d8341e0eb9185224c9827",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022038de2b21625bd80e63b2789ca3165c934ed6880ca7785570e9eac250042639e3022100f97714fa8caa770eb151ee032ddcf91e7e12cafaa89a2930f260e631b9d98419",
+    "dac_private_key": "63d92e1a6a10a45357ae8111070cbf436a5e423e86fa83e889cc6bfd322ffb2d",
+    "dac_public_key": "0455e3fd5482e746ba7fdd5a28e01e58f02c5841681b5c94134e0d3386e4845b59765f065d451e01ba089b7a6d5d4aa71e8284b0c9cf5612582828297c45d75ef1"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/cd.der
index 3b66b6e1bc5727..964f2fde2a9205 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.der
index 3caedbff1896db..71af3caa629e92 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.pem
index dca90f1e3af890..3b865564eb1a8f 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIIRTqr9WKWhnYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIIYRUWy16M5XswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ/m//oa4u9Tye7qP4tLi6hPDz4uu/k
-RRINQPJ0MlLvBanrT1N9w+O6uOERdnmOkXWH+AzCjiFl/1ZRfg73Vlzro2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFIDAdBgNVHQ4EFgQUVBeUJrjYUr9k
-PNGp33vSouHdOdUwHwYDVR0jBBgwFoAUoT/Sm2NcC+tI/Aflzw/dT/7MuBkwCgYI
-KoZIzj0EAwIDSQAwRgIhANdkSzkqIHYBvIRdA3+85PpbokXnfqsRfmweyCsE77QY
-AiEA9gAc80Ie5BX1a7nVtdwoKRXq6Gi9/Y341B6Kv8M8niY=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARFtQ/f4cxIUj6oDqhnc2EdUH/W19+W
+uXoA5lEY6Qiy6N6A3jRSLvoENnHEJki40a1dTUl/K2i7J1p9XvXMl3Q5o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFIDAdBgNVHQ4EFgQU87wX5o+7Cf8q
+d/fwZJmzK5HXTQEwHwYDVR0jBBgwFoAUpm6TBaCgvf5Qfimuni4Pqe1hySAwCgYI
+KoZIzj0EAwIDRwAwRAIgU1Ku0RyopJq5/RIhzeXvkKmT94r1VICvzgcO6SiIBpgC
+IC5A5nV7l/mlWqansgSLIKNTeieHaxEeDrKzIXJNkuz8
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.der
index a81b19fcd2b69a..e8d8d5b039c18f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.pem
index f9ccd29b8732fa..75b77412e79d24 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGEvh5IQprakp2GiM2Vmxui80SMZ4lpTXi7IgA/Z83C0oAoGCCqGSM49
-AwEHoUQDQgAEP5v/6GuLvU8nu6j+LS4uoTw8+Lrv5EUSDUDydDJS7wWp609TfcPj
-urjhEXZ5jpF1h/gMwo4hZf9WUX4O91Zc6w==
+MHcCAQEEIP+AAW0SPOnJa64XNeKpHJMWTj3Hzfd23LQCZq996C0VoAoGCCqGSM49
+AwEHoUQDQgAERbUP3+HMSFI+qA6oZ3NhHVB/1tfflrl6AOZRGOkIsujegN40Ui76
+BDZxxCZIuNGtXU1JfytouydafV71zJd0OQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.der
index 98bbe8cb73c9ec..5560f07d8f1cc0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.pem
index 3139e9d3e6db0b..d306ec743b51a3 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIYlEnLuWcCfYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvTCCAWSgAwIBAgIIXO1pVr6KpjswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCW4iOdLy/PArgHgDG5c5IW9EvgH7XnQU/h4XJjdFd3jFwdKMbtZB77WqB0O
-1LMAEO3lWgiIrXH6STb4ymmpZUOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBShP9KbY1wL60j8B+XPD91P/sy4GTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiB0
-65Ir9/A/YHu1OF+D9M1QFkSbPlCuMvc+RhBhcbwVVgIhALdeU2hIWYI5MiHZHIj1
-8lNkZWYeoiTi5sk8yUZsxYYM
+A0IABM8YITtIyb9zAXhUFMzeab1qxyEsyuD0H9TWeztljTb2CmCXirdSKziZyBX+
+N0eV56mU1tEev8JAMhBZn7d46X2jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSmbpMFoKC9/lB+Ka6eLg+p7WHJIDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBc
+4tSTHA8W3z7i17fAVm4QOv9NWpdcE5ypJqeB2lCj8AIgXlaGKwN20G9DeVGbGeNz
+HyGqKHKSgWuv/hVwAxqlBlY=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.der
index d0dc237eee6682..9cf8037c8fbd79 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.pem
index 549b7993188c86..95b85580ef7a4c 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHKtUlc8WckhPrC/mV5rAmHAYkn1LwzAOB//x/QQMaWvoAoGCCqGSM49
-AwEHoUQDQgAEJbiI50vL88CuAeAMblzkhb0S+AftedBT+HhcmN0V3eMXB0oxu1kH
-vtaoHQ7UswAQ7eVaCIitcfpJNvjKaallQw==
+MHcCAQEEIAyuSRWJ3trtBBCE6EBV/55sGK0HfQ+d4mfr5H1DeichoAoGCCqGSM49
+AwEHoUQDQgAEzxghO0jJv3MBeFQUzN5pvWrHISzK4PQf1NZ7O2WNNvYKYJeKt1Ir
+OJnIFf43R5XnqZTW0R6/wkAyEFmft3jpfQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json
index 818500fe2f8170..212a0ac5f3935d 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
-    "description": "DAC Test Vector: Certificate Key Usage extension diginalSignature field is wrong (not present for DAC and present for PAI",
+    "description": "DAC Test Vector: Certificate Key Usage extension diginalSignature field is wrong (not present for DAC and present for PAI, which is OK as optional)",
     "is_success_case": "false",
-    "dac_cert": "308201cf30820174a0030201020208453aabf562968676300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043f9bffe86b8bbd4f27bba8fe2d2e2ea13c3cf8baefe445120d40f2743252ef05a9eb4f537dc3e3bab8e11176798e917587f80cc28e2165ff56517e0ef7565ceba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020520301d0603551d0e0416041454179426b8d852bf643cd1a9df7bd2a2e1dd39d5301f0603551d23041830168014a13fd29b635c0beb48fc07e5cf0fdd4ffeccb819300a06082a8648ce3d0403020349003046022100d7644b392a207601bc845d037fbce4fa5ba245e77eab117e6c1ec82b04efb418022100f6001cf3421ee415f56bb9d5b5dc282915eae868bdfd8df8d41e8abfc33c9e26",
-    "pai_cert": "308201be30820164a00302010202086251272ee59c09f6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000425b888e74bcbf3c0ae01e00c6e5ce485bd12f807ed79d053f8785c98dd15dde317074a31bb5907bed6a81d0ed4b30010ede55a0888ad71fa4936f8ca69a96543a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a13fd29b635c0beb48fc07e5cf0fdd4ffeccb819301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022074eb922bf7f03f607bb5385f83f4cd5016449b3e50ae32f73e46106171bc1556022100b75e5368485982393221d91c88f5f2536465661ea224e2e6c93cc9466cc5860c",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100f654e93ec3088c86d9bfb5bf43a83e39b4a0444d266eb0d2ac4f365b29795b6902207de15c476f0060ada890f16d4aa59d73b12195eb654b8e49987c78fbf2e4a3a9",
-    "dac_private_key": "612f879210a6b6a4a761a2336566c6e8bcd12319e25a535e2ec8800fd9f370b4",
-    "dac_public_key": "043f9bffe86b8bbd4f27bba8fe2d2e2ea13c3cf8baefe445120d40f2743252ef05a9eb4f537dc3e3bab8e11176798e917587f80cc28e2165ff56517e0ef7565ceb"
+    "dac_cert": "308201cd30820174a0030201020208611516cb5e8ce57b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000445b50fdfe1cc48523ea80ea86773611d507fd6d7df96b97a00e65118e908b2e8de80de34522efa043671c42648b8d1ad5d4d497f2b68bb275a7d5ef5cc977439a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020520301d0603551d0e04160414f3bc17e68fbb09ff2a77f7f06499b32b91d74d01301f0603551d23041830168014a66e9305a0a0bdfe507e29ae9e2e0fa9ed61c920300a06082a8648ce3d040302034700304402205352aed11ca8a49ab9fd1221cde5ef90a993f78af55480afce070ee92888069802202e40e6757b97f9a55aa6a7b2048b20a3537a27876b111e0eb2b321724d92ecfc",
+    "pai_cert": "308201bd30820164a00302010202085ced6956be8aa63b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004cf18213b48c9bf7301785414ccde69bd6ac7212ccae0f41fd4d67b3b658d36f60a60978ab7522b3899c815fe374795e7a994d6d11ebfc2403210599fb778e97da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a66e9305a0a0bdfe507e29ae9e2e0fa9ed61c920301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402205ce2d4931c0f16df3ee2d7b7c0566e103aff4d5a975c139ca926a781da50a3f002205e56862b0376d06f4379519b19e3731f21aa287292816baffe1570031aa50656",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100a561ca1272a12d7e6edd2b0cac5767b57e4c24c08ab9089b5494feea9090b6d902201c80bc16baca9f9f0c82f8fa96e3243e87506ac1061a0e3c4bf7ed99ab7bc43a",
+    "dac_private_key": "ff80016d123ce9c96bae1735e2a91c93164e3dc7cdf776dcb40266af7de82d15",
+    "dac_public_key": "0445b50fdfe1cc48523ea80ea86773611d507fd6d7df96b97a00e65118e908b2e8de80de34522efa043671c42648b8d1ad5d4d497f2b68bb275a7d5ef5cc977439"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/cd.der
index 179a413ef03e93..e12bb2d572866b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.der
index 170aac2570d864..ee64a371633679 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
index cb1aae4d2e049c..ecdaee9250c3bb 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIEFzJpffHmzgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIITOyjH+jMHQ0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATElkJfuv068x1zIFHtXphRjWLztIAp
-FDFUSoEIplTxRWJbmJPfXHnZKg+Rt8cLHt+TuMB8yC1ITcO2kQX41Lcvo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIChDAdBgNVHQ4EFgQUEgbY7QCPx4UZ
-1nyLihEPdor+eyowHwYDVR0jBBgwFoAUoF8R/mi8GkUgKLc9LbYshaTGjiYwCgYI
-KoZIzj0EAwIDSAAwRQIgdZbk3r6RJU6dmMixTJprhWut7OZoRJn6NPL1Pn33hBkC
-IQDaIMbIrVnDJufmV55E34yXGNXipkYHAknrRD2YP7e5Qg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATcIBnNwZhIb7EFqlha4rev6f3jzZVM
+5ot+va69GLyq3odjr3JnPOSyB7d0DYMI1wh7aGOP6okmSWY12cWErce9o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIChDAdBgNVHQ4EFgQUrVKFKVmISd9n
+HCLrhSbJ4P2ZyjMwHwYDVR0jBBgwFoAUSt9FOdGQLAuSkf3NH1ApvzUt0XkwCgYI
+KoZIzj0EAwIDRwAwRAIgDxlIBlsZjwRVTdOTt9d4s/L74EoK1netLpmR2oIpF6AC
+IC3EVA4rtjk7dogwVHVTz1q9Zc1HZrA0oz8rmOIKngQv
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.der
index fecc6ebc8d4721..6492e845eacc03 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
index b83d900c37ae5c..401005dbf004ba 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIG3J9DoGDFKEi1zN2Hary9sENsGapb1z27J/itHl/T+GoAoGCCqGSM49
-AwEHoUQDQgAExJZCX7r9OvMdcyBR7V6YUY1i87SAKRQxVEqBCKZU8UViW5iT31x5
-2SoPkbfHCx7fk7jAfMgtSE3DtpEF+NS3Lw==
+MHcCAQEEIBUUtcaYMFmRwiTp+3FRJmfIzLySXo6Km4Ze+mRwGIu2oAoGCCqGSM49
+AwEHoUQDQgAE3CAZzcGYSG+xBapYWuK3r+n9482VTOaLfr2uvRi8qt6HY69yZzzk
+sge3dA2DCNcIe2hjj+qJJklmNdnFhK3HvQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.der
index 96769eccacb8f5..5f7aced7c65c73 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
index 917d03d73c7a1f..245a4b1c3a7c3d 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIS62vBYyR3KowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWSgAwIBAgIIaT9nTmzrN6IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABC74mTKv+McrY2USE6hPfvLkME1Mq6PvFlM/nRoMA92U2PH0jmp1OacubX0Y
-5JLSWCByvHykQhaO+qABuXEqnU2jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSgXxH+aLwaRSAotz0ttiyFpMaOJjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiB0
-KIzSf+DRUL3NsWaSJ7OTKFIyIYYb/DmGm6UbfOstXAIga9Piwn8L8EUlDZsMOd9Z
-NoA6j7rB2vFLJ0TF4dWRWvg=
+A0IABC7ewm/8tKTuMCAqNIli1QIGo0CgpnGTATAPmn7wuRm4nJcTnXBeUv8Ll5W7
+94XvIvt/suMnDFU67uMx7/cAb8qjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRK30U50ZAsC5KR/c0fUCm/NS3ReTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+yaXSFohjyAghro/a0SQK6DK13IjZVIxiKFsshBs16MQCIQD25ZcvKxozJ5+31B1H
+8jWRl381jECe8L33AS+OijQXzQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.der
index eef244af59e08d..f8ecf37337e621 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
index 237b69f733c483..23a939fcf76a11 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJiE5akYkkk/sTLIDSkL/8P8Vk4zYminGJqddBCehLFtoAoGCCqGSM49
-AwEHoUQDQgAELviZMq/4xytjZRITqE9+8uQwTUyro+8WUz+dGgwD3ZTY8fSOanU5
-py5tfRjkktJYIHK8fKRCFo76oAG5cSqdTQ==
+MHcCAQEEIDkG6beB9cVmxYfT2ajlLfq0H76bk1HU4cakZXbiEGt+oAoGCCqGSM49
+AwEHoUQDQgAELt7Cb/y0pO4wICo0iWLVAgajQKCmcZMBMA+afvC5GbiclxOdcF5S
+/wuXlbv3he8i+3+y4ycMVTru4zHv9wBvyg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
index 20ddc1f2cb6a3a..bb3c12e010b7c2 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
-    "description": "DAC Test Vector: Certificate Key Usage extension keyCertSign field is wrong (present for DAC and not present for PAI",
+    "description": "DAC Test Vector: Certificate Key Usage extension keyCertSign field is wrong (present for DAC and not present for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208105cc9a5f7c79b38300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c496425fbafd3af31d732051ed5e98518d62f3b480291431544a8108a654f145625b9893df5c79d92a0f91b7c70b1edf93b8c07cc82d484dc3b69105f8d4b72fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020284301d0603551d0e041604141206d8ed008fc78519d67c8b8a110f768afe7b2a301f0603551d23041830168014a05f11fe68bc1a452028b73d2db62c85a4c68e26300a06082a8648ce3d040302034800304502207596e4debe91254e9d98c8b14c9a6b856badece6684499fa34f2f53e7df78419022100da20c6c8ad59c326e7e6579e44df8c9718d5e2a646070249eb443d983fb7b942",
-    "pai_cert": "308201bd30820164a00302010202084badaf058c91dcaa300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042ef89932aff8c72b63651213a84f7ef2e4304d4caba3ef16533f9d1a0c03dd94d8f1f48e6a7539a72e6d7d18e492d2582072bc7ca442168efaa001b9712a9d4da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a05f11fe68bc1a452028b73d2db62c85a4c68e26301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022074288cd27fe0d150bdcdb1669227b39328523221861bfc39869ba51b7ceb2d5c02206bd3e2c27f0bf045250d9b0c39df5936803a8fbac1daf14b2744c5e1d5915af8",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100f27491ed3abbac4375ee77fc53583a8efa8a899ec514c49a3a2e320cfafd8dd8022100faf829ef4b02257e2b22ab8e0b94faec89d10e9c64e16508e407477404ce67a4",
-    "dac_private_key": "6dc9f43a060c52848b5ccdd876abcbdb0436c19aa5bd73dbb27f8ad1e5fd3f86",
-    "dac_public_key": "04c496425fbafd3af31d732051ed5e98518d62f3b480291431544a8108a654f145625b9893df5c79d92a0f91b7c70b1edf93b8c07cc82d484dc3b69105f8d4b72f"
+    "dac_cert": "308201cd30820174a00302010202084ceca31fe8cc1d0d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004dc2019cdc198486fb105aa585ae2b7afe9fde3cd954ce68b7ebdaebd18bcaade8763af72673ce4b207b7740d8308d7087b68638fea8926496635d9c584adc7bda360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020284301d0603551d0e04160414ad528529598849df671c22eb8526c9e0fd99ca33301f0603551d230418301680144adf4539d1902c0b9291fdcd1f5029bf352dd179300a06082a8648ce3d040302034700304402200f1948065b198f04554dd393b7d778b3f2fbe04a0ad677ad2e9991da822917a002202dc4540e2bb6393b768830547553cf5abd65cd4766b034a33f2b98e20a9e042f",
+    "pai_cert": "308201bf30820164a0030201020208693f674e6ceb37a2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042edec26ffcb4a4ee30202a348962d50206a340a0a6719301300f9a7ef0b919b89c97139d705e52ff0b9795bbf785ef22fb7fb2e3270c553aeee331eff7006fcaa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144adf4539d1902c0b9291fdcd1f5029bf352dd179301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c9a5d2168863c80821ae8fdad1240ae832b5dc88d9548c62285b2c841b35e8c4022100f6e5972f2b1a33279fb7d41d47f23591977f358c409ef0bdf7012f8e8a3417cd",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e0c8bcd6f8b5eb6d16250a0687afcfcc61015d83b1ec39eb5bdcc189d0e5048b022100c6a3c7a04eb90cdf844ab205d61f86377829f3051f41509c505e94077ff39f0c",
+    "dac_private_key": "1514b5c698305991c224e9fb71512667c8ccbc925e8e8a9b865efa6470188bb6",
+    "dac_public_key": "04dc2019cdc198486fb105aa585ae2b7afe9fde3cd954ce68b7ebdaebd18bcaade8763af72673ce4b207b7740d8308d7087b68638fea8926496635d9c584adc7bd"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/cd.der
index 59c7bbab3d6ac9..42dc40268f1903 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.der
index 2dae056e6c04fc..2d6511bc2c6142 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.pem
index 7feab06342f937..a5b628158747d7 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIILLkbpYQ7XZ0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvTCCAWSgAwIBAgIIIVBE3OJ+sQIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS6f1g29eaOXxXJt8iKFYfuTN5sPFEL
-5T/8BqUUowmCmuGzq2c/TCk5Jz6iX6daTrGwafJRSeGijrvJM4KvJ5a1o1AwTjAM
-BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQVIWqdUt3bmeDdq1W1g9jlTopb/DAfBgNV
-HSMEGDAWgBRIFeSyHHp7Ykk3ee7gRUF7Mab04zAKBggqhkjOPQQDAgNIADBFAiBm
-nJBxL05ZjI4+5hdbIT+VcbmgkyDPfqQHetFX+I5sJQIhAPm468gvg8Hu5DR5g3KI
-dFonIfhop+Ph2AeKDLAd/ohO
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARhKqxttj5XZWcf5Q+IH8npCjisH79J
+SQds4ljDkOV+Ia3pFoKK+yiEv4iVpiEnL7QA1okWPbEWrNtdpGT/BGCso1AwTjAM
+BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSJuRcBMlzlJffB/FzM7+z2IYtx8DAfBgNV
+HSMEGDAWgBRzKN2+7OAK6E7/DPlHvLCoWL/Q3DAKBggqhkjOPQQDAgNHADBEAiBR
+A8RCDJbGQfl021/ts/LBLC2iEdTyC6LSy1UYOy3s6AIgAZldq4InPyUrbp4Tzd5M
+Uq/Kf+bT1G0y3+aLxtICnBk=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.der
index 09c0ba47ad4112..8d33465a10c4a0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.pem
index ec116633045957..d95d3c97889da5 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGt1612Qt6fa16B3nrv7M9chALlRXWxnWT6flgVddtM1oAoGCCqGSM49
-AwEHoUQDQgAEun9YNvXmjl8VybfIihWH7kzebDxRC+U//AalFKMJgprhs6tnP0wp
-OSc+ol+nWk6xsGnyUUnhoo67yTOCryeWtQ==
+MHcCAQEEIE5W1Ax+oaBB731RILGafk4ZBs8ooefk8cbVldtpnVzloAoGCCqGSM49
+AwEHoUQDQgAEYSqsbbY+V2VnH+UPiB/J6Qo4rB+/SUkHbOJYw5DlfiGt6RaCivso
+hL+IlaYhJy+0ANaJFj2xFqzbXaRk/wRgrA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.der
index 414d4d00f8d37f..69cb9a4077d123 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.pem
index 224c13beea5be4..a83af329577f6f 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIZkLTNfx+qXwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIEAQdKr3isS4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABJr6Hsmx2I4Cl4+H4JRTEKek9L4IK0XI2DzCnPOlrp+uzdg2XgbR4Rsx6z6S
-/RYwzdfPhWbaZZ6E/AQDrUxiOXajZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRIFeSyHHp7Ykk3ee7gRUF7Mab04zAfBgNV
+A0IABFi+UMq+sglzgwetyVPh19mEG2A8gX0UEodw6zIK+pgEkLdJws2dFzx/pwz1
+XcUjqnbBcaEN85W2LkeoZ9VuJtyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRzKN2+7OAK6E7/DPlHvLCoWL/Q3DAfBgNV
 HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-5QRyuuGFODrsrt8Na8XleLK5vwtFsagWx57fnXP8kooCIBH9kEEW0OguDhxmt4+k
-hHLcZQR5s08c/e2xKBcP3k9b
+5ZbkjNQj65VA+GEzbX56HgUkWlAQG52QQ4DqhmRinmwCIH39vJfhK4PpofzgLlMr
+CMpuKr++qLMj2jWtm07XuQoq
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.der
index f49c7f572671b0..f9d3abf5bb4215 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.pem
index defc1df07c5957..171bddf5e3732e 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPmKKIgXtkj3f+ZW1o+UgcSEeO4T3Lm+hAcp/puWF6mmoAoGCCqGSM49
-AwEHoUQDQgAEmvoeybHYjgKXj4fglFMQp6T0vggrRcjYPMKc86Wun67N2DZeBtHh
-GzHrPpL9FjDN18+FZtplnoT8BAOtTGI5dg==
+MHcCAQEEICyARzGPYVdq8MtXXsr9hVXCNmfGPs2FrQdCPfX5zHx4oAoGCCqGSM49
+AwEHoUQDQgAEWL5Qyr6yCXODB63JU+HX2YQbYDyBfRQSh3DrMgr6mASQt0nCzZ0X
+PH+nDPVdxSOqdsFxoQ3zlbYuR6hn1W4m3A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/test_case_vector.json
index 16b8cb406bb7eb..014486db725b2a 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate doesn't include Key Usage extension",
     "is_success_case": "false",
-    "dac_cert": "308201be30820164a00302010202082cb91ba5843b5d9d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ba7f5836f5e68e5f15c9b7c88a1587ee4cde6c3c510be53ffc06a514a309829ae1b3ab673f4c2939273ea25fa75a4eb1b069f25149e1a28ebbc93382af2796b5a350304e300c0603551d130101ff04023000301d0603551d0e0416041415216a9d52dddb99e0ddab55b583d8e54e8a5bfc301f0603551d230418301680144815e4b21c7a7b62493779eee045417b31a6f4e3300a06082a8648ce3d04030203480030450220669c90712f4e598c8e3ee6175b213f9571b9a09320cf7ea4077ad157f88e6c25022100f9b8ebc82f83c1eee43479837288745a2721f868a7e3e1d8078a0cb01dfe884e",
-    "pai_cert": "308201be30820164a00302010202086642d335fc7ea97c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200049afa1ec9b1d88e02978f87e0945310a7a4f4be082b45c8d83cc29cf3a5ae9faecdd8365e06d1e11b31eb3e92fd1630cdd7cf8566da659e84fc0403ad4c623976a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144815e4b21c7a7b62493779eee045417b31a6f4e3301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100e50472bae185383aecaedf0d6bc5e578b2b9bf0b45b1a816c79edf9d73fc928a022011fd904116d0e82e0e1c66b78fa48472dc650479b34f1cfdedb128170fde4f5b",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e7e2133661819f1fda524215132e8cef6ae8eafaeb086e0cdfadc71f84a94d35022100894acf7d1e121dd659f1798ffd532d8267996437fb2be132699ea8bca2386acf",
-    "dac_private_key": "6b75eb5d90b7a7dad7a0779ebbfb33d72100b9515d6c67593e9f96055d76d335",
-    "dac_public_key": "04ba7f5836f5e68e5f15c9b7c88a1587ee4cde6c3c510be53ffc06a514a309829ae1b3ab673f4c2939273ea25fa75a4eb1b069f25149e1a28ebbc93382af2796b5"
+    "dac_cert": "308201bd30820164a0030201020208215044dce27eb102300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004612aac6db63e5765671fe50f881fc9e90a38ac1fbf4949076ce258c390e57e21ade916828afb2884bf8895a621272fb400d689163db116acdb5da464ff0460aca350304e300c0603551d130101ff04023000301d0603551d0e0416041489b91701325ce525f7c1fc5cccefecf6218b71f0301f0603551d230418301680147328ddbeece00ae84eff0cf947bcb0a858bfd0dc300a06082a8648ce3d040302034700304402205103c4420c96c641f974db5fedb3f2c12c2da211d4f20ba2d2cb55183b2dece8022001995dab82273f252b6e9e13cdde4c52afca7fe6d3d46d32dfe68bc6d2029c19",
+    "pai_cert": "308201be30820164a003020102020810041d2abde2b12e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000458be50cabeb209738307adc953e1d7d9841b603c817d14128770eb320afa980490b749c2cd9d173c7fa70cf55dc523aa76c171a10df395b62e47a867d56e26dca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147328ddbeece00ae84eff0cf947bcb0a858bfd0dc301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100e596e48cd423eb9540f861336d7e7a1e05245a50101b9d904380ea8664629e6c02207dfdbc97e12b83e9a1fce02e532b08ca6e2abfbea8b323da35ad9b4ed7b90a2a",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221008045ad78fe8fad5793f806a2b9f0a09cb1dfe5d56bf8634d5d8b7fa78783c9d402207463239b653f440d424d9ae9a3806918c6c9257e7ec0ed8f2813762c2487c45d",
+    "dac_private_key": "4e56d40c7ea1a041ef7d5120b19a7e4e1906cf28a1e7e4f1c6d595db699d5ce5",
+    "dac_public_key": "04612aac6db63e5765671fe50f881fc9e90a38ac1fbf4949076ce258c390e57e21ade916828afb2884bf8895a621272fb400d689163db116acdb5da464ff0460ac"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/cd.der
index 0f75249fcfc9f6..686e15934072bd 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.der
index b18f607eedb6d3..93ca3f1c394bf8 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.pem
index c8a285ae92ab7a..c641ec2a1a1b78 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBrjCCAVWgAwIBAgIIGlc9slQjp0gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBrzCCAVWgAwIBAgIIFiTtxmBc7PwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQHlbKCWxGqTA6BgUw1hnMptlyEmEw6
-ntu2Us8Pa9FKC2sK+RRVYQqNy+2RVE9B0U8KjQkxF/7C2yGiHpqjIjwHo0EwPzAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAfBgNVHSMEGDAWgBQ5CIys5asK
-uUW4Fe4KhIQzdzP6XjAKBggqhkjOPQQDAgNHADBEAiA6+wVv41VQKm+oJRoHF7F3
-Q3tYuUKCCIGo9KreceA/bgIgYlGOAuTf1iWyTyC1p3sq+oKEJ+YXBhZcKaNuyjrn
-aMA=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATx0xpHoc11Xife5RGi/G2de3NyQvQv
+8K4OMLu9rCkrXAV17C6jV7VfI+efSbigDda+dTQTsDVNYNfmSs4oaeTxo0EwPzAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAfBgNVHSMEGDAWgBRLrqaymILc
+jZULJWVbUSX6M33RkzAKBggqhkjOPQQDAgNIADBFAiA6HnfiTUqqgjX5D7mG2N1G
+UCPhz9itxvJEU3d7CjRf0QIhAM9pmbZXiBVvSC3LsYlOl0a6h4TzSRmtd10zUQcn
+aAIR
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.der
index bfeb09651ed853..4008ca51a5eea6 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.pem
index 15386d4d57358f..b14d82e9acfff9 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMXFNJsIIpOdeWsJSh/YXjUggHJUqE0EYUUU3WZsT9SsoAoGCCqGSM49
-AwEHoUQDQgAEB5WyglsRqkwOgYFMNYZzKbZchJhMOp7btlLPD2vRSgtrCvkUVWEK
-jcvtkVRPQdFPCo0JMRf+wtshoh6aoyI8Bw==
+MHcCAQEEIPwbXT5rSM6RZ+btOpSq1KH02x94BIHatbDkySroARbGoAoGCCqGSM49
+AwEHoUQDQgAE8dMaR6HNdV4n3uURovxtnXtzckL0L/CuDjC7vawpK1wFdewuo1e1
+XyPnn0m4oA3WvnU0E7A1TWDX5krOKGnk8Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.der
index 55050d57802d87..8527ba801a9d82 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.pem
index 60986d6c054633..23c55b38835c3d 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIICBfIudGa3bYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvTCCAWSgAwIBAgIIdelIA18it8AwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABGsLnAET681H1jjmO8ZKp6D/QCt/22ezzUgNphtkwnN1TMc9QAJKFmgAgooU
-9Ak1NGJengqV0vgT+aY5dYJC/mSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQ5CIys5asKuUW4Fe4KhIQzdzP6XjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-pw4Ao5XDw1ryYrCsQDDWsqyaJlUf2CS5zKTql+CptHMCIQCSqxRjutpEUIYnK0Iz
-WmzQ5Fbcuhp5dFebGRlywOjFKw==
+A0IABCxP97w8HqLuRZc5IbH1AHyhHUN0Bly+1jMaBndGcKEan9+Um4fDmyhEH9cp
+fly4u3dq0Ww1TBCdg9T2WA9TDI6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRLrqaymILcjZULJWVbUSX6M33RkzAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBj
+EaRF/LwgdVmJO2clgD8QDECVLvVIrKmWoqoYEskI5wIgX3gk2THoSLCIcLehP9Pc
+0xKI+bt3NsVw4nQZqTLmpK0=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.der
index 34dba0b872ff61..30e3a2057cad68 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.pem
index c277ece82908f1..2a2897b94c961c 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEf+cUcFqaCdxib5MzieWphhOturjsNeoHdadtTJMU8zoAoGCCqGSM49
-AwEHoUQDQgAEawucARPrzUfWOOY7xkqnoP9AK3/bZ7PNSA2mG2TCc3VMxz1AAkoW
-aACCihT0CTU0Yl6eCpXS+BP5pjl1gkL+ZA==
+MHcCAQEEIDHETF0+FIL4TOCE7UnPVNiDa5mG7ThaS+GbkqC/HRbsoAoGCCqGSM49
+AwEHoUQDQgAELE/3vDweou5FlzkhsfUAfKEdQ3QGXL7WMxoGd0ZwoRqf35Sbh8Ob
+KEQf1yl+XLi7d2rRbDVMEJ2D1PZYD1MMjg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/test_case_vector.json
index ef18ed644bb330..e5ae862e44b3d2 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate doesn't include Subject Key ID (SKID) extension",
     "is_success_case": "false",
-    "dac_cert": "308201ae30820155a00302010202081a573db25423a748300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040795b2825b11aa4c0e81814c35867329b65c84984c3a9edbb652cf0f6bd14a0b6b0af91455610a8dcbed91544f41d14f0a8d093117fec2db21a21e9aa3223c07a341303f300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301f0603551d2304183016801439088cace5ab0ab945b815ee0a8484337733fa5e300a06082a8648ce3d040302034700304402203afb056fe355502a6fa8251a0717b177437b58b942820881a8f4aade71e03f6e022062518e02e4dfd625b24f20b5a77b2afa828427e61706165c29a36eca3ae768c0",
-    "pai_cert": "308201bf30820164a00302010202080817c8b9d19addb6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200046b0b9c0113ebcd47d638e63bc64aa7a0ff402b7fdb67b3cd480da61b64c273754cc73d40024a166800828a14f4093534625e9e0a95d2f813f9a639758242fe64a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041439088cace5ab0ab945b815ee0a8484337733fa5e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a70e00a395c3c35af262b0ac4030d6b2ac9a26551fd824b9cca4ea97e0a9b47302210092ab1463bada445086272b42335a6cd0e456dcba1a7974579b191972c0e8c52b",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402204ffce6c7e7a792ed9ddad787378d6d9248d720650f62bb3ddb5ff521743fac56022063ce1f4a2408dffbb08b5eccd6a4f57c7269ae09c77bee48377d31918c4de4b1",
-    "dac_private_key": "c5c5349b0822939d796b094a1fd85e3520807254a84d04614514dd666c4fd4ac",
-    "dac_public_key": "040795b2825b11aa4c0e81814c35867329b65c84984c3a9edbb652cf0f6bd14a0b6b0af91455610a8dcbed91544f41d14f0a8d093117fec2db21a21e9aa3223c07"
+    "dac_cert": "308201af30820155a00302010202081624edc6605cecfc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f1d31a47a1cd755e27dee511a2fc6d9d7b737242f42ff0ae0e30bbbdac292b5c0575ec2ea357b55f23e79f49b8a00dd6be753413b0354d60d7e64ace2869e4f1a341303f300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301f0603551d230418301680144baea6b29882dc8d950b25655b5125fa337dd193300a06082a8648ce3d040302034800304502203a1e77e24d4aaa8235f90fb986d8dd465023e1cfd8adc6f24453777b0a345fd1022100cf6999b65788156f482dcbb1894e9746ba8784f34919ad775d33510727680211",
+    "pai_cert": "308201bd30820164a003020102020875e948035f22b7c0300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042c4ff7bc3c1ea2ee45973921b1f5007ca11d4374065cbed6331a06774670a11a9fdf949b87c39b28441fd7297e5cb8bb776ad16c354c109d83d4f6580f530c8ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144baea6b29882dc8d950b25655b5125fa337dd193301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402206311a445fcbc207559893b6725803f100c40952ef548aca996a2aa1812c908e702205f7824d931e848b08870b7a13fd3dcd31288f9bb7736c570e27419a932e6a4ad",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220556a3bd62b64c80275221b1ed77ee92886edf238ccfc5c0aa45eaf2bb9d2a2d5022100bd8481340dc5e0d2d6c73fa131e32eed0d15e305abd5127e53e2a4e0164c2a6e",
+    "dac_private_key": "fc1b5d3e6b48ce9167e6ed3a94aad4a1f4db1f780481dab5b0e4c92ae80116c6",
+    "dac_public_key": "04f1d31a47a1cd755e27dee511a2fc6d9d7b737242f42ff0ae0e30bbbdac292b5c0575ec2ea357b55f23e79f49b8a00dd6be753413b0354d60d7e64ace2869e4f1"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/cd.der b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/cd.der
index 0e8ac94af047c4..6a8a2d4409e2e7 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/cd.der and b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.der
index 5e5e2b67e6a511..f9cbe84ceda39b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.pem
index 8f4f7d8250761e..904be7b9c2e855 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5DCCAYmgAwIBAgIIRfaSIY6J8V8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB4jCCAYmgAwIBAgIIY/0sNsNCV3IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQsZfk1vx9JVGg4yqRKUiF1NC2EVz/X
-lXYzDN6nhL8vmngKLUHyWdJZ47ik0eHaFqxGzLyZwi0K5z0unVWX9vv+o3UwczAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUyPtKUTm+9d0f
-w/NPJWS3V7pYWMEwHwYDVR0jBBgwFoAUfp4Qg3A+Rf68BJv0srQyNJumFI0wEwYD
-VR0RBAwwCoIIdGVzdC5jb20wCgYIKoZIzj0EAwIDSQAwRgIhAPKtbSlS/CUqoALM
-ViBzRB6jWpgVs5SljrwyL5Y3KOV6AiEA7wcll3tpdHVf4FOjTrk/ijyJN9w5Akcw
-HrMrOk6ZjeA=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQndnPZBPYf24k3/3bOD0UmyldRnLrc
+KiuVdSILW5bq30dTAlso8oc4eKfdJKJ5mnzq5xfnvcld+q7iQTpjr3NHo3UwczAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUqBcqnFQcwhXE
+bDmgAkWAijbYkqEwHwYDVR0jBBgwFoAUnAGQvxaiwk25ECW8gG5+hmlMJhQwEwYD
+VR0RBAwwCoIIdGVzdC5jb20wCgYIKoZIzj0EAwIDRwAwRAIgOFCoJI1Po181ilhw
+4VKENKJ8faq3UtBoi1cQmCtqjCQCIEAzCe0SLd8KaiMzW2VDmlXjmaBRswz64EZA
+HJrv33oA
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.der
index 1d652ffc244544..2d92b82cf2ce46 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.pem
index d7e2fe55358dab..1ad8a8e4de10e9 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMAhzEh3vaeiQZKyZD+cFylGQ4W9gz2ChO0cZbioyLOPoAoGCCqGSM49
-AwEHoUQDQgAELGX5Nb8fSVRoOMqkSlIhdTQthFc/15V2Mwzep4S/L5p4Ci1B8lnS
-WeO4pNHh2hasRsy8mcItCuc9Lp1Vl/b7/g==
+MHcCAQEEIAzDwOyshaGVk5LAL2FfluuRkMOlrEME9JoWh/lFkUyqoAoGCCqGSM49
+AwEHoUQDQgAEJ3Zz2QT2H9uJN/92zg9FJspXUZy63CorlXUiC1uW6t9HUwJbKPKH
+OHin3SSieZp86ucX573JXfqu4kE6Y69zRw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.der
index ef48333b6c8686..f3352c9b47361e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.pem
index e2e8fabf093dc7..ea8631d7ea7b37 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIILsk2KTIGzpEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvTCCAWSgAwIBAgIIHYnI8j1lgXQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABKBmpj+u8FCGFVqSO1AY7jg7oNpbToNo724jBSt6chqMmjQ7MaLTbmGrxelB
-984rTi2cqdUk9+mu1Faluep0X1SjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR+nhCDcD5F/rwEm/SytDI0m6YUjTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-6t4xireComCYqzF9hyAwtJWxut3ECR+5wux5EFhr1cECIQCq+1cY0e3c+Eck84fL
-fKdtCFguzM/LOhMDZODctyYxJA==
+A0IABDBsOTY1po0PVX2sc/HU0X2jP4DMG48Fao9lE9KLRKWZlgh6xX8AJijDRkR1
+hWVVsXWwVadqP3n/asMGsPzJDeCjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBScAZC/FqLCTbkQJbyAbn6GaUwmFDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBa
+I3gNoJQgcNU1OHX66d8yQWSOpFjzDTvy5u3Hlul0AAIgAhcOM/JSaBzvLNfSSXcd
+bzkOzcbXZrB5LQca/X5RNSg=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.der
index 6e22c0b39292ff..e79dae52620d8f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.pem
index 9596ab1ea364ad..f82477b44228bf 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFuH8xIrG5j3/FFrsuVC/VrqEBPhXg0XR/w0+zmdIIJ3oAoGCCqGSM49
-AwEHoUQDQgAEoGamP67wUIYVWpI7UBjuODug2ltOg2jvbiMFK3pyGoyaNDsxotNu
-YavF6UH3zitOLZyp1ST36a7UVqW56nRfVA==
+MHcCAQEEIK3vt2pM9WA+7s2CwPAYY5fOvbuutcur0l66IfJC9klxoAoGCCqGSM49
+AwEHoUQDQgAEMGw5NjWmjQ9Vfaxz8dTRfaM/gMwbjwVqj2UT0otEpZmWCHrFfwAm
+KMNGRHWFZVWxdbBVp2o/ef9qwwaw/MkN4A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/test_case_vector.json
index 7d6a14beb80a14..23db7bbf3ed594 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_subject_alt_name_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate includes optional Subject Alternative Name extension",
     "is_success_case": "true",
-    "dac_cert": "308201e430820189a003020102020845f692218e89f15f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042c65f935bf1f49546838caa44a522175342d84573fd79576330cdea784bf2f9a780a2d41f259d259e3b8a4d1e1da16ac46ccbc99c22d0ae73d2e9d5597f6fbfea3753073300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c8fb4a5139bef5dd1fc3f34f2564b757ba5858c1301f0603551d230418301680147e9e1083703e45febc049bf4b2b432349ba6148d30130603551d11040c300a8208746573742e636f6d300a06082a8648ce3d0403020349003046022100f2ad6d2952fc252aa002cc562073441ea35a9815b394a58ebc322f963728e57a022100ef0725977b6974755fe053a34eb93f8a3c8937dc390247301eb32b3a4e998de0",
-    "pai_cert": "308201bf30820164a00302010202082ec936293206ce91300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004a066a63faef05086155a923b5018ee383ba0da5b4e8368ef6e23052b7a721a8c9a343b31a2d36e61abc5e941f7ce2b4e2d9ca9d524f7e9aed456a5b9ea745f54a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147e9e1083703e45febc049bf4b2b432349ba6148d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100eade318ab782a26098ab317d872030b495b1baddc4091fb9c2ec7910586bd5c1022100aafb5718d1eddcf84724f387cb7ca76d08582ecccfcb3a130364e0dcb7263124",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c3756e4dbb639c1e83d81345ed34031786203befc59e233c611cab89e8111da1022100df2d1359b26745dab9ca98c09c50c8efa2e1c489519ea8fe5fc9d0f02e364ef2",
-    "dac_private_key": "c021cc4877bda7a24192b2643f9c1729464385bd833d8284ed1c65b8a8c8b38f",
-    "dac_public_key": "042c65f935bf1f49546838caa44a522175342d84573fd79576330cdea784bf2f9a780a2d41f259d259e3b8a4d1e1da16ac46ccbc99c22d0ae73d2e9d5597f6fbfe"
+    "dac_cert": "308201e230820189a003020102020863fd2c36c3425772300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004277673d904f61fdb8937ff76ce0f4526ca57519cbadc2a2b9575220b5b96eadf4753025b28f2873878a7dd24a2799a7ceae717e7bdc95dfaaee2413a63af7347a3753073300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a8172a9c541cc215c46c39a00245808a36d892a1301f0603551d230418301680149c0190bf16a2c24db91025bc806e7e86694c261430130603551d11040c300a8208746573742e636f6d300a06082a8648ce3d040302034700304402203850a8248d4fa35f358a5870e1528434a27c7daab752d0688b5710982b6a8c240220403309ed122ddf0a6a23335b65439a55e399a051b30cfae046401c9aefdf7a00",
+    "pai_cert": "308201bd30820164a00302010202081d89c8f23d658174300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004306c393635a68d0f557dac73f1d4d17da33f80cc1b8f056a8f6513d28b44a59996087ac57f002628c3464475856555b175b055a76a3f79ff6ac306b0fcc90de0a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604149c0190bf16a2c24db91025bc806e7e86694c2614301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402205a23780da0942070d5353875fae9df3241648ea458f30d3bf2e6edc796e97400022002170e33f252681cef2cd7d249771d6f390ecdc6d766b0792d071afd7e513528",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221009942c494728d2f6703ad6df3c14d35d9df4e60d40fe62af4c74bf4e0c31924b4022100d3cf9ef9427fe415f121638660a5b22b1a314f4e485be6b6469fbcaafa1a73f9",
+    "dac_private_key": "0cc3c0ecac85a1959392c02f615f96eb9190c3a5ac4304f49a1687f945914caa",
+    "dac_public_key": "04277673d904f61fdb8937ff76ce0f4526ca57519cbadc2a2b9575220b5b96eadf4753025b28f2873878a7dd24a2799a7ceae717e7bdc95dfaaee2413a63af7347"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/cd.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/cd.der
index 61ff3b2cb30548..daf482a0518f4d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/cd.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.der
index c7318442efc012..318cbb9c0fef98 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.pem
index cbbb2b26e2757a..8e311fa0c5308d 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXOgAwIBAgIIZOkhOS6cNu8wCQYHKoZIzj0EATAwMRgwFgYDVQQDDA9N
-YXR0ZXIgVGVzdCBQQUkxFDASBgorBgEEAYKifAIBDARGRkYxMCAXDTIyMDUyNzAw
+MIIBzDCCAXOgAwIBAgIIZPuHNuR1RoYwCQYHKoZIzj0EATAwMRgwFgYDVQQDDA9N
+YXR0ZXIgVGVzdCBQQUkxFDASBgorBgEEAYKifAIBDARGRkYxMCAXDTIyMDkyMzAw
 MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBE
 QUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEODAwMDBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABPa/jDt5YdRXzkFr00w0R/eYVOgJV7n7
-OfsZcgVfKUl6Bv7gxuxtCD1eDpVdrqwr2h0imGiRQdpk4Tdx3FDw7eejYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBRvSyB3xwOj2X4s
-fQ98MJydsSq7szAfBgNVHSMEGDAWgBQkMl4urCjCKtvIQr7zl4o9DmcycTAJBgcq
-hkjOPQQBA0kAMEYCIQC3G4X7yLj2kzDKA1djCEeq5G7VUSXhD+wwupBAcKMtcQIh
-AL2qBylyXP+xcHmu5bxpF69Ukcpk9F3cL3GGBtcPHDet
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABHQg3Hj9uMrmhmPzpthRaFPRuGAmdS4A
+yhqPKDARxtwUPDipGuUsQFiOqCPx7oJSBlbwUJ1xQFZF+d8E1OVkbhmjYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBQPREA2Ndbq/Xmy
+L/bJAbsFLDu7KzAfBgNVHSMEGDAWgBS07csTUc0n+sskmCxmPMgDJmdguDAJBgcq
+hkjOPQQBA0gAMEUCIFP+4Jc7tNh3jwj7jwCZaraxCbmZTlLzguygDY7KH5RPAiEA
+mwyZZy8W6jlHJ38rvvkWJnVi3JkOgk0fo5FoXRVxxM4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.der
index 224a554b879964..08ae53d9dd33c4 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.pem
index 99735db9e1a741..75d1f7008bc749 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOeLKTSt/scQx8V+xT+a9TFgVtOfsEXBkUpkr5RVyIz9oAoGCCqGSM49
-AwEHoUQDQgAE9r+MO3lh1FfOQWvTTDRH95hU6AlXufs5+xlyBV8pSXoG/uDG7G0I
-PV4OlV2urCvaHSKYaJFB2mThN3HcUPDt5w==
+MHcCAQEEIGXcynFuH4ndl/7egKplKIcYcnJVstY9JuHQtb9FNyCCoAoGCCqGSM49
+AwEHoUQDQgAEdCDceP24yuaGY/Om2FFoU9G4YCZ1LgDKGo8oMBHG3BQ8OKka5SxA
+WI6oI/HuglIGVvBQnXFAVkX53wTU5WRuGQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.der
index c083bcff33fe9b..4a29e86c0a5f6d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.pem
index d337c05e0b2ca5..1d0b19743ce428 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIISA2vSOhUggAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvTCCAWSgAwIBAgIIaM6kBW094dowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABKJjppI89wiEAunU0VMDT8RwCHQSf74fgLqcIO+nK4lXOYR1p1iV+p4mMQEO
-Ov3alGGMvgwGNhcFSKgF7k5iFoyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQkMl4urCjCKtvIQr7zl4o9DmcycTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBl
-+YVo5zU9Cbx+eI91MF6IE4U73odyUbIQC72mdlit8AIgWfNXPbPFQJIZ+XEpVgt5
-9oN9vdxBvb0BQJhLbQsBpF8=
+A0IABB5JQPD3KFYckzqHkjjDwUp7kmi8i6/mfrS9M6jrhPpdEpU16JluNEejXDLn
+2Ah3bJxFycXK5PbcLI+rodSqTVOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS07csTUc0n+sskmCxmPMgDJmdguDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBo
+mSmjwuLaJNHM7kdk2nwlI6qqyp8oNSFxCNr5piTSLQIgYjR9nZxkJZ9ONUcF5B3Z
+I4D6bDO2g966JDCwINk07vI=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.der
index 5bd2dba47df920..07dfe01ef0a79b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.pem
index ee9fb2e3549805..06f60d3c9a32b5 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMFatehvoLd72z4eDWMZZRMKVd0h/1XiV/jytZ8B1FXEoAoGCCqGSM49
-AwEHoUQDQgAEomOmkjz3CIQC6dTRUwNPxHAIdBJ/vh+Aupwg76criVc5hHWnWJX6
-niYxAQ46/dqUYYy+DAY2FwVIqAXuTmIWjA==
+MHcCAQEEIEiKETAUgSO4Xf5tVo/RNn0M2X3HXreQS8XCqGQiwsz0oAoGCCqGSM49
+AwEHoUQDQgAEHklA8PcoVhyTOoeSOMPBSnuSaLyLr+Z+tL0zqOuE+l0SlTXomW40
+R6NcMufYCHdsnEXJxcrk9twsj6uh1KpNUw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/test_case_vector.json
index 7222caa29cab5a..13a95b6b4eaf7c 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Invalid certificate signature algorithm ECDSA_WITH_SHA1",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820173a003020102020864e921392e9c36ef300906072a8648ce3d040130303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f6bf8c3b7961d457ce416bd34c3447f79854e80957b9fb39fb1972055f29497a06fee0c6ec6d083d5e0e955daeac2bda1d2298689141da64e13771dc50f0ede7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146f4b2077c703a3d97e2c7d0f7c309c9db12abbb3301f0603551d2304183016801424325e2eac28c22adbc842bef3978a3d0e673271300906072a8648ce3d04010349003046022100b71b85fbc8b8f69330ca0357630847aae46ed55125e10fec30ba904070a32d71022100bdaa0729725cffb17079aee5bc6917af5491ca64f45ddc2f718606d70f1c37ad",
-    "pai_cert": "308201bd30820164a0030201020208480daf48e8548200300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004a263a6923cf7088402e9d4d153034fc4700874127fbe1f80ba9c20efa72b8957398475a75895fa9e2631010e3afdda94618cbe0c0636170548a805ee4e62168ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041424325e2eac28c22adbc842bef3978a3d0e673271301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022065f98568e7353d09bc7e788f75305e8813853bde877251b2100bbda67658adf0022059f3573db3c5409219f97129560b79f6837dbddc41bdbd0140984b6d0b01a45f",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402207db8196bf7bfa3fc9db3cc81e3f7f2003cde0585785d170aae33aaba2662ee1f0220289383c5abb56e1feaaad03ba788408138412b32f471efa0aee59342e593ad86",
-    "dac_private_key": "e78b2934adfec710c7c57ec53f9af5316056d39fb045c1914a64af9455c88cfd",
-    "dac_public_key": "04f6bf8c3b7961d457ce416bd34c3447f79854e80957b9fb39fb1972055f29497a06fee0c6ec6d083d5e0e955daeac2bda1d2298689141da64e13771dc50f0ede7"
+    "dac_cert": "308201cc30820173a003020102020864fb8736e4754686300906072a8648ce3d040130303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047420dc78fdb8cae68663f3a6d8516853d1b86026752e00ca1a8f283011c6dc143c38a91ae52c40588ea823f1ee82520656f0509d71405645f9df04d4e5646e19a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140f44403635d6eafd79b22ff6c901bb052c3bbb2b301f0603551d23041830168014b4edcb1351cd27facb24982c663cc803266760b8300906072a8648ce3d04010348003045022053fee0973bb4d8778f08fb8f00996ab6b109b9994e52f382eca00d8eca1f944f0221009b0c99672f16ea3947277f2bbef916267562dc990e824d1fa391685d1571c4ce",
+    "pai_cert": "308201bd30820164a003020102020868cea4056d3de1da300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200041e4940f0f728561c933a879238c3c14a7b9268bc8bafe67eb4bd33a8eb84fa5d129535e8996e3447a35c32e7d808776c9c45c9c5cae4f6dc2c8faba1d4aa4d53a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b4edcb1351cd27facb24982c663cc803266760b8301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220689929a3c2e2da24d1ccee4764da7c2523aaaaca9f2835217108daf9a624d22d022062347d9d9c64259f4e354705e41dd92380fa6c33b683deba2430b020d934eef2",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100954bd416e8fc9d9e3732717e14248df49200cfb0264f9efbd2ef7e7dd5031013022100d9fcdeb6dc660c2fb9dc93518b3326e127a8ee52a56c7cfb3b1b108d5453af6c",
+    "dac_private_key": "65dcca716e1f89dd97fede80aa65288718727255b2d63d26e1d0b5bf45372082",
+    "dac_public_key": "047420dc78fdb8cae68663f3a6d8516853d1b86026752e00ca1a8f283011c6dc143c38a91ae52c40588ea823f1ee82520656f0509d71405645f9df04d4e5646e19"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/cd.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/cd.der
index a0885e61cb31b5..ca58ebc691e332 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/cd.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.der
index 4c86fdf241335d..7e1d436a54ce99 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.pem
index 93006e265965b1..46a0420edc82ba 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIDtn0ZNFj3d4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIIJPGU8o4RkpYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQHg/DNkZfGO3K5LBB0OdvVQW3Hs//6
-XOvsuoozDFAD56PVeBvw7GRlkY2ugHaRzplU33Ouj2wrh5gXjUMYNvoNo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU1ThDaSHHTVqW
-HksAReX+wfTbpU8wHwYDVR0jBBgwFoAURjh3OZIs0mEGtN4nboM1uIy0ETcwCgYI
-KoZIzj0EAwIDRwAwRAIgYER1KIA2ZckgXRia0VaGsUQlzGaauwVGUd0CnF6Qkr4C
-IAr0dfIWe/jesFVVB/mMInnKd4TJEN825RGt1Ie7qY0I
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARdKI/HGWWH0arFp3UmAJwLjqKtuq6S
+WGpYSVhzFOD39sZI1tXjZ/Yt9mmzs8qovsrdwMlEnv7kfl3SYK8ssQr8o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU7igwApIU1doo
+GDxSpVdVTL/CuUMwHwYDVR0jBBgwFoAU8VXPI17UmwD6gZBDQVNpiihKhlEwCgYI
+KoZIzj0EAwIDRwAwRAIgDDrOR6B1xCHqWf4hOiOVUNnq13kAjXu/gGFKVA0yq2AC
+IAEFXv0AXOsNREpmiOJ9bOovZkdkZxCROoM9MSml0zps
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.der
index 43a0694663a6fc..38414d560fa6ef 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.pem
index a37e26b7e8e3c1..b6a01821ec4fc3 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEII4WzvHK9FreCqhXlsdhEQxJLkBOpWIh2ZEAqcm0Wqw/oAoGCCqGSM49
-AwEHoUQDQgAEB4PwzZGXxjtyuSwQdDnb1UFtx7P/+lzr7LqKMwxQA+ej1Xgb8Oxk
-ZZGNroB2kc6ZVN9zro9sK4eYF41DGDb6DQ==
+MHcCAQEEIJJarnWPGrtj6IrCHSqD+Va0vcuJtY0X0pbylKM4ClBfoAoGCCqGSM49
+AwEHoUQDQgAEXSiPxxllh9Gqxad1JgCcC46irbquklhqWElYcxTg9/bGSNbV42f2
+LfZps7PKqL7K3cDJRJ7+5H5d0mCvLLEK/A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.der
index 484ae5e928aab2..6ac9da0ec11817 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.pem
index a4c7cef03367b4..501ef5db4b710f 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIEck8NSOx/fgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvTCCAWSgAwIBAgIITziUyJshEIAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABAa9cWzC6CDxPUrVLJ5xzu6Yho/Q8+hP0dfIpFmpvNPSNAQXTKNZhOd1d5IA
-IwW3wgT1AqKfwSAKpwZDdr3rwLSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRGOHc5kizSYQa03idugzW4jLQRNzAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiA9
-x0uVw4MZl7AN9ODcD8r+zCERKGIsVvEsU2PH6Qd2sgIhANz7ahBkuTOuuvkjqJsU
-VAQ4jaaiY1C3AjkylJu5BBKo
+A0IABAiFE+7eOrBvTZq+OiWSOuUT9nd+NbolSzRhNlE3bM945u7aWQaF/+kLXpGJ
+5Ft/Xa/guqM3zxj6al3uQiYLu/KjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTxVc8jXtSbAPqBkENBU2mKKEqGUTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAF
+IBmsH1gMMRUAglLeGatZTyAJZNJSxtRAydf4YdWREwIgOlSuYpoKGB05rT6fQxUe
++PJAUH220EK8ieq4NB7B2sw=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.der
index 3e45eb11e28b25..1ff15148e1aa57 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.pem
index 92c50431ae0006..3c036e56dbb1fe 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOa4LBuTaiKtIoTiGBf/H6oG7feGoQqDZ3Mg5r62huHvoAoGCCqGSM49
-AwEHoUQDQgAEBr1xbMLoIPE9StUsnnHO7piGj9Dz6E/R18ikWam809I0BBdMo1mE
-53V3kgAjBbfCBPUCop/BIAqnBkN2vevAtA==
+MHcCAQEEICYmLCYlEyrDXTHNRWUFli/WYVaFRGtMSP+MVgoSstsaoAoGCCqGSM49
+AwEHoUQDQgAECIUT7t46sG9Nmr46JZI65RP2d341uiVLNGE2UTdsz3jm7tpZBoX/
+6QtekYnkW39dr+C6ozfPGPpqXe5CJgu78g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/test_case_vector.json
index 47f9e9b3f3362c..591298dea07bb4 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha256/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Valid certificate signature algorithm ECDSA_WITH_SHA256",
     "is_success_case": "true",
-    "dac_cert": "308201cd30820174a00302010202080ed9f464d163ddde300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040783f0cd9197c63b72b92c107439dbd5416dc7b3fffa5cebecba8a330c5003e7a3d5781bf0ec6465918dae807691ce9954df73ae8f6c2b8798178d431836fa0da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d538436921c74d5a961e4b0045e5fec1f4dba54f301f0603551d2304183016801446387739922cd26106b4de276e8335b88cb41137300a06082a8648ce3d0403020347003044022060447528803665c9205d189ad15686b14425cc669abb054651dd029c5e9092be02200af475f2167bf8deb0555507f98c2279ca7784c910df36e511add487bba98d08",
-    "pai_cert": "308201be30820164a003020102020811c93c3523b1fdf8300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000406bd716cc2e820f13d4ad52c9e71ceee98868fd0f3e84fd1d7c8a459a9bcd3d23404174ca35984e7757792002305b7c204f502a29fc1200aa7064376bdebc0b4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041446387739922cd26106b4de276e8335b88cb41137301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502203dc74b95c3831997b00df4e0dc0fcafecc211128622c56f12c5363c7e90776b2022100dcfb6a1064b933aebaf923a89b145404388da6a26350b7023932949bb90412a8",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100dbbb297a5a63cfad7096975f0ff303c6562434417d4de107729c4ae18b4d6dc4022030ea2a4ce5ebdd42161c603b94e6716b1bc2ee8ec85eeb184002397509fae962",
-    "dac_private_key": "8e16cef1caf45ade0aa85796c761110c492e404ea56221d99100a9c9b45aac3f",
-    "dac_public_key": "040783f0cd9197c63b72b92c107439dbd5416dc7b3fffa5cebecba8a330c5003e7a3d5781bf0ec6465918dae807691ce9954df73ae8f6c2b8798178d431836fa0d"
+    "dac_cert": "308201cd30820174a003020102020824f194f28e119296300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045d288fc7196587d1aac5a77526009c0b8ea2adbaae92586a5849587314e0f7f6c648d6d5e367f62df669b3b3caa8becaddc0c9449efee47e5dd260af2cb10afca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ee2830029214d5da28183c52a557554cbfc2b943301f0603551d23041830168014f155cf235ed49b00fa8190434153698a284a8651300a06082a8648ce3d040302034700304402200c3ace47a075c421ea59fe213a239550d9ead779008d7bbf80614a540d32ab60022001055efd005ceb0d444a6688e27d6cea2f6647646710913a833d3129a5d33a6c",
+    "pai_cert": "308201bd30820164a00302010202084f3894c89b211080300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004088513eede3ab06f4d9abe3a25923ae513f6777e35ba254b34613651376ccf78e6eeda590685ffe90b5e9189e45b7f5dafe0baa337cf18fa6a5dee42260bbbf2a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f155cf235ed49b00fa8190434153698a284a8651301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220052019ac1f580c3115008252de19ab594f200964d252c6d440c9d7f861d5911302203a54ae629a0a181d39ad3e9f43151ef8f240507db6d042bc89eab8341ec1dacc",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402203599859820fc64f9229084378c292e1c5dea3cf6fd765d4ecb48cf70c2a2f9b702202825485a2177c59251ff7f3e4bc3a447c2eacfff5d29281d104193f634e00700",
+    "dac_private_key": "925aae758f1abb63e88ac21d2a83f956b4bdcb89b58d17d296f294a3380a505f",
+    "dac_public_key": "045d288fc7196587d1aac5a77526009c0b8ea2adbaae92586a5849587314e0f7f6c648d6d5e367f62df669b3b3caa8becaddc0c9449efee47e5dd260af2cb10afc"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/cd.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/cd.der
index 751822f5f5e73d..2c48361f2f149b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/cd.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.der
index 81eb1524223b4a..1a88f2c052d859 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.pem
index 16f08840ea5104..0472935371d055 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIDXizk4CDa9swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIT6YFUjqSQDkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT7XtRG3IYicRIzpESt4qrelqpkW0xz
-Gs0VRvgNuRH4Ro9qVnhwu3sWuffrcrX0+KO/VTT0WvcllNu00I0MfQzlo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUv8S8nWZ4S1//
-RQILBlkoG/vRdmEwHwYDVR0jBBgwFoAUMTS9unVw33ouG3yaZH6sQU/tgAkwCgYI
-KoZIzj0EAwIDRwAwRAIgdO86K7Kx/3JTpev2K7a1FFQi4PhgIhLXfLFfhI3kC60C
-IF01OKb8CKi6yJGhJfmP1MEDGpgXa7ItHh8IX8j2I8K6
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT7cwgdz6LtuDiOx4NmF0Cr0ndKTvL6
+q8hp1+w/gF+FWL6tnC0T6xBO6AmJQe6e3chLrmgkM8N+X8lfpoU1sSClo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU/Iu8/bWM/Xy9
+ZHPBmoJ4FKFX2HwwHwYDVR0jBBgwFoAURlld8PFBHBZE4h/K7kfUwC8khCgwCgYI
+KoZIzj0EAwIDSAAwRQIhAIoe5zes4v0Dz2z3tCJDbqPBpwJTBhfyqw8ikYV5zW5d
+AiAdV7Sfex1WS9eymixzwW+kEuaYlQuvK+wenAK9/sPH8w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.der
index 748e6d7cd11fd9..17d073bf6e48da 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.pem
index a83c7c74efa1ba..f001d2b989eddf 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIItTowbrYQGu0kCscPb7X/FbPmM/czNcSwY8bWLDEDtToAoGCCqGSM49
-AwEHoUQDQgAE+17URtyGInESM6REreKq3paqZFtMcxrNFUb4DbkR+EaPalZ4cLt7
-Frn363K19Pijv1U09Fr3JZTbtNCNDH0M5Q==
+MHcCAQEEIOSNtKBQ8WH9s6AIrG6UGfHoCJUrxcNi3wckUn8UtaUgoAoGCCqGSM49
+AwEHoUQDQgAE+3MIHc+i7bg4jseDZhdAq9J3Sk7y+qvIadfsP4BfhVi+rZwtE+sQ
+TugJiUHunt3IS65oJDPDfl/JX6aFNbEgpQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.der
index d16140a721be80..344aa1e6c94425 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.pem
index 66016e9365c9cc..26c5b12c4289e3 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIQLZQ6ndDbqwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWSgAwIBAgIIT5JBegUJlOUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABFP/xgputmC2/TsD62OQL+MBFHNVTFNKNH9KG16NXDcTnxdCE+edX1EVfnFD
-OZ4DIgkI8qBzeH/TALpuDzHbxE6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQxNL26dXDfei4bfJpkfqxBT+2ACTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiA9
-udSLoVEGOS7RxkuYBwoDEYLUJy2ES5ToXAVkgNchJgIhAMzUBpYaLRSGQpCo/KU9
-/8dogymJOGFb/H8yYW8kOlTs
+A0IABDTjygGTJnLby7LeE4M4ZtgUaAtowuEdhjL8zmZyZ1P+kxutxyeGihznmiBd
+tiaUUWOp4jGiz8VS96ywVZvzPYqjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRGWV3w8UEcFkTiH8ruR9TALySEKDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+gWOq7enmE8j5DE3+L1G+ZylESPwAEeXKiiJEoMixDT4CIQCdcBSvuq4rGZBbYhUn
+ZlOALrL7HMEYisVjk3GV/HkInQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.der
index 093f9709399ef0..6ee49ad3511c8a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.pem
index 87ff07d03d624d..af51915ac04c48 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIN/DgFEGkNEVHkhMK+tW145q56Dsd14AwBNRdrAr+4YqoAoGCCqGSM49
-AwEHoUQDQgAEU//GCm62YLb9OwPrY5Av4wEUc1VMU0o0f0obXo1cNxOfF0IT551f
-URV+cUM5ngMiCQjyoHN4f9MAum4PMdvETg==
+MHcCAQEEIId14Rli0618IVWzlMDnu7tZCjR5bLgendDOj70L36nHoAoGCCqGSM49
+AwEHoUQDQgAENOPKAZMmctvLst4Tgzhm2BRoC2jC4R2GMvzOZnJnU/6TG63HJ4aK
+HOeaIF22JpRRY6niMaLPxVL3rLBVm/M9ig==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/test_case_vector.json
index 46fc5462769acb..d31111b3a49436 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_prime256v1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Valid certificate public key curve prime256v1",
     "is_success_case": "true",
-    "dac_cert": "308201cd30820174a00302010202080d78b39380836bdb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fb5ed446dc8622711233a444ade2aade96aa645b4c731acd1546f80db911f8468f6a567870bb7b16b9f7eb72b5f4f8a3bf5534f45af72594dbb4d08d0c7d0ce5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bfc4bc9d66784b5fff45020b0659281bfbd17661301f0603551d230418301680143134bdba7570df7a2e1b7c9a647eac414fed8009300a06082a8648ce3d0403020347003044022074ef3a2bb2b1ff7253a5ebf62bb6b5145422e0f8602212d77cb15f848de40bad02205d3538a6fc08a8bac891a125f98fd4c1031a98176bb22d1e1f085fc8f623c2ba",
-    "pai_cert": "308201be30820164a003020102020840b650ea77436eac300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000453ffc60a6eb660b6fd3b03eb63902fe3011473554c534a347f4a1b5e8d5c37139f174213e79d5f51157e7143399e03220908f2a073787fd300ba6e0f31dbc44ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604143134bdba7570df7a2e1b7c9a647eac414fed8009301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502203db9d48ba15106392ed1c64b98070a031182d4272d844b94e85c056480d72126022100ccd406961a2d14864290a8fca53dffc76883298938615bfc7f32616f243a54ec",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402202bcc6df0b9ec31d1c463b0d6ea9cf1c4243157feb495625e25c6049502394b5f0220035d0cfaa91d11074240bd97cde33da056ca009e2e4ec6cfc747e7987f497c97",
-    "dac_private_key": "8b53a306eb6101aed240ac70f6fb5ff15b3e633f73335c4b063c6d62c3103b53",
-    "dac_public_key": "04fb5ed446dc8622711233a444ade2aade96aa645b4c731acd1546f80db911f8468f6a567870bb7b16b9f7eb72b5f4f8a3bf5534f45af72594dbb4d08d0c7d0ce5"
+    "dac_cert": "308201ce30820174a00302010202084fa605523a924039300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fb73081dcfa2edb8388ec783661740abd2774a4ef2faabc869d7ec3f805f8558bead9c2d13eb104ee8098941ee9eddc84bae682433c37e5fc95fa68535b120a5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414fc8bbcfdb58cfd7cbd6473c19a827814a157d87c301f0603551d2304183016801446595df0f1411c1644e21fcaee47d4c02f248428300a06082a8648ce3d04030203480030450221008a1ee737ace2fd03cf6cf7b422436ea3c1a702530617f2ab0f22918579cd6e5d02201d57b49f7b1d564bd7b29a2c73c16fa412e698950baf2bec1e9c02bdfec3c7f3",
+    "pai_cert": "308201bf30820164a00302010202084f92417a050994e5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000434e3ca01932672dbcbb2de13833866d814680b68c2e11d8632fcce66726753fe931badc727868a1ce79a205db626945163a9e231a2cfc552f7acb0559bf33d8aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041446595df0f1411c1644e21fcaee47d4c02f248428301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008163aaede9e613c8f90c4dfe2f51be67294448fc0011e5ca8a2244a0c8b10d3e0221009d7014afbaae2b19905b6215276653802eb2fb1cc1188ac563937195fc79089d",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ee94924e33c79dc11d0abc6ac93ca3a759d45524acc643f896056a8e32fd58cf022100e63935de6e1211a8cffc4877b6627478958fad5eca2fcf50f310d44c4f75d916",
+    "dac_private_key": "e48db4a050f161fdb3a008ac6e9419f1e808952bc5c362df0724527f14b5a520",
+    "dac_public_key": "04fb73081dcfa2edb8388ec783661740abd2774a4ef2faabc869d7ec3f805f8558bead9c2d13eb104ee8098941ee9eddc84bae682433c37e5fc95fa68535b120a5"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/cd.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/cd.der
index 3bc3077cb953d3..4806393549af66 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/cd.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.der
index 30904e5fa7c6d3..59b0e04517435d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.pem
index 2ee899e45b5b0e..9b09e10f203bcc 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByzCCAXGgAwIBAgIIflYuzc4KMvwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIByzCCAXGgAwIBAgIIGGajpreVOFIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-VjAQBgcqhkjOPQIBBgUrgQQACgNCAARf+oHRBQL4LgPqVXwo6guF4UMPwbxVcZza
-rpzEg2Za52lGvtkAOfjX2VMaQlmOiCfnRkLZ8/RF+WGRAEZQXoxNo2AwXjAMBgNV
-HRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUVC6zcAlZ6ZRf1bKX
-wudQRCMfIhMwHwYDVR0jBBgwFoAUIblFLAxTbqGDeISHV1IX2gxP/50wCgYIKoZI
-zj0EAwIDSAAwRQIgfvWg92191WmQqsYKCGGg9u6KnFnVXOVBrtdgiN0gkSQCIQCc
-w99w8BQCWXXVI4bG94zss0B+atfRz+ocZLwmdk5+Pg==
+VjAQBgcqhkjOPQIBBgUrgQQACgNCAATwiP9g6SK3qWwhVR78bxFg+kiGey6UlQBh
+yJ/3YJZwqW8eCLmoXjnASumuqQPc8jrpcDhvISI8pBkwEd1jnBJuo2AwXjAMBgNV
+HRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUnI9yaB9qtPyxy0p8
+u62Noj29UP0wHwYDVR0jBBgwFoAUWFOTQxSzYvX6NRZ2GDjr1g1ooPEwCgYIKoZI
+zj0EAwIDSAAwRQIgUh1GNZrsRxAoEEjKQ54UFriIMiT6fzznZxak106yVdUCIQCN
+cUvZNH8IEjn0wms46cBmve5DG/4o88HrBis5V/t2nQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.der
index fd20bce88a5f83..5f28f050cb9a1c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.pem
index 23788907d34d3c..a71eb4cf8a6b00 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHQCAQEEICixSL4JIIPWjU0ATTZx0KwfffznXzwRTaRmApPDZGJeoAcGBSuBBAAK
-oUQDQgAEX/qB0QUC+C4D6lV8KOoLheFDD8G8VXGc2q6cxINmWudpRr7ZADn419lT
-GkJZjogn50ZC2fP0RflhkQBGUF6MTQ==
+MHQCAQEEIORSD6AuzBSpLjlUIvFhX27IV79IQPvMLD407ySG99ucoAcGBSuBBAAK
+oUQDQgAE8Ij/YOkit6lsIVUe/G8RYPpIhnsulJUAYcif92CWcKlvHgi5qF45wErp
+rqkD3PI66XA4byEiPKQZMBHdY5wSbg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.der
index 7640771e8b0d63..52f88ce7b22e8d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.pem
index 9d047a7f5281fe..c071d330909baa 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIILRm42syzGWowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWSgAwIBAgIIMHLRCe/F1gMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABOx8JzQO9NJoG8QlQkrUhGGzvM+Uim2AMOgNb8dw1nCE7Tqd+lLmx7M3H03S
-kGwhUOdC4b7A0M4Z55YAqLkGgVejZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQhuUUsDFNuoYN4hIdXUhfaDE//nTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-/6OiavnzJvivMpEIKOe7Ro4E6CHSvC23L5bX1HGCjmECIAaya7LEUIt5QgZ2sp+u
-bvuplFQX5piGzE4ZTHYdjJzC
+A0IABD6qy8tWJCYg0PFYZPuel2Ir/hN1WRzrKUooPdrMWuhBxejKXcuQjyL921cJ
+SIXtNojt1VWaqfrpav0MtE1UNKmjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRYU5NDFLNi9fo1FnYYOOvWDWig8TAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+xAIYgKdEshB57PmFM6Y9Z0dVZQ3Aw1y4Sdi94UiVuvUCIQDkXNMEblQMGV684EtA
+gK/GB0+CZZCQnFcHrRdOc/0lbw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.der
index 0622a6a5844880..330aa099ed8e31 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.pem
index 15b40c262348d3..d76ccf0d09be62 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILX1421lzSmj9w41uK3LmHN/JSVuunwlWwir+mUUZoeooAoGCCqGSM49
-AwEHoUQDQgAE7HwnNA700mgbxCVCStSEYbO8z5SKbYAw6A1vx3DWcITtOp36UubH
-szcfTdKQbCFQ50LhvsDQzhnnlgCouQaBVw==
+MHcCAQEEIAEs9aHoduHSvYIETZgjEIpkN/9CBJx5qpkVasiib3ZaoAoGCCqGSM49
+AwEHoUQDQgAEPqrLy1YkJiDQ8Vhk+56XYiv+E3VZHOspSig92sxa6EHF6Mpdy5CP
+Iv3bVwlIhe02iO3VVZqp+ulq/Qy0TVQ0qQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/test_case_vector.json
index 5ce2f6649b7580..2e6ed327486af3 100644
--- a/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Invalid certificate public key curve secp256k1",
     "is_success_case": "false",
-    "dac_cert": "308201cb30820171a00302010202087e562ecdce0a32fc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303056301006072a8648ce3d020106052b8104000a034200045ffa81d10502f82e03ea557c28ea0b85e1430fc1bc55719cdaae9cc483665ae76946bed90039f8d7d9531a42598e8827e74642d9f3f445f961910046505e8c4da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414542eb3700959e9945fd5b297c2e75044231f2213301f0603551d2304183016801421b9452c0c536ea183788487575217da0c4fff9d300a06082a8648ce3d040302034800304502207ef5a0f76d7dd56990aac60a0861a0f6ee8a9c59d55ce541aed76088dd2091240221009cc3df70f014025975d52386c6f78cecb3407e6ad7d1cfea1c64bc26764e7e3e",
-    "pai_cert": "308201be30820164a00302010202082d19b8daccb3196a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ec7c27340ef4d2681bc425424ad48461b3bccf948a6d8030e80d6fc770d67084ed3a9dfa52e6c7b3371f4dd2906c2150e742e1bec0d0ce19e79600a8b9068157a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041421b9452c0c536ea183788487575217da0c4fff9d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ffa3a26af9f326f8af32910828e7bb468e04e821d2bc2db72f96d7d471828e61022006b26bb2c4508b79420676b29fae6efba9945417e69886cc4e194c761d8c9cc2",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022057c24bea52d3e5a48d790ed4ba398793d45f95e1c67bf6acf0921e203d3d5b94022100c538389898f52518ffe3af36458c33ae6eb31c48ed0ab95973520c2bc8ac22da",
-    "dac_private_key": "28b148be092083d68d4d004d3671d0ac1f7dfce75f3c114da4660293c364625e",
-    "dac_public_key": "045ffa81d10502f82e03ea557c28ea0b85e1430fc1bc55719cdaae9cc483665ae76946bed90039f8d7d9531a42598e8827e74642d9f3f445f961910046505e8c4d"
+    "dac_cert": "308201cb30820171a00302010202081866a3a6b7953852300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303056301006072a8648ce3d020106052b8104000a03420004f088ff60e922b7a96c21551efc6f1160fa48867b2e94950061c89ff7609670a96f1e08b9a85e39c04ae9aea903dcf23ae970386f21223ca4193011dd639c126ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604149c8f72681f6ab4fcb1cb4a7cbbad8da23dbd50fd301f0603551d230418301680145853934314b362f5fa3516761838ebd60d68a0f1300a06082a8648ce3d04030203480030450220521d46359aec4710281048ca439e1416b8883224fa7f3ce76716a4d74eb255d50221008d714bd9347f081239f4c26b38e9c066bdee431bfe28f3c1eb062b3957fb769d",
+    "pai_cert": "308201bf30820164a00302010202083072d109efc5d603300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200043eaacbcb56242620d0f15864fb9e97622bfe1375591ceb294a283ddacc5ae841c5e8ca5dcb908f22fddb57094885ed3688edd5559aa9fae96afd0cb44d5434a9a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145853934314b362f5fa3516761838ebd60d68a0f1301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c4021880a744b21079ecf98533a63d674755650dc0c35cb849d8bde14895baf5022100e45cd3046e540c195ebce04b4080afc6074f826590909c5707ad174e73fd256f",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402202c7ea0026fee921c2266373c2134e14e7aaff35e4550b217db1f74ef160f7e2202207ba6bd9a23218fabe3ce14c34ef8a186aca257a34dc8e66ba10741c586a6c45b",
+    "dac_private_key": "e4520fa02ecc14a92e395422f1615f6ec857bf4840fbcc2c3e34ef2486f7db9c",
+    "dac_public_key": "04f088ff60e922b7a96c21551efc6f1160fa48867b2e94950061c89ff7609670a96f1e08b9a85e39c04ae9aea903dcf23ae970386f21223ca4193011dd639c126e"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/cd.der
index 58a8e6823d8089..1b0f3225e407a6 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.der
index fedaa283efb44f..064c7df2b7f84f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.pem
index 4bce0cc1f7188f..8fab2b57db4392 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIWkZypi/XGn8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzzCCAXSgAwIBAgIIVR45nyUMCDUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASYGVJrsxXU2Utw8anUE1l1pVzIZOj/
-/Bk9DYlmXa1CeqPOuPcbpy3dk4YayFS1y/VGz8IS8iJidoyYZCQYnT77o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUAQQbYzaiooQE
-iq6U6oG5+BQRo0EwHwYDVR0jBBgwFoAUMOHnSoAYkykrfdvm86LimEDYVhkwCgYI
-KoZIzj0EAwIDRwAwRAIgC1QXN4/LFXo1OziJjHzY11E5n7xkk+qoWL4fB8xY7gQC
-IBx6gxEy5j4O/lzBN/4mifk+DCsMCd1yNt91nRgvBdpC
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQg/VIJigLAmaC4ag+RbZHmlaxYKzeD
+BkF+Ux8kCPGai4KET9CmwDqPpmH9C5f1XQKpzp8ngpp7tmQgNZrJPr6do2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUQcAoXBCjzE5R
+K/ZiIfruNWFrQewwHwYDVR0jBBgwFoAUTfRl6A2tB8nrt3T5B89qQ8tiP5AwCgYI
+KoZIzj0EAwIDSQAwRgIhAPB2/Dv+nsRj9XcY0KgOXMiMeull6Y5CNeF9gR7L6WM8
+AiEAuY2r3AjLPOF+uM8rO3jLNjQLCRE7TObjSFNIj858AGs=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.der
index 533542393d926c..f076b12c0a4d85 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.pem
index 83162b195b9f95..073ec3ed532f89 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJ8NOAM1WUosNj7DJPbHwaNw7ftJxSukrvpGpis+UBh0oAoGCCqGSM49
-AwEHoUQDQgAEmBlSa7MV1NlLcPGp1BNZdaVcyGTo//wZPQ2JZl2tQnqjzrj3G6ct
-3ZOGGshUtcv1Rs/CEvIiYnaMmGQkGJ0++w==
+MHcCAQEEIGGB8v0UGvbVU2AvnCIP6S6r6lLYm63pooe83ekKe+EHoAoGCCqGSM49
+AwEHoUQDQgAEIP1SCYoCwJmguGoPkW2R5pWsWCs3gwZBflMfJAjxmouChE/QpsA6
+j6Zh/QuX9V0Cqc6fJ4Kae7ZkIDWayT6+nQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.der
index 88bb8ccc9686ab..c0bb6ce63bff93 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.pem
index e58c0a4d2800d7..f473124bd61069 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIJg+j7f9ntx4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIfHt2F5m+nrwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABDIUxgEy6DAZ8omjn9yesSXqTbfjXpCbxJjWbo1QHLNNMagCE5EYsziTJJRf
-n5DtGssSOgwWbn/HvTOGIsxmjf+jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQw4edKgBiTKSt92+bzouKYQNhWGTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiA/
-XTZRpAH5BFvLbaD3EQOJXK2t4Ry77zICE/9SScNXBwIhAKu5uXZs4pEQq68PrwV7
-06c2ixSnV2RSiKIn1pVX3Ah/
+A0IABOEETOIUiDaJn6nsuBR4sCBYFrXld17tLdyrnVjD6XHbPlCHhqwxBH9chU6Y
+o7kVGVnnbzBNEY0mlr1oz6deWzCjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRN9GXoDa0Hyeu3dPkHz2pDy2I/kDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAL
+bfI/to6xcU7yGQuLkZVwLCYjwhxvgbPZkeFx1+ZQ3gIhAKW8PMnLUTi6ASfoTde1
+xbQqpfM3V9byMan7f2U03qtE
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.der
index b27725de16dd8b..b92915289104e8 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.pem
index b29281407225d4..11d66ec9faa58d 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJfQ97ew+uenC74tXnpWaZuLHU0/eRV9LQue41ARCeeeoAoGCCqGSM49
-AwEHoUQDQgAEMhTGATLoMBnyiaOf3J6xJepNt+NekJvEmNZujVAcs00xqAITkRiz
-OJMklF+fkO0ayxI6DBZuf8e9M4YizGaN/w==
+MHcCAQEEID7Vci9sBpSsNzUmWYdHAPctDec1ad2rzHMuG3j8SoVvoAoGCCqGSM49
+AwEHoUQDQgAE4QRM4hSINomfqey4FHiwIFgWteV3Xu0t3KudWMPpcds+UIeGrDEE
+f1yFTpijuRUZWedvME0RjSaWvWjPp15bMA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/test_case_vector.json
index 610642ab308b0d..71e64580e6428e 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: PID in Subject field doesn't match PID in Issuer field",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820174a00302010202085a4672a62fd71a7f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030313059301306072a8648ce3d020106082a8648ce3d030107034200049819526bb315d4d94b70f1a9d4135975a55cc864e8fffc193d0d89665dad427aa3ceb8f71ba72ddd93861ac854b5cbf546cfc212f22262768c986424189d3efba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041401041b6336a2a284048aae94ea81b9f81411a341301f0603551d2304183016801430e1e74a801893292b7ddbe6f3a2e29840d85619300a06082a8648ce3d040302034700304402200b5417378fcb157a353b38898c7cd8d751399fbc6493eaa858be1f07cc58ee0402201c7a831132e63e0efe5cc137fe2689f93e0c2b0c09dd7236df759d182f05da42",
-    "pai_cert": "308201be30820164a0030201020208260fa3edff67b71e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200043214c60132e83019f289a39fdc9eb125ea4db7e35e909bc498d66e8d501cb34d31a802139118b3389324945f9f90ed1acb123a0c166e7fc7bd338622cc668dffa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041430e1e74a801893292b7ddbe6f3a2e29840d85619301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502203f5d3651a401f9045bcb6da0f71103895cadade11cbbef320213ff5249c35707022100abb9b9766ce29110abaf0faf057bd3a7368b14a757645288a227d69557dc087f",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402200456c0174ef9951b0801baec58a580ca88116f675a5fa2b963fdba7d090407a5022017e3ce50926813a7af33d2d08fdc854533d9e0c8ad2fdadc3f563bf3ff563235",
-    "dac_private_key": "9f0d380335594a2c363ec324f6c7c1a370edfb49c52ba4aefa46a62b3e501874",
-    "dac_public_key": "049819526bb315d4d94b70f1a9d4135975a55cc864e8fffc193d0d89665dad427aa3ceb8f71ba72ddd93861ac854b5cbf546cfc212f22262768c986424189d3efb"
+    "dac_cert": "308201cf30820174a0030201020208551e399f250c0835300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030313059301306072a8648ce3d020106082a8648ce3d0301070342000420fd52098a02c099a0b86a0f916d91e695ac582b378306417e531f2408f19a8b82844fd0a6c03a8fa661fd0b97f55d02a9ce9f27829a7bb66420359ac93ebe9da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041441c0285c10a3cc4e512bf66221faee35616b41ec301f0603551d230418301680144df465e80dad07c9ebb774f907cf6a43cb623f90300a06082a8648ce3d0403020349003046022100f076fc3bfe9ec463f57718d0a80e5cc88c7ae965e98e4235e17d811ecbe9633c022100b98dabdc08cb3ce17eb8cf2b3b78cb36340b09113b4ce6e34853488fce7c006b",
+    "pai_cert": "308201be30820164a00302010202087c7b761799be9ebc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004e1044ce2148836899fa9ecb81478b0205816b5e5775eed2ddcab9d58c3e971db3e508786ac31047f5c854e98a3b9151959e76f304d118d2696bd68cfa75e5b30a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144df465e80dad07c9ebb774f907cf6a43cb623f90301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502200b6df23fb68eb1714ef2190b8b9195702c2623c21c6f81b3d991e171d7e650de022100a5bc3cc9cb5138ba0127e84dd7b5c5b42aa5f33757d6f231a9fb7f6534deab44",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d34a8ab1574e04baa20fc24877b4db32bcd0c6012369737f0408091bbf17c46a0221009c8609a1ab18c44c85ad54527adb49d94289ad0219717f931247877be416e755",
+    "dac_private_key": "6181f2fd141af6d553602f9c220fe92eabea52d89bade9a287bcdde90a7be107",
+    "dac_public_key": "0420fd52098a02c099a0b86a0f916d91e695ac582b378306417e531f2408f19a8b82844fd0a6c03a8fa661fd0b97f55d02a9ce9f27829a7bb66420359ac93ebe9d"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/cd.der
index def5e26b045c57..5b93f6e91150c5 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.der
index 755af44b4330a9..bacfa57eeeba5a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.pem
index 6889620cd5c74e..23300da1a33c82 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIWdvEqqR+R9UwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIIeLarLXf4IMEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARpAc1oxHgvZVIJ1WxBygzw7Xp7nJ4S
-BJB9fzNbRNmheRqR9xSjMzJfyjFk5djxEjeCaLzKTJfpsePbPy77gKCMo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU4Uuuaocx1UVV
-Sowgab8AZN0ONsgwHwYDVR0jBBgwFoAUl6B6Dz4s1oSMRl+WgfZWWx30vEkwCgYI
-KoZIzj0EAwIDSAAwRQIhANzontg8dR8V8DN+gPjfzsYUbxwu3rpGPM9oz66UljLR
-AiBu9JXDTLJDe9KFUeROR+dpSq4L6dHj6551dJjVuK4jJw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASY1iGpmxWl9t92nmwPFwQfrYkWT6A1
+4NPyHjOMwlczIYYmVmMgC2l5l3Ft2O03TpNxS8/+aAtxdKwGBhaY9suSo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU9Uw77hDZkcL0
+FbKFG+++7ifJJgkwHwYDVR0jBBgwFoAUqrAldBj5+PmuMX8N4I7dod6bMnAwCgYI
+KoZIzj0EAwIDRwAwRAIgMARhCaux3/qXx7/0jkarvqF0GqDbfgQdSghSioXHdUQC
+IFsSuiXHteSbd+n9Gk75K95I3aHbh3blDb/dJ3K2TwQ8
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.der
index c210abf0d5c5ad..227aab673706a1 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.pem
index 5d8895b3c93c71..d1f9ed403ae0a3 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIH26q2rScwKMLlosUUa0mir5BIaki/c4WNBMcmQleAmYoAoGCCqGSM49
-AwEHoUQDQgAEaQHNaMR4L2VSCdVsQcoM8O16e5yeEgSQfX8zW0TZoXkakfcUozMy
-X8oxZOXY8RI3gmi8ykyX6bHj2z8u+4CgjA==
+MHcCAQEEINegSbU8f7Fn0qt3UooEmJScAO4zRZOb/qVw2WOnzVNhoAoGCCqGSM49
+AwEHoUQDQgAEmNYhqZsVpfbfdp5sDxcEH62JFk+gNeDT8h4zjMJXMyGGJlZjIAtp
+eZdxbdjtN06TcUvP/mgLcXSsBgYWmPbLkg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.der
index e417804aba641f..a663054a5c222d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.pem
index b322db846b7915..197e3528abbc06 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIU0FIQ61g6MQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWSgAwIBAgIIcmivShQoAeowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABK54we/72782khci6L7HX2MK6GfZi5Ylm5QAhNKSauMje3uD4TH3evW2XqHk
-gU4l7OpJveNFc2CUHRPQ1giJbfujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSXoHoPPizWhIxGX5aB9lZbHfS8STAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAg
-97fzEF8JXxZiERDG5mx2ofBR5wusPfCwg/dySHTyZAIhAO6x1Dv5Cd0NuEts99o9
-ZzMSpm6YmGzPQtPPrfAvhiET
+A0IABEtMblCfP9FCzn+R4tgvKgdl6ame8VAQbza7aA5ql5D6aFiooK0gOSZaJAmJ
+uX2CeMXp372j4o9ihzT43xttvBqjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSqsCV0GPn4+a4xfw3gjt2h3psycDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+27wKYwDQnJiaSMLmQPbn91m0oNcW9xnwPXfYTbDCSbMCIQC2CwskKg5NuikDQZ5u
+sUXl9++b8ng78bq5NJL/nV4sig==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.der
index b2f36f6d8473f1..2893761b0657f6 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.pem
index a03879cff43f6d..ab7f4deea64137 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILaVz+tv6TmiME+in8nVE2zv+qykERsueTmSkNZ4afQjoAoGCCqGSM49
-AwEHoUQDQgAErnjB7/vbvzaSFyLovsdfYwroZ9mLliWblACE0pJq4yN7e4PhMfd6
-9bZeoeSBTiXs6km940VzYJQdE9DWCIlt+w==
+MHcCAQEEILj8QRjXAME8KeodbO8YgecBR1a4ZkWb07t6MIulKwBeoAoGCCqGSM49
+AwEHoUQDQgAES0xuUJ8/0ULOf5Hi2C8qB2XpqZ7xUBBvNrtoDmqXkPpoWKigrSA5
+JlokCYm5fYJ4xenfvaPij2KHNPjfG228Gg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/test_case_vector.json
index 3aad888b99a581..54654882246a19 100644
--- a/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: VID in Subject field doesn't match VID in Issuer field",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020859dbc4aaa47e47d5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200046901cd68c4782f655209d56c41ca0cf0ed7a7b9c9e1204907d7f335b44d9a1791a91f714a333325fca3164e5d8f112378268bcca4c97e9b1e3db3f2efb80a08ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e14bae6a8731d545554a8c2069bf0064dd0e36c8301f0603551d2304183016801497a07a0f3e2cd6848c465f9681f6565b1df4bc49300a06082a8648ce3d0403020348003045022100dce89ed83c751f15f0337e80f8dfcec6146f1c2edeba463ccf68cfae949632d102206ef495c34cb2437bd28551e44e47e7694aae0be9d1e3eb9e757498d5b8ae2327",
-    "pai_cert": "308201be30820164a003020102020853414843ad60e8c4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ae78c1effbdbbf36921722e8bec75f630ae867d98b96259b940084d2926ae3237b7b83e131f77af5b65ea1e4814e25ecea49bde3457360941d13d0d608896dfba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041497a07a0f3e2cd6848c465f9681f6565b1df4bc49301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022020f7b7f3105f095f16621110c6e66c76a1f051e70bac3df0b083f7724874f264022100eeb1d43bf909dd0db84b6cf7da3d673312a66e98986ccf42d3cfadf02f862113",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e0e11ce895e44f0c37543c86489b48923b51aea6994d48ce2ec426a883c23531022100f9e5cd84abf0a323919fe968bad3423ec24e2b83018768f6553b0913baa33837",
-    "dac_private_key": "7dbaab6ad273028c2e5a2c5146b49a2af90486a48bf73858d04c726425780998",
-    "dac_public_key": "046901cd68c4782f655209d56c41ca0cf0ed7a7b9c9e1204907d7f335b44d9a1791a91f714a333325fca3164e5d8f112378268bcca4c97e9b1e3db3f2efb80a08c"
+    "dac_cert": "308201cd30820174a003020102020878b6ab2d77f820c1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000498d621a99b15a5f6df769e6c0f17041fad89164fa035e0d3f21e338cc257332186265663200b697997716dd8ed374e93714bcffe680b7174ac06061698f6cb92a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f54c3bee10d991c2f415b2851befbeee27c92609301f0603551d23041830168014aab0257418f9f8f9ae317f0de08edda1de9b3270300a06082a8648ce3d0403020347003044022030046109abb1dffa97c7bff48e46abbea1741aa0db7e041d4a08528a85c7754402205b12ba25c7b5e49b77e9fd1a4ef92bde48dda1db8776e50dbfdd2772b64f043c",
+    "pai_cert": "308201bf30820164a00302010202087268af4a142801ea300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044b4c6e509f3fd142ce7f91e2d82f2a0765e9a99ef150106f36bb680e6a9790fa6858a8a0ad2039265a240989b97d8278c5e9dfbda3e28f628734f8df1b6dbc1aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414aab0257418f9f8f9ae317f0de08edda1de9b3270301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100dbbc0a6300d09c989a48c2e640f6e7f759b4a0d716f719f03d77d84db0c249b3022100b60b0b242a0e4dba2903419e6eb145e5f7ef9bf2783bf1bab93492ff9d5e2c8a",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100eb10f6b73cfba8500f6cf106e36e7b11b5b8672872ef39f9fdd4f67701119916022100e0025a63abe9c70577dd58caa15fb18abdcdaf357e1ad663a28626984299c6c8",
+    "dac_private_key": "d7a049b53c7fb167d2ab77528a0498949c00ee3345939bfea570d963a7cd5361",
+    "dac_public_key": "0498d621a99b15a5f6df769e6c0f17041fad89164fa035e0d3f21e338cc257332186265663200b697997716dd8ed374e93714bcffe680b7174ac06061698f6cb92"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/cd.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/cd.der
index 7803a7190a2d31..8edd288afe8fa4 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_valid_in_future/cd.der and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.der
index 38a4e6ac1e53b7..c951ae41bb2667 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.pem
index 81e05f0a7f029d..63481978ca8239 100644
--- a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIRthLwKhF8DUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0zMTA2Mjgx
-NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
-REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATqOifKLkmYJMB3RLsY7IRXtFKPfcdE
-6aIAwpRdhWsVsjO0l8J3LJwC1yHWWUBAFEyQK9Mr2M8AOJKqNiDHvvo6o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUkFx9n9t7p+Hj
-TWGViPrG1yH7jREwHwYDVR0jBBgwFoAUMOBrRRehYWxjDv0z4ClLqmWiL64wCgYI
-KoZIzj0EAwIDSAAwRQIhAN5899Vst9WNbORgsCmpDWcB32Yvsz6stXooq/8tfNZ5
-AiBjKEAWFaNY3KmhdEMBIBokli8UDrCsQ0B4uA7op/Hjbw==
+MIIBzDCCAXKgAwIBAgIIR/XCNDBLDuowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAeFw0zMTA2Mjgx
+NDIzNDNaFw0zMzA2MjcxNDIzNDJaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IERB
+QzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQ4MDAwMFkw
+EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE3/yLRrC0j/8crlHixuzQZl91OHL0xEkI
+fqv29/+nEjbmG+/lq1qOmZIF8wTNIZA3DD55bLnfo8CS8qhsJgm7oqNgMF4wDAYD
+VR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFNKkWhWGF3K4XdbG
+Qkqm4rsmmeO8MB8GA1UdIwQYMBaAFD1WSJb4EH3fWAaoEqxtuRZhTvafMAoGCCqG
+SM49BAMCA0gAMEUCIQCfCbiiUUv4lvwjw4h+8S1dFehr+PtjSwBB70Ck8GaQsQIg
+Tk75vCwjjJ32L/uIRoM/cFAckylTjEUk8+Iwlb2VFlE=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.der
index 17db5fcf7757de..99e67ac7e7396b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.pem
index 61bcbe41a42d73..f8243a4d8f4ea9 100644
--- a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFwY1xVBoky9uLjKW+QNOFIRDP5z1yGpGonkq9T/8JcnoAoGCCqGSM49
-AwEHoUQDQgAE6jonyi5JmCTAd0S7GOyEV7RSj33HROmiAMKUXYVrFbIztJfCdyyc
-Atch1llAQBRMkCvTK9jPADiSqjYgx776Og==
+MHcCAQEEIEyjQ6iIn2rHQ53Ue+UL+xTKWCu2xM2svVciF8/py4jqoAoGCCqGSM49
+AwEHoUQDQgAE3/yLRrC0j/8crlHixuzQZl91OHL0xEkIfqv29/+nEjbmG+/lq1qO
+mZIF8wTNIZA3DD55bLnfo8CS8qhsJgm7og==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.der
index d611b41f376eea..d580ded70088f8 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.pem
index 1af94cdddc32ae..8c96ffc9f5596e 100644
--- a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIITbjYRrllfyUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw
-MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
-UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABFt/2QNW0x1opUKEqw1AlNuLVdglb1gped3kne4o2Lcj+QGlNJJT92lfHLqJ
-8nNc4csQzdoM9ef39fyvRiEfjlejZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQw4GtFF6FhbGMO/TPgKUuqZaIvrjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-/9qgBvao0V6PIB6kxmgu80bOuv9Ze/E7ZmNw7/QqBbcCIENSTTJGdmRvXCubWSDo
-0kqhXWOQzUIK+tyiGojpm7GV
+MIIBvDCCAWKgAwIBAgIIfu5qROi1On8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAeFw0yMjA5Mjgx
+NDIzNDNaFw0yNDA5MjcxNDIzNDJaMDAxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBB
+STEUMBIGCisGAQQBgqJ8AgEMBEZGRjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
+AAQdTrNc2IKMGIeAbbnCg+w8ju6qp9xI4W9MPxSvAF4Vp6Ct2Kc2qb+p/P49ygKj
+CT1nns0zVNUIHiyDk3bgnTCoo2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUPVZIlvgQfd9YBqgSrG25FmFO9p8wHwYDVR0j
+BBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZIzj0EAwIDSAAwRQIhAM/m
+IYT3WLFHLnyx1KuiyL/ZeoTVrEwx9h1pWftlUB8HAiAs3H7MyiS0318dAyWiDC1C
+EGtGxvkjbs+6tjSEPtMhBA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.der
index 9982c9c6df9119..6f5ddb7fba0b09 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.pem
index e86524bcec9776..393bde3e31abac 100644
--- a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBfWWCzdV+7JxSvXlCxsJP+qtVS0S4eKwQOMpOHO3kcjoAoGCCqGSM49
-AwEHoUQDQgAEW3/ZA1bTHWilQoSrDUCU24tV2CVvWCl53eSd7ijYtyP5AaU0klP3
-aV8cuonyc1zhyxDN2gz15/f1/K9GIR+OVw==
+MHcCAQEEIEv5wV7A8T+Nc8upZxZAPw7AwgeOSqR9lygRDyPS6x4+oAoGCCqGSM49
+AwEHoUQDQgAEHU6zXNiCjBiHgG25woPsPI7uqqfcSOFvTD8UrwBeFaegrdinNqm/
+qfz+PcoCowk9Z57NM1TVCB4sg5N24J0wqA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_valid_in_future/test_case_vector.json
index 64815d0e9a55d4..b3623c513884be 100644
--- a/credentials/development/commissioner_dut/struct_dac_valid_in_future/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate validity period starts in the future",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020846d84bc0a845f035300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3331303632383134323334335a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ea3a27ca2e499824c07744bb18ec8457b4528f7dc744e9a200c2945d856b15b233b497c2772c9c02d721d6594040144c902bd32bd8cf003892aa3620c7befa3aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414905c7d9fdb7ba7e1e34d619588fac6d721fb8d11301f0603551d2304183016801430e06b4517a1616c630efd33e0294baa65a22fae300a06082a8648ce3d0403020348003045022100de7cf7d56cb7d58d6ce460b029a90d6701df662fb33eacb57a28abff2d7cd67902206328401615a358dca9a1744301201a24962f140eb0ac434078b80ee8a7f1e36f",
-    "pai_cert": "308201be30820164a00302010202084db8d846b9657f25300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200045b7fd90356d31d68a54284ab0d4094db8b55d8256f582979dde49dee28d8b723f901a5349253f7695f1cba89f2735ce1cb10cdda0cf5e7f7f5fcaf46211f8e57a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041430e06b4517a1616c630efd33e0294baa65a22fae301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ffdaa006f6a8d15e8f201ea4c6682ef346cebaff597bf13b666370eff42a05b7022043524d324676646f5c2b9b5920e8d24aa15d6390cd420afadca21a88e99bb195",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100922cd7b5dadac018efcb7529ec7b464014aa65955f9f6bedb274b2be5850538602204d75b379859d1b6b666bd5f9990b2cdde952bdc06fbfc15fbe297bdd1455b79e",
-    "dac_private_key": "5c18d71541a24cbdb8b8ca5be40d3852110cfe73d721a91a89e4abd4fff09727",
-    "dac_public_key": "04ea3a27ca2e499824c07744bb18ec8457b4528f7dc744e9a200c2945d856b15b233b497c2772c9c02d721d6594040144c902bd32bd8cf003892aa3620c7befa3a"
+    "dac_cert": "308201cc30820172a003020102020847f5c234304b0eea300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c0446464631301e170d3331303632383134323334335a170d3333303632373134323334325a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004dffc8b46b0b48fff1cae51e2c6ecd0665f753872f4c449087eabf6f7ffa71236e61befe5ab5a8e999205f304cd2190370c3e796cb9dfa3c092f2a86c2609bba2a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d2a45a15861772b85dd6c6424aa6e2bb2699e3bc301f0603551d230418301680143d564896f8107ddf5806a812ac6db916614ef69f300a06082a8648ce3d04030203480030450221009f09b8a2514bf896fc23c3887ef12d5d15e86bf8fb634b0041ef40a4f06690b102204e4ef9bc2c238c9df62ffb8846833f70501c9329538c4524f3e23095bd951651",
+    "pai_cert": "308201bc30820162a00302010202087eee6a44e8b53a7f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c0446464631301e170d3232303932383134323334335a170d3234303932373134323334325a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200041d4eb35cd8828c1887806db9c283ec3c8eeeaaa7dc48e16f4c3f14af005e15a7a0add8a736a9bfa9fcfe3dca02a3093d679ecd3354d5081e2c839376e09d30a8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604143d564896f8107ddf5806a812ac6db916614ef69f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100cfe62184f758b1472e7cb1d4aba2c8bfd97a84d5ac4c31f61d6959fb65501f0702202cdc7eccca24b4df5f1d0325a20c2d42106b46c6f9236ecfbab634843ed32104",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100dba9d6d965f78bb8abad896e8adcfc6d282a4cecb5d8d6ce0a8a066839f29bf9022100e230a8ef5cf5bc455de07a1402fa9c8b83319dde36af7e88456a5c0ccc4865a4",
+    "dac_private_key": "4ca343a8889f6ac7439dd47be50bfb14ca582bb6c4cdacbd572217cfe9cb88ea",
+    "dac_public_key": "04dffc8b46b0b48fff1cae51e2c6ecd0665f753872f4c449087eabf6f7ffa71236e61befe5ab5a8e999205f304cd2190370c3e796cb9dfa3c092f2a86c2609bba2"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/cd.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/cd.der
index c6cc9f9ba51595..191f07b0090cf0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_valid_in_past/cd.der and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.der
index 9f942cf5eb3d06..6dc148945635c0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.pem
index ab8fdec3ca9cd0..0cf0c48146a780 100644
--- a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIINGjVPWtZ1dYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMTA2Mjgx
-NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
-REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQU15UFVuguhvGdZobRrZZ+grBniEij
-oXF/euUu3fEEXljwpK82trkZcEJW3yQWi7DKhsYE7jK4CtteksBDINM1o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUS76dzjsCK9Ol
-psqaCfLu7DxTgdgwHwYDVR0jBBgwFoAUAuubPzDHJ6jhlR4ZY2jOcqc4JTMwCgYI
-KoZIzj0EAwIDSAAwRQIhALVkejOXN6HUWz56eRNB7S0OatCqXpQpY8kFd3x3AZDL
-AiBjH9hxvmJGeXKA34/tm2UQgAPX97huZjUyAg0qVNhIhA==
+MIIByzCCAXKgAwIBAgIIeZjCkzVCp/swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAeFw0yMDA2Mjgx
+NDIzNDNaFw0yMjA2MjgxNDIzNDJaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IERB
+QzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQ4MDAwMFkw
+EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIJ1nG0UfSyV40vkzJBudGTUER1evBst2
+5nf6N8FiJ3JtynOE40sMuFylGv0mioeOVZY7Zb7dxfQNLMsqxzmuG6NgMF4wDAYD
+VR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFP/YBuLmqImsVfIE
+6gqLs/DD0B+SMB8GA1UdIwQYMBaAFJB5/hWD97bqNV2gGgLdthTxG6UxMAoGCCqG
+SM49BAMCA0cAMEQCIDos59f8hDbiEtawWHp2LwsIW362B73YvcvUyGrpsXcVAiAw
+7fQWmyyWiZhJpCJVybx6r44ERl7rgaRTrsM3T4Ygtg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.der
index 3ee6da7d9f48dc..b3f3920d6b57fb 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.pem
index 4024c4b5f0b799..dfe94dfbe7eced 100644
--- a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFBUJNBC3tXdgaQ3v+GHxqTUa/38r940UzrRSJrsMLeioAoGCCqGSM49
-AwEHoUQDQgAEFNeVBVboLobxnWaG0a2WfoKwZ4hIo6Fxf3rlLt3xBF5Y8KSvNra5
-GXBCVt8kFouwyobGBO4yuArbXpLAQyDTNQ==
+MHcCAQEEIGrrBxVH13oWqk3Q0n9YgfHzdGFGmvxBBgUC+QAj/W/5oAoGCCqGSM49
+AwEHoUQDQgAEIJ1nG0UfSyV40vkzJBudGTUER1evBst25nf6N8FiJ3JtynOE40sM
+uFylGv0mioeOVZY7Zb7dxfQNLMsqxzmuGw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.der
index dea87a5d2a7ac5..03cfc90cc56c7b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.pem
index fc9dd322359eac..daf570befaa5e2 100644
--- a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIM6/3FLb2b08wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw
-MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
-UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABEjDRNICkoYIMqcl90afYvst0TYH/M0Z7/ig2xbedw+4MOBgCa6ItEJNZHHM
-5pNNQ7lYtUb5PY2bmHJ/wbg+Q52jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQC65s/MMcnqOGVHhljaM5ypzglMzAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBx
-RqKMoAyIbzXnqAdBxcti2pAdHFCHj57eBrrUWk6PHAIhALCUlEh51jUwIkXQHtDZ
-Lk1FbenZA7UrrdU6DV+3nMD1
+MIIBvDCCAWKgAwIBAgIIFvAS/igTUCMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAeFw0yMjA5Mjgx
+NDIzNDNaFw0yNDA5MjcxNDIzNDJaMDAxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBB
+STEUMBIGCisGAQQBgqJ8AgEMBEZGRjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
+AATuv9WI5diVff1ZQz58+G7cQZ/LZXQkAVu9H7RWd3U5HgJkSjgqzmyQAOp5xF5Y
+0PilK055GPKblG20EhaaUoQLo2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUkHn+FYP3tuo1XaAaAt22FPEbpTEwHwYDVR0j
+BBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZIzj0EAwIDSAAwRQIgd2kf
+bzRCi95mrPULlaoxvkYnT0Jk3HejpSsvfOPwQbwCIQCGYgkMEQUZTULVGSyIh33M
+G03wqw5iCGnInoBrExdgsg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.der
index 89aa7d89dd4145..37b189f1479d93 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.pem
index 7ea4f341a47b88..8616d48cc8fe4f 100644
--- a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJQ7UBEg4WpJ+nqKylXLvvSfr/WvdGG2kFiSYVp0QmHooAoGCCqGSM49
-AwEHoUQDQgAESMNE0gKShggypyX3Rp9i+y3RNgf8zRnv+KDbFt53D7gw4GAJroi0
-Qk1kcczmk01DuVi1Rvk9jZuYcn/BuD5DnQ==
+MHcCAQEEIK9AWUI2BzuGyM71ie7JqoVDsxld5ohE4c309HB1fbB2oAoGCCqGSM49
+AwEHoUQDQgAE7r/ViOXYlX39WUM+fPhu3EGfy2V0JAFbvR+0Vnd1OR4CZEo4Ks5s
+kADqecReWND4pStOeRjym5RttBIWmlKECw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json
index c6a599820ad504..d48e04537ffa3f 100644
--- a/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Certificate validity period starts in the past",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202083468d53d6b59d5d6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3231303632383134323334335a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000414d7950556e82e86f19d6686d1ad967e82b0678848a3a1717f7ae52eddf1045e58f0a4af36b6b919704256df24168bb0ca86c604ee32b80adb5e92c04320d335a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144bbe9dce3b022bd3a5a6ca9a09f2eeec3c5381d8301f0603551d2304183016801402eb9b3f30c727a8e1951e196368ce72a7382533300a06082a8648ce3d0403020348003045022100b5647a339737a1d45b3e7a791341ed2d0e6ad0aa5e942963c905777c770190cb0220631fd871be6246797280df8fed9b65108003d7f7b86e663532020d2a54d84884",
-    "pai_cert": "308201be30820164a003020102020833aff714b6f66f4f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000448c344d20292860832a725f7469f62fb2dd13607fccd19eff8a0db16de770fb830e06009ae88b4424d6471cce6934d43b958b546f93d8d9b98727fc1b83e439da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041402eb9b3f30c727a8e1951e196368ce72a7382533301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207146a28ca00c886f35e7a80741c5cb62da901d1c50878f9ede06bad45a4e8f1c022100b094944879d635302245d01ed0d92e4d456de9d903b52badd53a0d5fb79cc0f5",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100cb29c572c7b6866da5d38c8dae26156660435978b51e16ca25a249426078f97e022100e083d7c69f32d8f18c1ad5f09dab0e7f12d59f16921040375c20e6455741aa7c",
-    "dac_private_key": "505424d042ded5dd81a437bfe187c6a4d46bfdfcafde34533ad1489aec30b7a2",
-    "dac_public_key": "0414d7950556e82e86f19d6686d1ad967e82b0678848a3a1717f7ae52eddf1045e58f0a4af36b6b919704256df24168bb0ca86c604ee32b80adb5e92c04320d335"
+    "dac_cert": "308201cb30820172a00302010202087998c2933542a7fb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c0446464631301e170d3230303632383134323334335a170d3232303632383134323334325a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004209d671b451f4b2578d2f933241b9d1935044757af06cb76e677fa37c16227726dca7384e34b0cb85ca51afd268a878e55963b65beddc5f40d2ccb2ac739ae1ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ffd806e2e6a889ac55f204ea0a8bb3f0c3d01f92301f0603551d230418301680149079fe1583f7b6ea355da01a02ddb614f11ba531300a06082a8648ce3d040302034700304402203a2ce7d7fc8436e212d6b0587a762f0b085b7eb607bdd8bdcbd4c86ae9b17715022030edf4169b2c96899849a42255c9bc7aaf8e04465eeb81a453aec3374f8620b6",
+    "pai_cert": "308201bc30820162a003020102020816f012fe28135023300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c0446464631301e170d3232303932383134323334335a170d3234303932373134323334325a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004eebfd588e5d8957dfd59433e7cf86edc419fcb657424015bbd1fb4567775391e02644a382ace6c9000ea79c45e58d0f8a52b4e7918f29b946db412169a52840ba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604149079fe1583f7b6ea355da01a02ddb614f11ba531301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022077691f6f34428bde66acf50b95aa31be46274f4264dc77a3a52b2f7ce3f041bc0221008662090c1105194d42d5192c88877dcc1b4df0ab0e620869c89e806b131760b2",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402202b43d330506c1dee3c9c1b2d40a91600567630ee881814994d8993fbae8a6ab002206f91e1a6a1a6b75f830f72cfd5fde5490567783c936b51f67595c7a5df1f2c5c",
+    "dac_private_key": "6aeb071547d77a16aa4dd0d27f5881f1f37461469afc41060502f90023fd6ff9",
+    "dac_public_key": "04209d671b451f4b2578d2f933241b9d1935044757af06cb76e677fa37c16227726dca7384e34b0cb85ca51afd268a878e55963b65beddc5f40d2ccb2ac739ae1b"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/cd.der
index ccaa15edacb435..b277e30e089c98 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.der
index f660298761207d..bdfddf981c4c4b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.pem
index db06015626a293..c83588ce6afad5 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAYGgAwIBAgIIOzVJbZMAnVgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2zCCAYGgAwIBAgIIIYwoiJ9dz4QwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
 OzA5BgNVBAMMMkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
-RjEgTXBpZDowMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQH2ucRm/hqeR
-1nt1bo5bzvi2DIn+wzNdLJv1HAKA5Vjpee+EKgncP8AeGcJKxslaNa7WiWaAkHTD
-6B8Ted3F3qNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFOQufAT9m/rdPG92JLYQibNoKky2MB8GA1UdIwQYMBaAFBKCzUsr600bgmw2
-QAx8Sb/CwWhzMAoGCCqGSM49BAMCA0gAMEUCIBkXbxAMHddR/YBDutOBrEty6MYS
-i8roiqoY5ebk5vanAiEA3iKD85I5wgUWapUVb18CSUTdS3U3MgtDmVzczzYZOn8=
+RjEgTXBpZDowMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEVCVcwRLsUFR2
+4bl5p5NfqF9xJsRWfCYb5dKC/Cb2yFET20BDFy6zx82BNbkHvCjnQIOboCFYYiEH
+KFJO+82ObqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFGeIW8ZcUT6fcVq6m/KgmTDiRMGzMB8GA1UdIwQYMBaAFEcQudwGGFfftyZm
+9CZIuRCLPuAHMAoGCCqGSM49BAMCA0gAMEUCIA/6DKSx/uMJ2HVC47AM5SDNvWuW
+1Yesj5R93mHyng0RAiEAqbKMfm03lYK22XygWg9KUbT7GJWoIztN1WzykIEHzSQ=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.der
index 12ff5b5958725c..718f5a43b93e54 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.pem
index 5d09e6ef60df0b..07963428969df7 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHEwJ71+uWZJwuc/L5oxm+3JYknUreDQItqDC4j7Pz1qoAoGCCqGSM49
-AwEHoUQDQgAEQH2ucRm/hqeR1nt1bo5bzvi2DIn+wzNdLJv1HAKA5Vjpee+EKgnc
-P8AeGcJKxslaNa7WiWaAkHTD6B8Ted3F3g==
+MHcCAQEEILWjLkbDydw6tzgWjx9Ab/oXX+93v9u5oy4kbeULf/sioAoGCCqGSM49
+AwEHoUQDQgAEVCVcwRLsUFR24bl5p5NfqF9xJsRWfCYb5dKC/Cb2yFET20BDFy6z
+x82BNbkHvCjnQIOboCFYYiEHKFJO+82Obg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.der
index 60f0ee7a62b607..2d6f12ddbfcb0f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.pem
index 1b27d13ad0ca2c..05962ce9ad6a9c 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIETiV7r4NUBkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIDcTqKdM8eY0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS3ktACjTInvBol50aM2dGhaeL5zPIG
-K3rv2AswajhT6gHIbdgrhjOiK/fNC5z1F0XDv4qDUgCulIOB1GzL4Pa7o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUEoLN
-SyvrTRuCbDZADHxJv8LBaHMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgBP8pBh6cJJGNyzsT9DHXN3gDHfgbUtoa7nMQ
-hNz3A0oCIQCN0tI8MNY0AWi7C0faH7fmpAzzAgfry2eKDQzKFG3eQA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASZ+pjYgRh23V9SCBlNE/+RfvSqDzOm
+BKJ+OOohhQffrwfbC8yO4JvoD7Zo4IlvbLlnm7TieP9U7RkKHjWda+Hho2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQURxC5
+3AYYV9+3Jmb0Jki5EIs+4AcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAMis6/vnNbuaaa8m93Ryr0BKLMHsbbxQlMYv
+0aQuhnnjAiEAlN9kNza+qD6YegKbgsgZorQMnRJT4MOBFRdMl3j9K+Q=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.der
index fe53a3409caa4d..b6902502397909 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.pem
index f47bc37d3e8a12..2af99a561e6500 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILwf5fOkdfLDl2gMDLIbKIFt1MyLLqcyCj6Kz6Ym+d0koAoGCCqGSM49
-AwEHoUQDQgAEt5LQAo0yJ7waJedGjNnRoWni+czyBit679gLMGo4U+oByG3YK4Yz
-oiv3zQuc9RdFw7+Kg1IArpSDgdRsy+D2uw==
+MHcCAQEEIIjfg2BgUaeBGo5jxKSJ0vIo5gFw072yKgm+FHt5PU32oAoGCCqGSM49
+AwEHoUQDQgAEmfqY2IEYdt1fUggZTRP/kX70qg8zpgSifjjqIYUH368H2wvMjuCb
+6A+2aOCJb2y5Z5u04nj/VO0ZCh41nWvh4Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/test_case_vector.json
index 83efc4e8be7ecf..f503b4acf3d6dd 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: valid and recommended since easily human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201db30820181a00302010202083b35496d93009d58300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004407dae7119bf86a791d67b756e8e5bcef8b60c89fec3335d2c9bf51c0280e558e979ef842a09dc3fc01e19c24ac6c95a35aed68966809074c3e81f1379ddc5dea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e42e7c04fd9bfadd3c6f7624b61089b3682a4cb6301f0603551d230418301680141282cd4b2beb4d1b826c36400c7c49bfc2c16873300a06082a8648ce3d0403020348003045022019176f100c1dd751fd8043bad381ac4b72e8c6128bcae88aaa18e5e6e4e6f6a7022100de2283f39239c205166a95156f5f024944dd4b7537320b43995cdccf36193a7f",
-    "pai_cert": "308201d43082017aa0030201020208113895eebe0d5019300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004b792d0028d3227bc1a25e7468cd9d1a169e2f9ccf2062b7aefd80b306a3853ea01c86dd82b8633a22bf7cd0b9cf51745c3bf8a835200ae948381d46ccbe0f6bba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141282cd4b2beb4d1b826c36400c7c49bfc2c16873301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022004ff29061e9c24918dcb3b13f431d73778031df81b52da1aee731084dcf7034a0221008dd2d23c30d6340168bb0b47da1fb7e6a40cf30207ebcb678a0d0cca146dde40",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206f15931bddc87a10ea25079567a08c72ee0c1f1b5479165a30f1142a40729307022100e4451639b4b1b61458f1a0f875a45c76ca468c7fff805b4fb1af6389cd52d866",
-    "dac_private_key": "713027bd7eb96649c2e73f2f9a319bedc96249d4ade0d022da830b88fb3f3d6a",
-    "dac_public_key": "04407dae7119bf86a791d67b756e8e5bcef8b60c89fec3335d2c9bf51c0280e558e979ef842a09dc3fc01e19c24ac6c95a35aed68966809074c3e81f1379ddc5de"
+    "dac_cert": "308201db30820181a0030201020208218c28889f5dcf84300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d0301070342000454255cc112ec505476e1b979a7935fa85f7126c4567c261be5d282fc26f6c85113db4043172eb3c7cd8135b907bc28e740839ba0215862210728524efbcd8e6ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041467885bc65c513e9f715aba9bf2a09930e244c1b3301f0603551d230418301680144710b9dc061857dfb72666f42648b9108b3ee007300a06082a8648ce3d040302034800304502200ffa0ca4b1fee309d87542e3b00ce520cdbd6b96d587ac8f947dde61f29e0d11022100a9b28c7e6d379582b6d97ca05a0f4a51b4fb1895a8233b4dd56cf2908107cd24",
+    "pai_cert": "308201d53082017aa00302010202080dc4ea29d33c798d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000499fa98d8811876dd5f5208194d13ff917ef4aa0f33a604a27e38ea218507dfaf07db0bcc8ee09be80fb668e0896f6cb9679bb4e278ff54ed190a1e359d6be1e1a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144710b9dc061857dfb72666f42648b9108b3ee007301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c8acebfbe735bb9a69af26f77472af404a2cc1ec6dbc5094c62fd1a42e8679e302210094df643736bea83e987a029b82c819a2b40c9d1253e0c38115174c9778fd2be4",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502210080094e7ed4e6513c65aafc6ed4a62c5ac44b191c0101b3678a3914be841913c702200642b29f67f492a898ede088c207a448d108cdc4ae992016d1e0dec1c599e750",
+    "dac_private_key": "b5a32e46c3c9dc3ab738168f1f406ffa175fef77bfdbb9a32e246de50b7ffb22",
+    "dac_public_key": "0454255cc112ec505476e1b979a7935fa85f7126c4567c261be5d282fc26f6c85113db4043172eb3c7cd8135b907bc28e740839ba0215862210728524efbcd8e6e"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/cd.der
index bb2c403d257d70..b5ba5b8aeadb7c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.der
index 46dac31321789f..2c5163c94c240e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.pem
index 820d1e76bd78ab..4e72db2567e8d6 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB3DCCAYGgAwIBAgIIIdYeWvg+mJMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB3DCCAYGgAwIBAgIIK9F6iux0GocwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
 OzA5BgNVBAMMMkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNcGlkOjAw
-QjEgTXZpZDpGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEPkw/CJjJvnsS
-KjB9pdZ3MVOpQtQkTPc8y+nmLoqZ3OttDMyb9QaQuf6D7n4W2LmXjtwO3hrnfivx
-ByLWX3qhsKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFNDVnv+6jA8GFpkuLdw5lw6y7S5nMB8GA1UdIwQYMBaAFJI64dxkATrx/V3x
-6Ni35dD1J3SSMAoGCCqGSM49BAMCA0kAMEYCIQCiPutDrAvH5u7bUEiqfnuQl8Bw
-F8/pKctRO33gWIjgKwIhAOcuDbX387UoPstD0nbSAaeWnAZaeLrQk2gPOdpSvGHM
+QjEgTXZpZDpGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEYu5OA/Tl4Pnp
+leW9yLisgi5jel1Nobjwq4RBR0HRCbHL8uXAghDERYiK+hTVgTdEoMMu0a50CY5m
+13i46SGZtqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFOaLDoThRSSD+5/2QU4EUgHWdUVGMB8GA1UdIwQYMBaAFJXj3Dg4OzKxVd5E
+MPFUmsrqFe3pMAoGCCqGSM49BAMCA0kAMEYCIQDq49AFqYmJ7nWwlmfBWbmixLjq
+UG5crhUBjeOjmz7djQIhAOAC5029A3yQt3mXEShWs7kBKuj48RBsed7jdt/+LiFx
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.der
index cc345177bf4a23..4c9d70aa9a4228 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.pem
index ed5fc1519c2728..4bdeee6ead588e 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGqO6QNrIlVbv2PCsuCPOhBoEgVPMADqzq+gFK8RVOieoAoGCCqGSM49
-AwEHoUQDQgAEPkw/CJjJvnsSKjB9pdZ3MVOpQtQkTPc8y+nmLoqZ3OttDMyb9QaQ
-uf6D7n4W2LmXjtwO3hrnfivxByLWX3qhsA==
+MHcCAQEEIJKgEd8itXn5Wl+swjYTeSIWP1uhcd2QKyy791jVVW9aoAoGCCqGSM49
+AwEHoUQDQgAEYu5OA/Tl4PnpleW9yLisgi5jel1Nobjwq4RBR0HRCbHL8uXAghDE
+RYiK+hTVgTdEoMMu0a50CY5m13i46SGZtg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.der
index f7e4d08a8650e1..0cf993fe2b2519 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.pem
index aa4c736c6db6f1..6ca5bde7c1a54f 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIImiUPDZfeAEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIEY9WcsPNO7cwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQo5RbvNKPYZ17cbRjzthEm9ry1qgcc
-2qdMLt+OJnNFJX4gPvmR4yFZqBm2ofD/hvtoQ05joIEu5dsqvOQjn1Ono2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUkjrh
-3GQBOvH9XfHo2Lfl0PUndJIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAOoz97ze7ryqVfqbcNtftLOsxRxp7bzydPra
-xJoM9h3UAiAK/zWYMvno4OCwgL1Pr+i7jE784Xv+dLbG+uhhfoAfBA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARG5spcTgWRuYiG7pgidLH64AsGNfui
+pBip2Hx/iLiHNeDofAEmdvu2w66thxgfI3o+zNlcVFeGGRpX2hBhkCYJo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUlePc
+ODg7MrFV3kQw8VSayuoV7ekwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAKl7hwp7RONta3YP2FRFT4ecSW2m01ixpdFk
+ULFf9dmZAiEAz9UJGkagua13k/94MlhlLATA0beGnjNkciP2ssRxZ8E=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.der
index b711afd3910cab..80ef9b9d1bc277 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.pem
index 2536d1af962820..2e8e300534a67b 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINob/Eh108VY2xbqe/ucQbh9bXOWoL8WGJ99E2p6c3ODoAoGCCqGSM49
-AwEHoUQDQgAEKOUW7zSj2Gde3G0Y87YRJva8taoHHNqnTC7fjiZzRSV+ID75keMh
-WagZtqHw/4b7aENOY6CBLuXbKrzkI59Tpw==
+MHcCAQEEIAOQ3pv4fziapTuxBG14MDjctuz9nVk3o+3CA2UcoutUoAoGCCqGSM49
+AwEHoUQDQgAERubKXE4FkbmIhu6YInSx+uALBjX7oqQYqdh8f4i4hzXg6HwBJnb7
+tsOurYcYHyN6PszZXFRXhhkaV9oQYZAmCQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/test_case_vector.json
index 3db487ecb0dd47..8f7047b8b3c101 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_02/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: valid and recommended since easily human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201dc30820181a003020102020821d61e5af83e9893300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7069643a30304231204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d030107034200043e4c3f0898c9be7b122a307da5d6773153a942d4244cf73ccbe9e62e8a99dceb6d0ccc9bf50690b9fe83ee7e16d8b9978edc0ede1ae77e2bf10722d65f7aa1b0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d0d59effba8c0f0616992e2ddc39970eb2ed2e67301f0603551d23041830168014923ae1dc64013af1fd5df1e8d8b7e5d0f5277492300a06082a8648ce3d0403020349003046022100a23eeb43ac0bc7e6eedb5048aa7e7b9097c07017cfe929cb513b7de05888e02b022100e72e0db5f7f3b5283ecb43d276d201a7969c065a78bad093680f39da52bc61cc",
-    "pai_cert": "308201d43082017aa00302010202082268943c365f7801300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000428e516ef34a3d8675edc6d18f3b61126f6bcb5aa071cdaa74c2edf8e267345257e203ef991e32159a819b6a1f0ff86fb68434e63a0812ee5db2abce4239f53a7a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414923ae1dc64013af1fd5df1e8d8b7e5d0f5277492301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ea33f7bcdeeebcaa55fa9b70db5fb4b3acc51c69edbcf274fadac49a0cf61dd402200aff359832f9e8e0e0b080bd4fafe8bb8c4efce17bfe74b6c6fae8617e801f04",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022074247aba404142c26d843f28e7ec34ab2326f49c492f87e14640ec452d79ac420221009173791a1a716c12e2a324ee323410f191dbce5c46b4f0a7868da1294a318e6a",
-    "dac_private_key": "6a8ee9036b22555bbf63c2b2e08f3a106812054f3000eaceafa014af1154e89e",
-    "dac_public_key": "043e4c3f0898c9be7b122a307da5d6773153a942d4244cf73ccbe9e62e8a99dceb6d0ccc9bf50690b9fe83ee7e16d8b9978edc0ede1ae77e2bf10722d65f7aa1b0"
+    "dac_cert": "308201dc30820181a00302010202082bd17a8aec741a87300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7069643a30304231204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d0301070342000462ee4e03f4e5e0f9e995e5bdc8b8ac822e637a5d4da1b8f0ab84414741d109b1cbf2e5c08210c445888afa14d5813744a0c32ed1ae74098e66d778b8e92199b6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e68b0e84e1452483fb9ff6414e045201d6754546301f0603551d2304183016801495e3dc38383b32b155de4430f1549acaea15ede9300a06082a8648ce3d0403020349003046022100eae3d005a98989ee75b09667c159b9a2c4b8ea506e5cae15018de3a39b3edd8d022100e002e74dbd037c90b77997112856b3b9012ae8f8f1106c79dee376dffe2e2171",
+    "pai_cert": "308201d53082017aa0030201020208118f5672c3cd3bb7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000446e6ca5c4e0591b98886ee982274b1fae00b0635fba2a418a9d87c7f88b88735e0e87c012676fbb6c3aead87181f237a3eccd95c545786191a57da1061902609a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041495e3dc38383b32b155de4430f1549acaea15ede9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a97b870a7b44e36d6b760fd854454f879c496da6d358b1a5d16450b15ff5d999022100cfd5091a46a0b9ad7793ff783258652c04c0d1b7869e33647223f6b2c47167c1",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c345f58fbdd7ed83339dffada42578b622301fc930ea5b93d166b075174179de022100a83e0a21d78bddf8f4c67eafa98da04fe212fe10345168a44f94c564d53d1269",
+    "dac_private_key": "92a011df22b579f95a5facc236137922163f5ba171dd902b2cbbf758d5556f5a",
+    "dac_public_key": "0462ee4e03f4e5e0f9e995e5bdc8b8ac822e637a5d4da1b8f0ab84414741d109b1cbf2e5c08210c445888afa14d5813744a0c32ed1ae74098e66d778b8e92199b6"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/cd.der
index 366eac18105acd..920207e74f1f4a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.der
index 50fb8acc27ca41..cb0bbccfcd2e0a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.pem
index 43ee1e16f37065..c8da3d10de306e 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAYGgAwIBAgIISnTFXxoHKbYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2zCCAYGgAwIBAgIIN1bdXllI5iQwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
 OzA5BgNVBAMMMk1waWQ6MDBCMSxBQ01FIE1hdHRlciBEZXZlbCBEQUMgNUNEQTk4
-OTksTXZpZDpGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEhp5Afo7BOZyq
-XqJ0ig21e/R+54P6C07jpkVuQLRmC79Fr7P/Sta96oNlbzLxQ55MNXeLMSrijSon
-YbgD6GXUhqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFMI/6wxB0lU62JlN6Egkl/xHNlpPMB8GA1UdIwQYMBaAFNT6CJryYs886wkP
-+L2JN3g6T5qTMAoGCCqGSM49BAMCA0gAMEUCIChh10VzgVm9DMtvB+YkrjoTsEor
-XJrDj3sxzB1Qr9QcAiEAz+wJaSgWYpJRQfbvyI9pHmsV0L3mDx5Mt1Vyv2W/tNA=
+OTksTXZpZDpGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEtgxCQqgwctpy
+WXTwXpw3joxekZmgB1wn1fuzw1Fr4bGd01kzA5bH1yieD2Ileymv8q8QkltlFCGo
+SYU/3ADPiqNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFKyIN3eBq5Ya96Cj89RgqV/8ayE6MB8GA1UdIwQYMBaAFPk5QawtVv+6On65
+xsxIwjbWc5SFMAoGCCqGSM49BAMCA0gAMEUCIQDZlwzKUdTzaMvod69ERfgziwDF
+22AL48XcESjjBy5t3gIgOBjThOuBfDDxL1MVVvLvDdPd6LZ0kVyEWG7hG4FyCPI=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.der
index 21ccba5c0f291a..24f49294132d6f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.pem
index 2ab4d67b2614cd..4ca41237cc812e 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAa6Tdng9kkpJmALZH/AXAws0DOJ4pNk8F8l0qNbGQBYoAoGCCqGSM49
-AwEHoUQDQgAEhp5Afo7BOZyqXqJ0ig21e/R+54P6C07jpkVuQLRmC79Fr7P/Sta9
-6oNlbzLxQ55MNXeLMSrijSonYbgD6GXUhg==
+MHcCAQEEIARc1ti8CEdFj4sCtGV7LMvzpk5OmOBNoW1QxTVYvmdboAoGCCqGSM49
+AwEHoUQDQgAEtgxCQqgwctpyWXTwXpw3joxekZmgB1wn1fuzw1Fr4bGd01kzA5bH
+1yieD2Ileymv8q8QkltlFCGoSYU/3ADPig==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.der
index c4fac21c003e6c..b23d0d3fd8146d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.pem
index f58d67b290cc63..b6e3a07b294b05 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIILS44DtS4gGgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIITSvl3t9dOvEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARi9TiJFbZMdfcmZ7VxlJqvx2hKiB+O
-La+PQcwK9FvMmNjOX5aZNfC10NabzWnV+vOBODYKQ1JI8b48GL+6xYn6o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU1PoI
-mvJizzzrCQ/4vYk3eDpPmpMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAPlnesVz0tMsHdp6AIDDRMtbgKOw9MEFRko0
-CKMsX9PQAiBCOEpJ5SSPhaMlIgCsou2uc93tO3R2eWcmAgfguidVxA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQBO6esajsfI9YrC1WCLZA74DPwAYB+
+158LrN6lFMTbvrZJAE/hMnba0b8xQZc8K63HBdqJlfn0tMYQ4UbIyVr/o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU+TlB
+rC1W/7o6frnGzEjCNtZzlIUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgVKFg4Uj0saowJ+aavDHWe0VhNGbxCTPFaWlg
+8Qqi1eUCIQC9NMMoVjXAuEyGWCs9BxbYyE1iAJnuAI5vJ+8Lpp8nUA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.der
index f609a0a1afb131..0f85d0609eb52c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.pem
index cdf10607503138..a4f30c04d6ef3a 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICiZpurfQKiLPWCv3MsUHdZxTTWPwPKasHHY+xUGNRSXoAoGCCqGSM49
-AwEHoUQDQgAEYvU4iRW2THX3Jme1cZSar8doSogfji2vj0HMCvRbzJjYzl+WmTXw
-tdDWm81p1frzgTg2CkNSSPG+PBi/usWJ+g==
+MHcCAQEEIOmxjcckzQH9UThnl9D/wnPmAD58O34AvzoIzGFn5uCWoAoGCCqGSM49
+AwEHoUQDQgAEATunrGo7HyPWKwtVgi2QO+Az8AGAftefC6zepRTE2762SQBP4TJ2
+2tG/MUGXPCutxwXaiZX59LTGEOFGyMla/w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/test_case_vector.json
index 84a15ad8645e32..63c39b604b1c54 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_03/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: valid example showing that order or separators are not considered at all for the overall validity of the embedded fields",
     "is_success_case": "true",
-    "dac_cert": "308201db30820181a00302010202084a74c55f1a0729b6300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c204441432035434441393839392c4d7669643a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004869e407e8ec1399caa5ea2748a0db57bf47ee783fa0b4ee3a6456e40b4660bbf45afb3ff4ad6bdea83656f32f1439e4c35778b312ae28d2a2761b803e865d486a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c23feb0c41d2553ad8994de8482497fc47365a4f301f0603551d23041830168014d4fa089af262cf3ceb090ff8bd8937783a4f9a93300a06082a8648ce3d040302034800304502202861d745738159bd0ccb6f07e624ae3a13b04a2b5c9ac38f7b31cc1d50afd41c022100cfec0969281662925141f6efc88f691e6b15d0bde60f1e4cb75572bf65bfb4d0",
-    "pai_cert": "308201d43082017aa00302010202082d2e380ed4b88068300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000462f5388915b64c75f72667b571949aafc7684a881f8e2daf8f41cc0af45bcc98d8ce5f969935f0b5d0d69bcd69d5faf38138360a435248f1be3c18bfbac589faa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d4fa089af262cf3ceb090ff8bd8937783a4f9a93301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100f9677ac573d2d32c1dda7a0080c344cb5b80a3b0f4c105464a3408a32c5fd3d0022042384a49e5248f85a3252200aca2edae73dded3b74767967260207e0ba2755c4",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100f4343cabd2f0ffb022ebdc949f33e87e844d1b1fd32de0756780d98bc6bfb5bf022100ff2d27474c247a17d5d5d5a435d3e241141c07b6763b88967840faeb3a7907a5",
-    "dac_private_key": "06ba4dd9e0f6492926600b647fc05c0c2cd03389e29364f05f25d2a35b190058",
-    "dac_public_key": "04869e407e8ec1399caa5ea2748a0db57bf47ee783fa0b4ee3a6456e40b4660bbf45afb3ff4ad6bdea83656f32f1439e4c35778b312ae28d2a2761b803e865d486"
+    "dac_cert": "308201db30820181a00302010202083756dd5e5948e624300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c204441432035434441393839392c4d7669643a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004b60c4242a83072da725974f05e9c378e8c5e9199a0075c27d5fbb3c3516be1b19dd359330396c7d7289e0f62257b29aff2af10925b651421a849853fdc00cf8aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ac88377781ab961af7a0a3f3d460a95ffc6b213a301f0603551d23041830168014f93941ac2d56ffba3a7eb9c6cc48c236d6739485300a06082a8648ce3d0403020348003045022100d9970cca51d4f368cbe877af4445f8338b00c5db600be3c5dc1128e3072e6dde02203818d384eb817c30f12f531556f2ef0dd3dde8b674915c84586ee11b817208f2",
+    "pai_cert": "308201d43082017aa00302010202084d2be5dedf5d3af1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004013ba7ac6a3b1f23d62b0b55822d903be033f001807ed79f0bacdea514c4dbbeb649004fe13276dad1bf3141973c2badc705da8995f9f4b4c610e146c8c95affa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f93941ac2d56ffba3a7eb9c6cc48c236d6739485301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022054a160e148f4b1aa3027e69abc31d67b45613466f10933c5696960f10aa2d5e5022100bd34c3285635c0b84c86582b3d0716d8c84d620099ee008e6f27ef0ba69f2750",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c652b84aba698335386111a799fb3443520ce1b2814daeebf86abd85f9730e48022100e47e0a508493fb4c1cbaf88b52bf71d958799452b7739540925987c44a71fed4",
+    "dac_private_key": "045cd6d8bc0847458f8b02b4657b2ccbf3a64e4e98e04da16d50c53558be675b",
+    "dac_public_key": "04b60c4242a83072da725974f05e9c378e8c5e9199a0075c27d5fbb3c3516be1b19dd359330396c7d7289e0f62257b29aff2af10925b651421a849853fdc00cf8a"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/cd.der
index 3610377f70b60d..077924f4e32d44 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.der
index d011fd3ff16598..83c426be6f48f2 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.pem
index 1b47b8c523e180..feceb00e97e3f8 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2TCCAYCgAwIBAgIITvz6jceslHEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2jCCAYCgAwIBAgIIbnu6rT6/qNgwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDwx
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDwx
 OjA4BgNVBAMMMUFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
-RjFNcGlkOjAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATHDMZOed/fGhvY
-/t66sTqFXVbDglH/284RsE3FJeJmFW/OnmSWJk/vb1bxDpbiTix6KgIBD74/hwD7
-7vmOe5sAo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
-FgQU2G6LH0KUbVgozLzpEQqCRXhSXxowHwYDVR0jBBgwFoAU8RhZ10/cIL0IUOlE
-/VEygE2wBbkwCgYIKoZIzj0EAwIDRwAwRAIgJVG3qdlBCEACquifCmpaWI6omEPz
-xtd6kjvlFvydaQoCIBxswamJurkfd3iXO3IjQFcA9S3nUEPU5Wn8uFcAmCM8
+RjFNcGlkOjAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARPDeIJEMcTZCjO
+QoqFwPczmsDsxsJQdfhrK706PkV2iYeDQhXWKuLReiU/PQx+fDcG+R8+aaT3HFyy
+5Y/R3MQWo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
+FgQUzYFO+6oP6oviNv1tfiNbVBGT4WwwHwYDVR0jBBgwFoAUvUEOr1Iaqk6QOC5t
+Rk/65ATcwHswCgYIKoZIzj0EAwIDSAAwRQIgXl54xlAFcR1gBopxfBFOlUDrX8ia
+CCvTRyMP3RjijWUCIQDEigSh0wfRX7m2KWWsZgUZFa9QyH7K5OQ6KPdLSrkJ1Q==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.der
index ea3b4ede9b15ab..e07429833de865 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.pem
index 2aa349841e009e..28981d51c4a282 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPBx0kZE8x+O9ORy9Idjf2WWmf0nmLeG4VycslqXK9AGoAoGCCqGSM49
-AwEHoUQDQgAExwzGTnnf3xob2P7eurE6hV1Ww4JR/9vOEbBNxSXiZhVvzp5kliZP
-729W8Q6W4k4seioCAQ++P4cA++75jnubAA==
+MHcCAQEEIEIm+7jNbGANyBJPONo7bklKtGRXdmtmfmsx3GIz1XJ9oAoGCCqGSM49
+AwEHoUQDQgAETw3iCRDHE2QozkKKhcD3M5rA7MbCUHX4ayu9Oj5FdomHg0IV1iri
+0XolPz0Mfnw3BvkfPmmk9xxcsuWP0dzEFg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.der
index 741fb9ef732ec3..e5ef9470a678d3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.pem
index a05e66764809eb..9cee8406c15500 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIICG7BbhEy8dswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIJ8bds8/PMvEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQLrJ7s02JpoUuRg0FN8y2q1WMpPbjU
-AOaLyAIdMd8H8+LmzV7jPxQLCziekm/Kach6gUGq6DaminUelFphK/V1o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU8RhZ
-10/cIL0IUOlE/VEygE2wBbkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgchKxZf5uNC8O5nt3rH9SNnaetgBVe5X8hq78
-ohKxG18CIFh6cJORlnBLHheAe0CdsL0ECU6wZ/mSTym7uL8KmdS/
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARAXfGkilovWCRYSJNP7Bi3zWbKJzDC
+u9UxEf8ktLm0usUfRYvyxr00T7ZQSu349Fb3fGQH4VYVQxf1NQCzVsYvo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUvUEO
+r1Iaqk6QOC5tRk/65ATcwHswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAJ/WRjvwIB4yh6cT+SXWaLbFTwdbVUeCJWxF
+NHhM37XvAiEAkIIER3AbDMZjr3//bxVZDnpEPk1niNkHjJLtdmMVuHc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.der
index 80cfe836b82bc8..9b7a6364866fe0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.pem
index 7c5a257187ff98..dc7a560a7d4d78 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILFzNpOOtmNIGVuiqW8vAafgWPvZ9eIjMvuq7xMv1IXEoAoGCCqGSM49
-AwEHoUQDQgAEC6ye7NNiaaFLkYNBTfMtqtVjKT241ADmi8gCHTHfB/Pi5s1e4z8U
-Cws4npJvymnIeoFBqug2pop1HpRaYSv1dQ==
+MHcCAQEEIIq6mRqRQaZ1C61ad2NuT70sDaXEc3vf6BufHfP7xRVsoAoGCCqGSM49
+AwEHoUQDQgAEQF3xpIpaL1gkWEiTT+wYt81myicwwrvVMRH/JLS5tLrFH0WL8sa9
+NE+2UErt+PRW93xkB+FWFUMX9TUAs1bGLw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/test_case_vector.json
index 937d17f4c5986a..2ecc078555da1f 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_04/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: valid, but less readable",
     "is_success_case": "true",
-    "dac_cert": "308201d930820180a00302010202084efcfa8dc7ac9471300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20444143203543444139383939204d7669643a464646314d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004c70cc64e79dfdf1a1bd8fedebab13a855d56c38251ffdbce11b04dc525e266156fce9e6496264fef6f56f10e96e24e2c7a2a02010fbe3f8700fbeef98e7b9b00a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d86e8b1f42946d5828ccbce9110a824578525f1a301f0603551d23041830168014f11859d74fdc20bd0850e944fd5132804db005b9300a06082a8648ce3d040302034700304402202551b7a9d941084002aae89f0a6a5a588ea89843f3c6d77a923be516fc9d690a02201c6cc1a989bab91f7778973b7223405700f52de75043d4e569fcb8570098233c",
-    "pai_cert": "308201d33082017aa0030201020208086ec16e1132f1db300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200040bac9eecd36269a14b9183414df32daad563293db8d400e68bc8021d31df07f3e2e6cd5ee33f140b0b389e926fca69c87a8141aae836a68a751e945a612bf575a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f11859d74fdc20bd0850e944fd5132804db005b9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402207212b165fe6e342f0ee67b77ac7f5236769eb600557b95fc86aefca212b11b5f0220587a70939196704b1e17807b409db0bd04094eb067f9924f29bbb8bf0a99d4bf",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ba8e07b0e614a601a72249b8e9d487d9100cf102dd0e6b19ef5f702c3ac7d67d02203d4bc4f3cf156b9db430bec8de0a72f0c59c944dbe131fdd99d744d6be05c239",
-    "dac_private_key": "f071d24644f31f8ef4e472f487637f659699fd2798b786e15c9cb25a972bd006",
-    "dac_public_key": "04c70cc64e79dfdf1a1bd8fedebab13a855d56c38251ffdbce11b04dc525e266156fce9e6496264fef6f56f10e96e24e2c7a2a02010fbe3f8700fbeef98e7b9b00"
+    "dac_cert": "308201da30820180a00302010202086e7bbaad3ebfa8d8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20444143203543444139383939204d7669643a464646314d7069643a303042313059301306072a8648ce3d020106082a8648ce3d030107034200044f0de20910c7136428ce428a85c0f7339ac0ecc6c25075f86b2bbd3a3e45768987834215d62ae2d17a253f3d0c7e7c3706f91f3e69a4f71c5cb2e58fd1dcc416a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cd814efbaa0fea8be236fd6d7e235b541193e16c301f0603551d23041830168014bd410eaf521aaa4e90382e6d464ffae404dcc07b300a06082a8648ce3d040302034800304502205e5e78c65005711d60068a717c114e9540eb5fc89a082bd347230fdd18e28d65022100c48a04a1d307d15fb9b62965ac66051915af50c87ecae4e43a28f74b4ab909d5",
+    "pai_cert": "308201d53082017aa003020102020827c6ddb3cfcf32f1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004405df1a48a5a2f58245848934fec18b7cd66ca2730c2bbd53111ff24b4b9b4bac51f458bf2c6bd344fb6504aedf8f456f77c6407e156154317f53500b356c62fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414bd410eaf521aaa4e90382e6d464ffae404dcc07b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221009fd6463bf0201e3287a713f925d668b6c54f075b554782256c4534784cdfb5ef02210090820447701b0cc663af7fff6f15590e7a443e4d6788d9078c92ed766315b877",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220100e16ff557c192bf3ed3d07598599ed5cbf264ad6f60bb5b033fa35a2eee1cb022100d51aef4415d156224a22c8ad01c9910fcfa094b18e5ca17188e07a7cd0016bd8",
+    "dac_private_key": "4226fbb8cd6c600dc8124f38da3b6e494ab46457766b667e6b31dc6233d5727d",
+    "dac_public_key": "044f0de20910c7136428ce428a85c0f7339ac0ecc6c25075f86b2bbd3a3e45768987834215d62ae2d17a253f3d0c7e7c3706f91f3e69a4f71c5cb2e58fd1dcc416"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/cd.der
index 834525bc68c47f..c4a9bbc743e03d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.der
index bf7c8e304c99dc..70f5a2da213086 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.pem
index fcb4aa34d24d61..4f45be4ba24e8e 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAX+gAwIBAgIIA9BCyJyshakwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2jCCAX+gAwIBAgIIRIgHHEjEOHIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsx
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsx
 OTA3BgNVBAMMME12aWQ6RkZGMUFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBTXBp
-ZDowMEIxOTg5OTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKhvvYvWA82S94Uq
-9G6SPA/+g7/s+QAWMsuNa62twYG50tPGlhw03cX3t2Ul3H5GiBw23sk21AyIQOdX
-yyiTZ1OjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
-BBQ2ka3t6XlUDtI8A9HMCAEroQt8izAfBgNVHSMEGDAWgBSlW3Kw/bokMjDBoNUz
-Lct614OORzAKBggqhkjOPQQDAgNJADBGAiEA0VFeohE8WcAk245XDAZ+eViZs3k5
-AlTqqg6HG3Fa1KYCIQDqdhBAxtpiR5L/6T6oxNHwYDYutn5OrmusULulM/uegQ==
+ZDowMEIxOTg5OTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABO5MW60osvBSPA/L
+9VYPq8AdCMc+/R9oBN6XQIvO58WDgU4suOJJ8Dd7MP3xSfNzdNWE/sOJ8a44HvqK
+KfZYFnujYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
+BBSFTSuzZmZWlE0EoKb/b+tDlmos9TAfBgNVHSMEGDAWgBTPUKQ/L95BUDbA0zmo
+MnlQPhUg0jAKBggqhkjOPQQDAgNJADBGAiEA8Gnk/3O4sVQ1wWPaJ17lHNBL1l6k
+8xzS1q3ukVj/XCMCIQCbjGuz1pS/aKcFg18w8QvOQAtyiBK75ppoSJJk+xZbtw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.der
index a79774ee317739..dd97e5b817c9a8 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.pem
index 4490bd1e4a0f80..417b565befb5c7 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIF6cxiruqoKBbd4S71Hciw4vZ4KnxgDYSW5c6P2VuA6+oAoGCCqGSM49
-AwEHoUQDQgAEqG+9i9YDzZL3hSr0bpI8D/6Dv+z5ABYyy41rra3BgbnS08aWHDTd
-xfe3ZSXcfkaIHDbeyTbUDIhA51fLKJNnUw==
+MHcCAQEEIHJmMXwcPF7MYHQJ20n9RIIZFuZJDFg3J3QPcbLycf0goAoGCCqGSM49
+AwEHoUQDQgAE7kxbrSiy8FI8D8v1Vg+rwB0Ixz79H2gE3pdAi87nxYOBTiy44knw
+N3sw/fFJ83N01YT+w4nxrjge+oop9lgWew==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.der
index 9fa40347022562..eb84d8d7a8969e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.pem
index 4732604832294e..563845b9de1044 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIZdBPUl3ZSVcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIBV9kTTSvb+IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASwrfOiwhX13VM+9Fib4ToYj1tK/+aN
-5a5W54aqluA0fHJuSlBSB0qjf20WYtjA+q5R58alnI9Y7uW6s2eUdb5To2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUpVty
-sP26JDIwwaDVMy3LeteDjkcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAKcv+dy0H5f8w9BlE625vml5vPokUcd8Sj7G
-E+SRQdviAiBn7wDgMDGEGCxWm3rfjpMl3M3oUoDA0mpqku/El54jsA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQB5hoXaJ+l8FfEdPDdSV2Tg2UIFoe4
+Ml3Tf+uZByv8fe9ysEu4kN7qEQvfu0RRbW6sD25oooXwV6gw0w8Xn1pZo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUz1Ck
+Py/eQVA2wNM5qDJ5UD4VINIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAPDi7FF1NqbnT9i1QyKd1rA5fiWQY0BbMtQA
+LfOi4mw4AiEA5ZPc0YZHBEn+JiZMraaTqzYcV4mIfdJVMEl2dZf5p6U=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.der
index d5cf113499e5dc..a23324cb873653 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.pem
index 45b9b9699df6e9..3fbcecda52af8e 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJA8ljo6Z9c6UMq9cVQeMr1ji607Wj1V3F6JKtcV8U94oAoGCCqGSM49
-AwEHoUQDQgAEsK3zosIV9d1TPvRYm+E6GI9bSv/mjeWuVueGqpbgNHxybkpQUgdK
-o39tFmLYwPquUefGpZyPWO7lurNnlHW+Uw==
+MHcCAQEEIE9rAfM6LlCJgdCMrV5rwjAq4EwYTwq6Ptzyg9jYe/UvoAoGCCqGSM49
+AwEHoUQDQgAEAeYaF2ifpfBXxHTw3Uldk4NlCBaHuDJd03/rmQcr/H3vcrBLuJDe
+6hEL37tEUW1urA9uaKKF8FeoMNMPF59aWQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/test_case_vector.json
index dabdf090c2ee0f..0ae04af0363c25 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_05/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: valid, but highly discouraged, since embedding of substrings within other substrings may be confusing to human readers",
     "is_success_case": "true",
-    "dac_cert": "308201da3082017fa003020102020803d042c89cac85a9300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2044414320354344414d7069643a30304231393839393059301306072a8648ce3d020106082a8648ce3d03010703420004a86fbd8bd603cd92f7852af46e923c0ffe83bfecf9001632cb8d6badadc181b9d2d3c6961c34ddc5f7b76525dc7e46881c36dec936d40c8840e757cb28936753a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143691adede979540ed23c03d1cc08012ba10b7c8b301f0603551d23041830168014a55b72b0fdba243230c1a0d5332dcb7ad7838e47300a06082a8648ce3d0403020349003046022100d1515ea2113c59c024db8e570c067e795899b379390254eaaa0e871b715ad4a6022100ea761040c6da624792ffe93ea8c4d1f060362eb67e4eae6bac50bba533fb9e81",
-    "pai_cert": "308201d43082017aa003020102020865d04f525dd94957300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004b0adf3a2c215f5dd533ef4589be13a188f5b4affe68de5ae56e786aa96e0347c726e4a5052074aa37f6d1662d8c0faae51e7c6a59c8f58eee5bab3679475be53a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a55b72b0fdba243230c1a0d5332dcb7ad7838e47301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a72ff9dcb41f97fcc3d06513adb9be6979bcfa2451c77c4a3ec613e49141dbe2022067ef00e0303184182c569b7adf8e9325dccde85280c0d26a6a92efc4979e23b0",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203a47bc6efa133d0abb42dbbfc9a92586a4a2da3f1a9a99d7c3fe3a021ea6a6270221009587f37f2b2d32a9131b4baf89291eb5dee0448b5fe019c07e278c9298383d22",
-    "dac_private_key": "5e9cc62aeeaa82816dde12ef51dc8b0e2f6782a7c600d8496e5ce8fd95b80ebe",
-    "dac_public_key": "04a86fbd8bd603cd92f7852af46e923c0ffe83bfecf9001632cb8d6badadc181b9d2d3c6961c34ddc5f7b76525dc7e46881c36dec936d40c8840e757cb28936753"
+    "dac_cert": "308201da3082017fa00302010202084488071c48c43872300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2044414320354344414d7069643a30304231393839393059301306072a8648ce3d020106082a8648ce3d03010703420004ee4c5bad28b2f0523c0fcbf5560fabc01d08c73efd1f6804de97408bcee7c583814e2cb8e249f0377b30fdf149f37374d584fec389f1ae381efa8a29f658167ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414854d2bb3666656944d04a0a6ff6feb43966a2cf5301f0603551d23041830168014cf50a43f2fde415036c0d339a83279503e1520d2300a06082a8648ce3d0403020349003046022100f069e4ff73b8b15435c163da275ee51cd04bd65ea4f31cd2d6adee9158ff5c230221009b8c6bb3d694bf68a705835f30f10bce400b728812bbe69a68489264fb165bb7",
+    "pai_cert": "308201d53082017aa0030201020208055f644d34af6fe2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000401e61a17689fa5f057c474f0dd495d938365081687b8325dd37feb99072bfc7def72b04bb890deea110bdfbb44516d6eac0f6e68a285f057a830d30f179f5a59a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414cf50a43f2fde415036c0d339a83279503e1520d2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100f0e2ec517536a6e74fd8b543229dd6b0397e259063405b32d4002df3a2e26c38022100e593dcd186470449fe26264cada693ab361c5789887dd2553049767597f9a7a5",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502205e1ea3ed215af5407a4d0b15f57b9456a7338a0ca60451a35d75adcf6ee5ca7a022100e7f6a4d997457a40d1cc798d00b3166e0a35e4b362f098dc5f6a952ebf044aee",
+    "dac_private_key": "7266317c1c3c5ecc607409db49fd44821916e6490c583727740f71b2f271fd20",
+    "dac_public_key": "04ee4c5bad28b2f0523c0fcbf5560fabc01d08c73efd1f6804de97408bcee7c583814e2cb8e249f0377b30fdf149f37374d584fec389f1ae381efa8a29f658167b"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/cd.der
index 18628b3e3f73da..e43c7e061643b0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.der
index 1386269047ba3c..a7c2f572e7ed63 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.pem
index abe94213619c88..81b44fd8180d0b 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAYCgAwIBAgIIHqEGKCZEjt8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2TCCAYCgAwIBAgIIHo+4tTMT+qAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDwx
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDwx
 OjA4BgNVBAMMMUFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
-MSBNcGlkOjAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASWiXXUBEogF1jb
-vdT5RqaFF3JKCBTX+GN59RsvquU7TkuY6Mc8LdFCdwu5Os5NMXy4txWd6fTwfkC2
-rtmjSL4po2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
-FgQU6JqrRSSPlUKyaC7VnHHxRZY8FIYwHwYDVR0jBBgwFoAUIB7X+3FHJbpVQg5/
-TZPkRM2MzhswCgYIKoZIzj0EAwIDSQAwRgIhAN1tFsNbeBM0DmifDVBsj1kqfPwE
-JLZTln42kDNC/bGoAiEA7oX4VS9affx1aRi7w/eScjyOdPJOeerSQx7cKDYUxe0=
+MSBNcGlkOjAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATXkhEkGprtLadO
+GrUPk8c3nxuTFRyciHFEuN0SuyhfqqLoPdLrvIVuE1/FwXsJxXpgpgrJcAsT2BEO
+TF6aZqzao2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
+FgQUUI5x8ep4WZLpIasUSaQ61Yqk868wHwYDVR0jBBgwFoAUXN8vq79SwX+l57LJ
+l04euxnHGxswCgYIKoZIzj0EAwIDRwAwRAIgJobfOPeifIiUgfzXIs/NNsYutcWI
+fIYUvtPvL37dtA4CICb4w8AOlxMgWQ+798e4RSa0PeqgKmY2S2j5sBODNGoC
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.der
index fc8158672ff67e..bdaa9344386448 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.pem
index c14f53ab01525b..e1d94167564347 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIA+3xFeX8pcPw319z/8jlqmBW3SPsQy+KOYoT3akOC2HoAoGCCqGSM49
-AwEHoUQDQgAElol11ARKIBdY273U+UamhRdySggU1/hjefUbL6rlO05LmOjHPC3R
-QncLuTrOTTF8uLcVnen08H5Atq7Zo0i+KQ==
+MHcCAQEEIPTjr+28zJHb9/YeN2VMCqzrXJv0CsyZUuo5DuoiDejgoAoGCCqGSM49
+AwEHoUQDQgAE15IRJBqa7S2nThq1D5PHN58bkxUcnIhxRLjdErsoX6qi6D3S67yF
+bhNfxcF7CcV6YKYKyXALE9gRDkxemmas2g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.der
index 10c2746615b5d0..971eb9330f5f01 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.pem
index 42f4e8aeb8e230..b97f33c7075536 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIFqLPvZmMAgYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIKf+c0NT6NnkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS3bpAKmbunzCXVnGqYWNqb5eScKJRR
-jst2qwltCs0l3/NN3nrvwZjQ2Fo9cIunkirze0/wtFKbLgHlUgxafmg9o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUIB7X
-+3FHJbpVQg5/TZPkRM2MzhswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAI/ZEDpADHnTpayOYZR22ZlhRFTPwgU5HwOg
-YG38mbErAiEA2kIM3CJPsXL8fJHRXTUC12Mdvvq7rUQ7hN2HUOX1AWc=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASgUsO6f/z3OOO537v9gJruO3aUs+un
+jW2i18oxM50uXm/zOyJxnCbPql2pMpfMd+FQapszNUjN/YIIGhbpt0Bqo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUXN8v
+q79SwX+l57LJl04euxnHGxswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgM4KKJjBuLxgxXicMsmzcbuQr6SLuaaWu1JoM
++PtTypACIB6+QWcoLHA62bXwX/d3TvgZzAcFAoj5MMx+mLYleIt5
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.der
index 0d515fbdc4e064..1f101680150f73 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.pem
index f8ca08cd407fbd..dbc3f23a2e7fe8 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIABeLLAql3Dhr9j5SbfUlotxyR7VVM/us1+1BqGK6CRjoAoGCCqGSM49
-AwEHoUQDQgAEt26QCpm7p8wl1ZxqmFjam+XknCiUUY7LdqsJbQrNJd/zTd5678GY
-0NhaPXCLp5Iq83tP8LRSmy4B5VIMWn5oPQ==
+MHcCAQEEIMxsGbw2k/d1InnISpgqkWNVk7zAQ2sMHzOPRDC409AhoAoGCCqGSM49
+AwEHoUQDQgAEoFLDun/89zjjud+7/YCa7jt2lLPrp41totfKMTOdLl5v8zsicZwm
+z6pdqTKXzHfhUGqbMzVIzf2CCBoW6bdAag==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/test_case_vector.json
index 402970a14e5b5a..d8bf73a4323047 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mvid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "false",
-    "dac_cert": "308201db30820180a00302010202081ea1062826448edf300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20444143203543444139383939204d7669643a464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004968975d4044a201758dbbdd4f946a68517724a0814d7f86379f51b2faae53b4e4b98e8c73c2dd142770bb93ace4d317cb8b7159de9f4f07e40b6aed9a348be29a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e89aab45248f9542b2682ed59c71f145963c1486301f0603551d23041830168014201ed7fb714725ba55420e7f4d93e444cd8cce1b300a06082a8648ce3d0403020349003046022100dd6d16c35b7813340e689f0d506c8f592a7cfc0424b653967e36903342fdb1a8022100ee85f8552f5a7dfc756918bbc3f792723c8e74f24e79ead2431edc283614c5ed",
-    "pai_cert": "308201d53082017aa003020102020816a2cfbd998c0206300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004b76e900a99bba7cc25d59c6a9858da9be5e49c2894518ecb76ab096d0acd25dff34dde7aefc198d0d85a3d708ba7922af37b4ff0b4529b2e01e5520c5a7e683da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414201ed7fb714725ba55420e7f4d93e444cd8cce1b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008fd9103a400c79d3a5ac8e619476d999614454cfc205391f03a0606dfc99b12b022100da420cdc224fb172fc7c91d15d3502d7631dbefabbad443b84dd8750e5f50167",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100db81169174ad456c5ccd40466029a3f5411daf37c2de57bf8f070fb9c4dab63002207a74ec81ce64ef0b352099a9193ac44127d84ef35abc70f7d75b90f209a25c60",
-    "dac_private_key": "0fb7c45797f2970fc37d7dcfff2396a9815b748fb10cbe28e6284f76a4382d87",
-    "dac_public_key": "04968975d4044a201758dbbdd4f946a68517724a0814d7f86379f51b2faae53b4e4b98e8c73c2dd142770bb93ace4d317cb8b7159de9f4f07e40b6aed9a348be29"
+    "dac_cert": "308201d930820180a00302010202081e8fb8b53313faa0300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20444143203543444139383939204d7669643a464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004d79211241a9aed2da74e1ab50f93c7379f1b93151c9c887144b8dd12bb285faaa2e83dd2ebbc856e135fc5c17b09c57a60a60ac9700b13d8110e4c5e9a66acdaa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414508e71f1ea785992e921ab1449a43ad58aa4f3af301f0603551d230418301680145cdf2fabbf52c17fa5e7b2c9974e1ebb19c71b1b300a06082a8648ce3d040302034700304402202686df38f7a27c889481fcd722cfcd36c62eb5c5887c8614bed3ef2f7eddb40e022026f8c3c00e971320590fbbf7c7b84526b43deaa02a66364b68f9b01383346a02",
+    "pai_cert": "308201d33082017aa003020102020829ff9cd0d4fa3679300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004a052c3ba7ffcf738e3b9dfbbfd809aee3b7694b3eba78d6da2d7ca31339d2e5e6ff33b22719c26cfaa5da93297cc77e1506a9b333548cdfd82081a16e9b7406aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145cdf2fabbf52c17fa5e7b2c9974e1ebb19c71b1b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022033828a26306e2f18315e270cb26cdc6ee42be922ee69a5aed49a0cf8fb53ca9002201ebe4167282c703ad9b5f05ff7774ef819cc07050288f930cc7e98b625788b79",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e1a9240f055e6c87e0a4f870d24664cc6a1bca1b32041e41ee5423a835ea6452022100a2449e952ac701724ea2f44c6650d4e0281887e3f3506a1d6163723749ad7b91",
+    "dac_private_key": "f4e3afedbccc91dbf7f61e37654c0aaceb5c9bf40acc9952ea390eea220de8e0",
+    "dac_public_key": "04d79211241a9aed2da74e1ab50f93c7379f1b93151c9c887144b8dd12bb285faaa2e83dd2ebbc856e135fc5c17b09c57a60a60ac9700b13d8110e4c5e9a66acda"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/cd.der
index a5b3385fca173d..bfb756f1c41c9b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.der
index b995e6231ab8e7..7e650b6fc9d80b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.pem
index 343f06cf2cac15..4cf77f10395656 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAYGgAwIBAgIIZRjzUKjNt3QwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2jCCAYGgAwIBAgIICMtDEFeuyr4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMD0x
 OzA5BgNVBAMMMkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOmZm
-ZjEgTXBpZDowMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuUZ7Q438KZ/C
-2E4fWIGh3w8O3aqWVMty+R2UPRFMyUHS42lWpittbAZaaMb03zow5dnQENJTd0li
-+9FYudzsm6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFIH9ScqDp/ev0Nr/L8rVNK0QtideMB8GA1UdIwQYMBaAFPjY6V5krLORbvmb
-NG+xDx6OfdWTMAoGCCqGSM49BAMCA0gAMEUCIH6JjKKXnzGeuiYKXGjqQ+EGYIef
-px0VDcGoTPKCKdaOAiEAwvzJKOf9oukeO6WfmmUq9otZVUnwPndEGMv85aCL6aw=
+ZjEgTXBpZDowMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEvxuiQGuAp8DJ
+0iU6rkT84SxMS2dlWmSCrwPYQnqn8FPdX9u/0S1QIRKOYSvUUKxb0LKHtNa9xSlb
+W3fOqDErYaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFFZlRGk/yUfwdEd5/xYS0nGR1Bc+MB8GA1UdIwQYMBaAFGXECUxDv4i0MrgW
+99JdJ6IpovMTMAoGCCqGSM49BAMCA0cAMEQCIGRpM4PyBEWuGZhv+kTNM1wZGA51
+eV8nEKu8RGA9ZMVOAiBU/sAT95Q814mUhJU3Z3HnA4O/wQN9LIWx8GwQRhdRBg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.der
index 873ce95e792dbb..a7b97c3711a2d2 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.pem
index 275bd3a58049c6..b450dc971bb639 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICEztKZV/C362cadqo6Gynxj7BrsQN8NNPGndr/jHa28oAoGCCqGSM49
-AwEHoUQDQgAEuUZ7Q438KZ/C2E4fWIGh3w8O3aqWVMty+R2UPRFMyUHS42lWpitt
-bAZaaMb03zow5dnQENJTd0li+9FYudzsmw==
+MHcCAQEEIALNHxO+UXsxBBMJavEwnZVeGDMOuvCWA03otIMBfTZUoAoGCCqGSM49
+AwEHoUQDQgAEvxuiQGuAp8DJ0iU6rkT84SxMS2dlWmSCrwPYQnqn8FPdX9u/0S1Q
+IRKOYSvUUKxb0LKHtNa9xSlbW3fOqDErYQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.der
index 5794663bdbd444..4c97e26402bd9d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.pem
index 125e6cb289bece..cad11eae96d580 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIWuvpr16xspIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIHT2NwMLCj1owCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ98w8m87NKiwMMmMpVmhHv1Tkj2fDo
-WdNhDmF8WTjsQroxXRx5HvEx/GqnDLJt1DI5XezR8edV6Ky6/bB7zFuvo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU+Njp
-XmSss5Fu+Zs0b7EPHo591ZMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgBsrbbL/SVqyHr8IX8YN2F1hiTx+6A1TJMUXm
-tlchRvkCIQCrWjv1F+RwNjDM2/Q4LJw7BDpyX/t1vNNtY8aqssTH1w==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQvADgVjJ+oY0Ka8Lns5kUrR/9ZTw+k
+2TQCDww93tnTRdgxK5HhcJB/cHctmi6zgrBFBCmDN2uUB4hszC22LQKXo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUZcQJ
+TEO/iLQyuBb30l0noimi8xMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIfL+xB3521BiKTVXORC+M0gr3vSEMpgk/mPhrz
+coLv3QIhAISz4Ny0NymSMug8kZ1lUnpggVTh9AqMT4r3KCjhwxa6
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.der
index 98e95be1f1fc33..624f400a293166 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.pem
index 4c0cdd71856f3a..711025387bab26 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDRlyjgCT6FCtfpb7skRwkaptv6JykCnAgPaQxTbWPLEoAoGCCqGSM49
-AwEHoUQDQgAEPfMPJvOzSosDDJjKVZoR79U5I9nw6FnTYQ5hfFk47EK6MV0ceR7x
-MfxqpwyybdQyOV3s0fHnVeisuv2we8xbrw==
+MHcCAQEEILtJbrpTLNeucmZblpsP2kV6ZGRF4HCc/uQpayTQmDbMoAoGCCqGSM49
+AwEHoUQDQgAELwA4FYyfqGNCmvC57OZFK0f/WU8PpNk0Ag8MPd7Z00XYMSuR4XCQ
+f3B3LZous4KwRQQpgzdrlAeIbMwtti0Clw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/test_case_vector.json
index fbd4f875bd7a5a..0da0d32f3e62de 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mvid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "false",
-    "dac_cert": "308201db30820181a00302010202086518f350a8cdb774300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a66666631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004b9467b438dfc299fc2d84e1f5881a1df0f0eddaa9654cb72f91d943d114cc941d2e36956a62b6d6c065a68c6f4df3a30e5d9d010d253774962fbd158b9dcec9ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041481fd49ca83a7f7afd0daff2fcad534ad10b6275e301f0603551d23041830168014f8d8e95e64acb3916ef99b346fb10f1e8e7dd593300a06082a8648ce3d040302034800304502207e898ca2979f319eba260a5c68ea43e10660879fa71d150dc1a84cf28229d68e022100c2fcc928e7fda2e91e3ba59f9a652af68b595549f03e774418cbfce5a08be9ac",
-    "pai_cert": "308201d43082017aa00302010202085aebe9af5eb1b292300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200043df30f26f3b34a8b030c98ca559a11efd53923d9f0e859d3610e617c5938ec42ba315d1c791ef131fc6aa70cb26dd432395decd1f1e755e8acbafdb07bcc5bafa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f8d8e95e64acb3916ef99b346fb10f1e8e7dd593301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022006cadb6cbfd256ac87afc217f183761758624f1fba0354c93145e6b6572146f9022100ab5a3bf517e4703630ccdbf4382c9c3b043a725ffb75bcd36d63c6aab2c4c7d7",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100eb2e7339e5fa623b2ac178dc56a043619450d70dd708b8891eff7fa15e68ebcf02206128bcb23417e9f8c67add6f4bf49cf3dbd547be249a48d253fa5b64490103b7",
-    "dac_private_key": "2133b4a655fc2dfad9c69daa8e86ca7c63ec1aec40df0d34f1a776bfe31dadbc",
-    "dac_public_key": "04b9467b438dfc299fc2d84e1f5881a1df0f0eddaa9654cb72f91d943d114cc941d2e36956a62b6d6c065a68c6f4df3a30e5d9d010d253774962fbd158b9dcec9b"
+    "dac_cert": "308201da30820181a003020102020808cb431057aecabe300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a66666631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004bf1ba2406b80a7c0c9d2253aae44fce12c4c4b67655a6482af03d8427aa7f053dd5fdbbfd12d5021128e612bd450ac5bd0b287b4d6bdc5295b5b77cea8312b61a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414566544693fc947f0744779ff1612d27191d4173e301f0603551d2304183016801465c4094c43bf88b432b816f7d25d27a229a2f313300a06082a8648ce3d0403020347003044022064693383f20445ae19986ffa44cd335c19180e75795f2710abbc44603d64c54e022054fec013f7943cd789948495376771e70383bfc1037d2c85b1f06c1046175106",
+    "pai_cert": "308201d33082017aa00302010202081d3d8dc0c2c28f5a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200042f0038158c9fa863429af0b9ece6452b47ff594f0fa4d934020f0c3dded9d345d8312b91e170907f70772d9a2eb382b045042983376b9407886ccc2db62d0297a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041465c4094c43bf88b432b816f7d25d27a229a2f313301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044021f2fec41df9db50622935573910be33482bdef484329824fe63e1af37282efdd02210084b3e0dcb437299232e83c919d65527a608154e1f40a8c4f8af72828e1c316ba",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100d8b1c71d5289d9b26d25d64c2c1e33b5d9da868cedf796924f3d2ecce3c480a602203d452031217f0759733d9fef6b5dd4946fc6c1bbec8800cc84927b4f54a7da71",
+    "dac_private_key": "02cd1f13be517b310413096af1309d955e18330ebaf096034de8b483017d3654",
+    "dac_public_key": "04bf1ba2406b80a7c0c9d2253aae44fce12c4c4b67655a6482af03d8427aa7f053dd5fdbbfd12d5021128e612bd450ac5bd0b287b4d6bdc5295b5b77cea8312b61"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/cd.der
index e95bf172cd1e0a..34e129bfc32ebe 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.der
index cfa7bfb3d90f58..6818c25469fb9f 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.pem
index 706b0e245697b1..03dd768c8f4757 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAX+gAwIBAgIIRdc2agcgiA8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB2jCCAX+gAwIBAgIIFRGAhMwgJWMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsx
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDsx
 OTA3BgNVBAMMMEFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
-RjEgTXBpZDpCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABHgrcjeVyMXlwBt2
-ensnbD6nSsUc4Gsgb2vpqmi1zbetmaKVsF1snUKmcG9MCRZeiH1jTBsgA89Ett6U
-aNr9zNqjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
-BBTNzgkdBqaRv/23PGLSttJUWoxojTAfBgNVHSMEGDAWgBSMmj0ENolvSSvBxX5S
-xO442+xZNTAKBggqhkjOPQQDAgNJADBGAiEAt04LXs/yjyyfRhYzIB876i0f6GYL
-7VD0vsfaNaQG2IwCIQC7uj1JiBhCKR6CKIcEKE9ok9AJFDSuF6drpZkNowZXug==
+RjEgTXBpZDpCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJpLqUI0AXj1VyuX
+CU1wE+3cr1derWlLF59uxMnUADEMHvCqjDXUFtTGI0NrSwTcuVvxnzz4+9MCVFY8
+44yaNZmjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
+BBRoD8MyqfRnqF9nrLPLEcx08OZiCTAfBgNVHSMEGDAWgBQrt8urCvIJqwKlS9dM
+nyNV4bvlHzAKBggqhkjOPQQDAgNJADBGAiEApP4TTTkrdRTZENEDKK1Y2PFRTNwX
+NOLHBGO0DC4foJcCIQCKlzYPOj3Tg3hfaZzQ+YmajTzcihqjmm55tpkrv9dtIA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.der
index 6cf3cb1c2bbd30..c67b0b8a28b8f7 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.pem
index cf28ff35f88193..30898b41796bf7 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIEIrk8squUoma4D0iE4TDIr2W7eer0SThfV7G5M1LV9oAoGCCqGSM49
-AwEHoUQDQgAEeCtyN5XIxeXAG3Z6eydsPqdKxRzgayBva+mqaLXNt62ZopWwXWyd
-QqZwb0wJFl6IfWNMGyADz0S23pRo2v3M2g==
+MHcCAQEEIAZ/5LpJz8xuRsnxHZQAcWdKr4J0CYecw4pGv/3zv9EboAoGCCqGSM49
+AwEHoUQDQgAEmkupQjQBePVXK5cJTXAT7dyvV16taUsXn27EydQAMQwe8KqMNdQW
+1MYjQ2tLBNy5W/GfPPj70wJUVjzjjJo1mQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.der
index cf335504861898..4062883acc331a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.pem
index e82b99056d7fa6..e76f2f748f8a37 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIVoWsSomdvwIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIQrFiyTI4LawwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT3UF1TBtvSByHCglTYGFnBOYELyImA
-+x96RDWC8cE1CLYPfgibpWJ7/Nu+K1tY0ObBxa6iM2uOGMp41Y7pzjoeo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUjJo9
-BDaJb0krwcV+UsTuONvsWTUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAImoSTzlsp75m7Y8hvxeV6CCIhI8QE5UhWhP
-O+sNdCjSAiEA9F5nJ7Jh2Rau2mhVdMz6pUqbLQWtqyFHhxxcT/LUpEU=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS9tClwv5bkDmaDFG/VXqX0RhXH29Bl
+JkggVzgEqXz9yIYYPjAKVGoECw95pO81pCDWe+Sgnt3JS+UiaapRJWfGo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUK7fL
+qwryCasCpUvXTJ8jVeG75R8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgTKOYoFPDzFXu4puzhs1JPEpBG+OPiQfiFDPw
+4BWdkaoCIQCuzRTJlTtUT9TY7eeIW+WWEThaGL+xBOVCYii7gBtTGQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.der
index 203f4759eb1d90..947eef6fc4c984 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.pem
index 32e1c5d75da702..1d201eb53ed2b0 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOL7u+tUjos2ym0OyG4edywyRbhcSwgmKFTlW9rXFSmboAoGCCqGSM49
-AwEHoUQDQgAE91BdUwbb0gchwoJU2BhZwTmBC8iJgPsfekQ1gvHBNQi2D34Im6Vi
-e/zbvitbWNDmwcWuojNrjhjKeNWO6c46Hg==
+MHcCAQEEIOtImXBbhUOZkadCKdqtiIuS3UhuWwG7VvSH1P40O8xcoAoGCCqGSM49
+AwEHoUQDQgAEvbQpcL+W5A5mgxRv1V6l9EYVx9vQZSZIIFc4BKl8/ciGGD4wClRq
+BAsPeaTvNaQg1nvkoJ7dyUvlImmqUSVnxg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/test_case_vector.json
index c8ae5216111419..15b13083dab8ca 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mpid: is not exactly 4 uppercase hexadecimal digits",
-    "is_success_case": "true",
-    "dac_cert": "308201da3082017fa003020102020845d7366a0720880f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a303b3139303706035504030c3041434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a42313059301306072a8648ce3d020106082a8648ce3d03010703420004782b723795c8c5e5c01b767a7b276c3ea74ac51ce06b206f6be9aa68b5cdb7ad99a295b05d6c9d42a6706f4c09165e887d634c1b2003cf44b6de9468dafdccdaa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cdce091d06a691bffdb73c62d2b6d2545a8c688d301f0603551d230418301680148c9a3d0436896f492bc1c57e52c4ee38dbec5935300a06082a8648ce3d0403020349003046022100b74e0b5ecff28f2c9f461633201f3bea2d1fe8660bed50f4bec7da35a406d88c022100bbba3d49881842291e82288704284f6893d0091434ae17a76ba5990da30657ba",
-    "pai_cert": "308201d53082017aa00302010202085685ac4a899dbf02300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004f7505d5306dbd20721c28254d81859c139810bc88980fb1f7a443582f1c13508b60f7e089ba5627bfcdbbe2b5b58d0e6c1c5aea2336b8e18ca78d58ee9ce3a1ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148c9a3d0436896f492bc1c57e52c4ee38dbec5935301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210089a8493ce5b29ef99bb63c86fc5e57a08222123c404e5485684f3beb0d7428d2022100f45e6727b261d916aeda685574ccfaa54a9b2d05adab2147871c5c4ff2d4a445",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022029d94c00ec2edbd96f902ee085f93e5d1ead042a70b6e67d38cc1cf77339ac7b022100f0bf06e5ad0c8f0dcb9daa138b12d7a9b8fb57759dd194c76107e17280e7a9e9",
-    "dac_private_key": "8108ae4f2caae52899ae03d221384c322bd96ede7abd124e17d5ec6e4cd4b57d",
-    "dac_public_key": "04782b723795c8c5e5c01b767a7b276c3ea74ac51ce06b206f6be9aa68b5cdb7ad99a295b05d6c9d42a6706f4c09165e887d634c1b2003cf44b6de9468dafdccda"
+    "is_success_case": "false",
+    "dac_cert": "308201da3082017fa003020102020815118084cc202563300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a303b3139303706035504030c3041434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a42313059301306072a8648ce3d020106082a8648ce3d030107034200049a4ba942340178f5572b97094d7013eddcaf575ead694b179f6ec4c9d400310c1ef0aa8c35d416d4c623436b4b04dcb95bf19f3cf8fbd30254563ce38c9a3599a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414680fc332a9f467a85f67acb3cb11cc74f0e66209301f0603551d230418301680142bb7cbab0af209ab02a54bd74c9f2355e1bbe51f300a06082a8648ce3d0403020349003046022100a4fe134d392b7514d910d10328ad58d8f1514cdc1734e2c70463b40c2e1fa0970221008a97360f3a3dd383785f699cd0f9899a8d3cdc8a1aa39a6e79b6992bbfd76d20",
+    "pai_cert": "308201d43082017aa003020102020842b162c932382dac300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004bdb42970bf96e40e6683146fd55ea5f44615c7dbd065264820573804a97cfdc886183e300a546a040b0f79a4ef35a420d67be4a09eddc94be52269aa512567c6a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604142bb7cbab0af209ab02a54bd74c9f2355e1bbe51f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204ca398a053c3cc55eee29bb386cd493c4a411be38f8907e21433f0e0159d91aa022100aecd14c9953b544fd4d8ede7885be59611385a18bfb104e5426228bb801b5319",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220580f20832badfc322185a629da2b41a0341aa12dd72f592852722191efee5162022029c288ce573eec499ca06e84aafecdb538cb2da979021437c6788a0bc1156cd2",
+    "dac_private_key": "067fe4ba49cfcc6e46c9f11d940071674aaf827409879cc38a46bffdf3bfd11b",
+    "dac_public_key": "049a4ba942340178f5572b97094d7013eddcaf575ead694b179f6ec4c9d400310c1ef0aa8c35d416d4c623436b4b04dcb95bf19f3cf8fbd30254563ce38c9a3599"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/cd.der
index 25a2de099307c9..e5cc399da934e3 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.der
index af15b5b5669256..7370ff44cb53ac 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.pem
index c68f3b3d0dd655..a104a4b27cd3c0 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1jCCAX2gAwIBAgIIAuVIyDZ3jtUwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIB1jCCAX2gAwIBAgIIb/ouXuth1AYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDkx
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMDkx
 NzA1BgNVBAMMLkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNcGlkOiBN
-dmlkOkZGRjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ4sfxio+ExbKidjmeh
-berpXn+MV5k85E5MBW8C2xU3tfgCiuIAr81KlWjeMTcXaQ5M7Bu7UPqLWOGxHJdq
-ODxwo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-qPmgH+chVnKDvod/a7yVegJmH9MwHwYDVR0jBBgwFoAUJxMKHN4s/bYpexAh1sVe
-GFu16jkwCgYIKoZIzj0EAwIDRwAwRAIgRbm1w0EpFFlCBVh17DkpJ1iwu0d5fXgv
-LvIwV3eUDX4CIDEwdffps9dllp9ucdz4/bdFxUNRgy286EZiVyLyXxhV
+dmlkOkZGRjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATOTXCEOiMlLrp0YUo3
+9aUwm04Tvmaotds7r0S/gNWaToON61UOn9RIHZ9U0hTvXtmvgiMHRAJy/ufhZthj
+6sZso2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+3gDVOb0DYmhJ2ia0X9rPeIT/zI0wHwYDVR0jBBgwFoAU36i0akm1ZrCZ4rzQm9RJ
+oNX1LkkwCgYIKoZIzj0EAwIDRwAwRAIgf7gvHr5qsRoeUTP+7xPG1tY8ba1kEz2r
+jYGRDJnm7pUCID+gwi7lgXdIlmHNKk0PA0sMNYcy3nvcFMzl70qyyV89
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.der
index a917f8d2b438f6..28a1f000825fce 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.pem
index 0dcc6efe62531f..ca845f8a1ee696 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIH4xly84rf6wbvLlREh4+Ynk7fLenCzUhscN/4/JAg2/oAoGCCqGSM49
-AwEHoUQDQgAEOLH8YqPhMWyonY5noW3q6V5/jFeZPOROTAVvAtsVN7X4AoriAK/N
-SpVo3jE3F2kOTOwbu1D6i1jhsRyXajg8cA==
+MHcCAQEEIKwUQIK2LfMygk1+3r3pVwjNZQyIWz+1J3QQChCac6N2oAoGCCqGSM49
+AwEHoUQDQgAEzk1whDojJS66dGFKN/WlMJtOE75mqLXbO69Ev4DVmk6DjetVDp/U
+SB2fVNIU717Zr4IjB0QCcv7n4WbYY+rGbA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.der
index 95d79cc3e41422..49b8962575440e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.pem
index 1add203b43cbff..5614c2f59a3dae 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIUf03pXlOWRkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIBUp5+rKTcLMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQjh5unjBZBybfwK9Ewq8BqY0wE/VDm
-9CrZ0/sJqP8aar5GdgpensXyPNEzlE3pLezGda/t6k9HXpFx6ZWvSySHo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUJxMK
-HN4s/bYpexAh1sVeGFu16jkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgRwRQpzqkUKTPpqOef3DXfsTcL3P+bAx9Xr+k
-JJohhKwCIBCu7FpDCnsPPnu6bz4uXRfF6p+2mOzKroIZJktIaDCZ
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQkFqfVi7u0G8d/ybPHk6jH0qL3+FgV
+dUxFRTYdkYBi2CvtxemH1HpI5ypXaEFkbRJpp4OIQHXyPgpspELaiyEpo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU36i0
+akm1ZrCZ4rzQm9RJoNX1LkkwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgTD8io9N8QvIo65RBgVuwWVGtonl35CjoFOMS
+LET3iRwCIQD7jEWNu0UNFquQTNikO/C7DzMBhdaPPgCkDtOU0Fd29g==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.der
index b5fd3d63637aca..9fef798c7e373a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.pem
index 228c7638eb4735..99aec4119699f3 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDfh4g5FMJSr2VZRpkgkDxmOomBBN8CjnECo1zPtnH0CoAoGCCqGSM49
-AwEHoUQDQgAEI4ebp4wWQcm38CvRMKvAamNMBP1Q5vQq2dP7Caj/Gmq+RnYKXp7F
-8jzRM5RN6S3sxnWv7epPR16RcemVr0skhw==
+MHcCAQEEIOh9Vq1KZqrtB8R7mKyfB9bxx344s3mRjv0EF6FYVmHRoAoGCCqGSM49
+AwEHoUQDQgAEJBan1Yu7tBvHf8mzx5Oox9Ki9/hYFXVMRUU2HZGAYtgr7cXph9R6
+SOcqV2hBZG0SaaeDiEB18j4KbKRC2oshKQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/test_case_vector.json
index 9e39983387604b..485d082b3da7dc 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mpid: is not exactly 4 uppercase hexadecimal digits",
-    "is_success_case": "true",
-    "dac_cert": "308201d63082017da003020102020802e548c836778ed5300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30393137303506035504030c2e41434d45204d617474657220446576656c20444143203543444139383939204d7069643a204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d0301070342000438b1fc62a3e1316ca89d8e67a16deae95e7f8c57993ce44e4c056f02db1537b5f8028ae200afcd4a9568de313717690e4cec1bbb50fa8b58e1b11c976a383c70a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a8f9a01fe721567283be877f6bbc957a02661fd3301f0603551d2304183016801427130a1cde2cfdb6297b1021d6c55e185bb5ea39300a06082a8648ce3d0403020347003044022045b9b5c34129145942055875ec39292758b0bb47797d782f2ef2305777940d7e0220313075f7e9b3d765969f6e71dcf8fdb745c54351832dbce846625722f25f1855",
-    "pai_cert": "308201d33082017aa003020102020851fd37a5794e5919300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000423879ba78c1641c9b7f02bd130abc06a634c04fd50e6f42ad9d3fb09a8ff1a6abe46760a5e9ec5f23cd133944de92decc675afedea4f475e9171e995af4b2487a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041427130a1cde2cfdb6297b1021d6c55e185bb5ea39301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220470450a73aa450a4cfa6a39e7f70d77ec4dc2f73fe6c0c7d5ebfa4249a2184ac022010aeec5a430a7b0f3e7bba6f3e2e5d17c5ea9fb698eccaae8219264b48683099",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502205bd2d16fefa65655f9a705fb428bd5ee01773de2e05b723af4148f54d14cffb2022100ed04766f4af742c816bfe1d72c2f269f18e6cd7768569bef21305f5e875bc0b5",
-    "dac_private_key": "7e31972f38adfeb06ef2e5444878f989e4edf2de9c2cd486c70dff8fc9020dbf",
-    "dac_public_key": "0438b1fc62a3e1316ca89d8e67a16deae95e7f8c57993ce44e4c056f02db1537b5f8028ae200afcd4a9568de313717690e4cec1bbb50fa8b58e1b11c976a383c70"
+    "is_success_case": "false",
+    "dac_cert": "308201d63082017da00302010202086ffa2e5eeb61d406300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a30393137303506035504030c2e41434d45204d617474657220446576656c20444143203543444139383939204d7069643a204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ce4d70843a23252eba74614a37f5a5309b4e13be66a8b5db3baf44bf80d59a4e838deb550e9fd4481d9f54d214ef5ed9af822307440272fee7e166d863eac66ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414de00d539bd03626849da26b45fdacf7884ffcc8d301f0603551d23041830168014dfa8b46a49b566b099e2bcd09bd449a0d5f52e49300a06082a8648ce3d040302034700304402207fb82f1ebe6ab11a1e5133feef13c6d6d63c6dad64133dab8d81910c99e6ee9502203fa0c22ee58177489661cd2a4d0f034b0c358732de7bdc14cce5ef4ab2c95f3d",
+    "pai_cert": "308201d43082017aa0030201020208054a79fab29370b3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200042416a7d58bbbb41bc77fc9b3c793a8c7d2a2f7f85815754c4545361d918062d82bedc5e987d47a48e72a576841646d1269a783884075f23e0a6ca442da8b2129a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414dfa8b46a49b566b099e2bcd09bd449a0d5f52e49301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204c3f22a3d37c42f228eb9441815bb05951ada27977e428e814e3122c44f7891c022100fb8c458dbb450d16ab904cd8a43bf0bb0f330185d68f3e00a40ed394d05776f6",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201dde96d7c08e23175c5052dfaa521bb8a063f84c5899a52436b5d032aab93aea022029a551c50d0d52133c388cb23d3adc1389149ea22449fc42390241bd67f3b2f1",
+    "dac_private_key": "ac144082b62df332824d7edebde95708cd650c885b3fb52774100a109a73a376",
+    "dac_public_key": "04ce4d70843a23252eba74614a37f5a5309b4e13be66a8b5db3baf44bf80d59a4e838deb550e9fd4481d9f54d214ef5ed9af822307440272fee7e166d863eac66c"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/cd.der
index c5b130d25d7f18..394cb3e0dc57ae 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.der
index 8d04f315802148..28f2577935d151 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.pem
index 63aaa6f64bd634..dabf4bbf5f978b 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWOgAwIBAgIIFwm21D5leEYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIBvTCCAWOgAwIBAgIIMKgSvHxcRf4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMB8x
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMB8x
 HTAbBgNVBAMMFE12aWQ6RkZGIE1waWQ6MDBCMTB4MFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEImiJ1h4mbvuSAm4myIrF0TOgDZwUutwRlRqP0P8YHGoInS/M328V
-Rr8hCUxC8rvVzFJGxoobu7dLEzDJOjhkDqNgMF4wDAYDVR0TAQH/BAIwADAOBgNV
-HQ8BAf8EBAMCB4AwHQYDVR0OBBYEFJFiGLywnrJYdKzqVtqGYoFNkV29MB8GA1Ud
-IwQYMBaAFJkfmcpeVVE7cpf0Icn7SD/uaJ74MAoGCCqGSM49BAMCA0gAMEUCIBUC
-JEHKhV0qIyh5Xl8dpcrhAj4A+L5u1wXNYHkmZpGiAiEAqKz0RN3GuQJ1cUIxEwUX
-XaAcLuyIfgAyTRuxHfmxZ78=
+zj0DAQcDQgAEgGW+Urj0qyyvMBPQU0bBZons1F1c13nzI9YvYdhkhmzLJwOYdAnc
+jVuZsWu3wksRs1uxNPnfIUJbo52gFyVAo6NgMF4wDAYDVR0TAQH/BAIwADAOBgNV
+HQ8BAf8EBAMCB4AwHQYDVR0OBBYEFIygFn78PHZcka3w5s731mLh6xU4MB8GA1Ud
+IwQYMBaAFOYKXkuSF5ZSkTJ+BbbqvP2AMmZAMAoGCCqGSM49BAMCA0gAMEUCIQDR
+dEnzz4OoXRbnxDQ7wQ4mS9ySh1qAUat/Py7qZIG0UQIgHr05UMe+UP9iIt/sFZDn
+sgHZqri79/GKD5riPwAUAJ8=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.der
index 5822f4e879e87e..b9fbcb46845191 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.pem
index 619032165f13c5..f94af477b17d92 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDKEMqqGdIXf2w9CYwWCrP8eV8YHz6KOnSXxsZUGHwaQoAoGCCqGSM49
-AwEHoUQDQgAEImiJ1h4mbvuSAm4myIrF0TOgDZwUutwRlRqP0P8YHGoInS/M328V
-Rr8hCUxC8rvVzFJGxoobu7dLEzDJOjhkDg==
+MHcCAQEEIP63MHXorZfjev2ohfFwDh1jVcdTk1OHRI3tO2c1RWHIoAoGCCqGSM49
+AwEHoUQDQgAEgGW+Urj0qyyvMBPQU0bBZons1F1c13nzI9YvYdhkhmzLJwOYdAnc
+jVuZsWu3wksRs1uxNPnfIUJbo52gFyVAow==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.der
index 414329a0386664..79ba6570505e10 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.pem
index a61e2f79d78ea9..b385ffc0e9e312 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIMVvjwSHDcEEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIMrqUxC902h4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQmCuOhyAmJArwvY9shyDRMh3pO6sft
-4uKZYgLml0JNYZiRkSxFX/Dz3+wPHMjVkHAWevn5GiFzL7/BbFPGUeHJo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmR+Z
-yl5VUTtyl/QhyftIP+5onvgwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMshV2U/mhdpLpzjLlMHmB59+yVppRYbaG2/
-gdDU/6W+AiBRgfq9jfcV2t3Ol+TM3iVy3Bx7hSxCbw583MGg0We2aQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARojuhge3ILmZeuUb1ttbRGfeqIeUWD
+tD+O554ZufQSDjEjWul0kSfngFkRMQkNIRRyHRTwiD9QCKfMyq1OYVbso2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU5gpe
+S5IXllKRMn4Ftuq8/YAyZkAwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgFMhaCvwbtvJNi57/H7p+8EkzDnzUnJc74AoO
+b1nplzcCIAT/hN+xQnTON1Em5gnmedNMb16G0bZnG18l8i3a/FcR
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.der
index 420d1e4d6f2e68..9930bf39d7a657 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.pem
index bd8aaced94886b..59deb241092202 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIITY6T7+FZFqQsXYUylUcog4SG9GA8lZSs7sqhV/vXjZoAoGCCqGSM49
-AwEHoUQDQgAEJgrjocgJiQK8L2PbIcg0TId6TurH7eLimWIC5pdCTWGYkZEsRV/w
-89/sDxzI1ZBwFnr5+Rohcy+/wWxTxlHhyQ==
+MHcCAQEEIHMII9sEEbO5mQUhyGVRY0exdjitztyCSU5dw9+31ZfpoAoGCCqGSM49
+AwEHoUQDQgAEaI7oYHtyC5mXrlG9bbW0Rn3qiHlFg7Q/jueeGbn0Eg4xI1rpdJEn
+54BZETEJDSEUch0U8Ig/UAinzMqtTmFW7A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/test_case_vector.json
index 6f3c33f0f09a88..22e6fb2f2de4b7 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example: invalid VID encoding",
     "is_success_case": "false",
-    "dac_cert": "308201bd30820163a00302010202081709b6d43e657846300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783059301306072a8648ce3d020106082a8648ce3d03010703420004226889d61e266efb92026e26c88ac5d133a00d9c14badc11951a8fd0ff181c6a089d2fccdf6f1546bf21094c42f2bbd5cc5246c68a1bbbb74b1330c93a38640ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414916218bcb09eb25874acea56da8662814d915dbd301f0603551d23041830168014991f99ca5e55513b7297f421c9fb483fee689ef8300a06082a8648ce3d0403020348003045022015022441ca855d2a2328795e5f1da5cae1023e00f8be6ed705cd6079266691a2022100a8acf444ddc6b902757142311305175da01c2eec887e00324d1bb11df9b167bf",
-    "pai_cert": "308201d43082017aa0030201020208315be3c121c37041300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004260ae3a1c8098902bc2f63db21c8344c877a4eeac7ede2e2996202e697424d619891912c455ff0f3dfec0f1cc8d59070167af9f91a21732fbfc16c53c651e1c9a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414991f99ca5e55513b7297f421c9fb483fee689ef8301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100cb2157653f9a17692e9ce32e5307981e7dfb2569a5161b686dbf81d0d4ffa5be02205181fabd8df715daddce97e4ccde2572dc1c7b852c426f0e7cdcc1a0d167b669",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ec5a3ea09ab47803ffc961536ecc11c23d1d2c51eb48a0d6992e6c319d0dc8e9022100a2a463706f470c04c82037c98d3af0e628f88968089faf1bc28fce0708c31f52",
-    "dac_private_key": "328432aa867485dfdb0f42630582acff1e57c607cfa28e9d25f1b195061f0690",
-    "dac_public_key": "04226889d61e266efb92026e26c88ac5d133a00d9c14badc11951a8fd0ff181c6a089d2fccdf6f1546bf21094c42f2bbd5cc5246c68a1bbbb74b1330c93a38640e"
+    "dac_cert": "308201bd30820163a003020102020830a812bc7c5c45fe300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783059301306072a8648ce3d020106082a8648ce3d030107034200048065be52b8f4ab2caf3013d05346c16689ecd45d5cd779f323d62f61d864866ccb2703987409dc8d5b99b16bb7c24b11b35bb134f9df21425ba39da0172540a3a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148ca0167efc3c765c91adf0e6cef7d662e1eb1538301f0603551d23041830168014e60a5e4b9217965291327e05b6eabcfd80326640300a06082a8648ce3d0403020348003045022100d17449f3cf83a85d16e7c4343bc10e264bdc92875a8051ab7f3f2eea6481b45102201ebd3950c7be50ff6222dfec1590e7b201d9aab8bbf7f18a0f9ae23f0014009f",
+    "pai_cert": "308201d33082017aa003020102020832ba94c42f74da1e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004688ee8607b720b9997ae51bd6db5b4467dea88794583b43f8ee79e19b9f4120e31235ae9749127e780591131090d2114721d14f0883f5008a7cccaad4e6156eca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414e60a5e4b9217965291327e05b6eabcfd80326640301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022014c85a0afc1bb6f24d8b9eff1fba7ef049330e7cd49c973be00a0e6f59e99737022004ff84dfb14274ce375126e609e679d34c6f5e86d1b6671b5f25f22ddafc5711",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220664fde5adea91e45342122a9d1d6df5cb634b50956bad69157b91aa8ccba0084022100ba2c1fb85725104068eaead244ba215aed326a21433d1e712771b9a8f3bc4de3",
+    "dac_private_key": "feb73075e8ad97e37afda885f1700e1d6355c753935387448ded3b67354561c8",
+    "dac_public_key": "048065be52b8f4ab2caf3013d05346c16689ecd45d5cd779f323d62f61d864866ccb2703987409dc8d5b99b16bb7c24b11b35bb134f9df21425ba39da0172540a3"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/cd.der
index ed5b7738646861..87e953475ef504 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.der
index f8eb7053caac1f..ee757213900b9c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.pem
index a70210942b2ead..1b6142aad1dbbe 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXOgAwIBAgIIIitx1aHRPOkwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIBzDCCAXOgAwIBAgIIK2Xj3FJ12z0wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
 LTArBgNVBAMMJE1waWRNdmlkOkZGRjEwIE1hdHRlciBUZXN0IE1waWQ6MDBCMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABJzBPJvaW0RnMp/CguFAK2ytCJIVL1vU
-sBns5qUIs/cXWeOQJclm/vkmJOYlPYizz9qgLQYVD49J6AhFej8MGfCjYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBSdaCX5qs6KEHKV
-2kd5QMMhpMRRoTAfBgNVHSMEGDAWgBRevkyXFL+sWJUbv5NQytu/Etao9zAKBggq
-hkjOPQQDAgNHADBEAiATgexv++hnJux/eOyvzCrN1gmVBAMs8vqO7JJQdELrMgIg
-PgTKlUIpS2PZmS+L33Owe8LWL4yqOkuCkfHBSQKY8PQ=
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABLpoCvgZuSW83tyb+K2wgM1Lz8eyhyNq
+SZ4MH+a7M8MMGMlUVaoHqY/8ZZRaItbj5yW0O7Bw/QL0fVDmhZ8CrP2jYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBQb1aVCrN1BDEQM
+EiS0kpUfWUrjqTAfBgNVHSMEGDAWgBQce3uMm5RECGRVykzjtlY9Lbb8XzAKBggq
+hkjOPQQDAgNHADBEAiBQZ1Tvrbg1bwZXMfjrzyL9fVd5eMnchUs46f/4cty0AQIg
+F+vLb+RyEs2IPdnmOSg8aegZ4kgIa9WVFZHioOk8vMM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.der
index 54410c40b446f2..4b91cc732fe70a 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.pem
index 9afe13a81d555e..bf4dcf19bc469b 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAS+c1CQ1+Eal+JgF38f7Kyb06e//VDRcL4t9maV9JdqoAoGCCqGSM49
-AwEHoUQDQgAEnME8m9pbRGcyn8KC4UArbK0IkhUvW9SwGezmpQiz9xdZ45AlyWb+
-+SYk5iU9iLPP2qAtBhUPj0noCEV6PwwZ8A==
+MHcCAQEEIEMCTVhe0jsPPVrAApgfL5fH5tMpRYmLqFtEZ8YIGSFHoAoGCCqGSM49
+AwEHoUQDQgAEumgK+Bm5Jbze3Jv4rbCAzUvPx7KHI2pJngwf5rszwwwYyVRVqgep
+j/xllFoi1uPnJbQ7sHD9AvR9UOaFnwKs/Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.der
index 0c9042a88b0000..2e644a688e71d9 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.pem
index b571ed2a8b948f..5919ef0a895963 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIGsfIcrFlzaswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXqgAwIBAgIIGLHgdtwKrt8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQIfJSWhVUS7UUuvl1o46X527OhLcn4
-XFbgbatxH6rfbLmRnaplXkP9OpoLS1tsxKfOAwjeZWSIcyU3uJJUGMHUo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUXr5M
-lxS/rFiVG7+TUMrbvxLWqPcwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgSHnzU8k12434iTZyHt0OVonP/D+Pd+l87t1d
-TXq4cggCIQC9aljd6cyB016IY3vd4Odi6ylVrnN/4BIjhXKipTOg0A==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ4PxHKiZNcUSUEpMOVObmqtOEfKS2J
+7ycbq4BR0LUVcoJLQaPiyOjuVTONFD6ZMLR7R6rkOMm02pWq3QbMfWP/o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUHHt7
+jJuURAhkVcpM47ZWPS22/F8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDRwAwRAIgWFQClu5WnSGbZuEuoULdphAdZb4ESFyl/rUU
+/I6P9mgCIBlO/PUI1K36Ph5oIDYD4oDj39mcHwV6f6o1hWRXGl5E
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.der
index 6a040f6550a9b3..bcb408c5c50582 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.pem
index 58cf647d313db0..e5507ae9703a7e 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJTpdibSWKPfpLF/dhEFRL4L88WPXLYXPFsAc4Y/So4zoAoGCCqGSM49
-AwEHoUQDQgAECHyUloVVEu1FLr5daOOl+duzoS3J+FxW4G2rcR+q32y5kZ2qZV5D
-/TqaC0tbbMSnzgMI3mVkiHMlN7iSVBjB1A==
+MHcCAQEEIGyXkvBsykxpjGv5jbQJUK2XEZeCIKJCYA7ue3D3WpP+oAoGCCqGSM49
+AwEHoUQDQgAEOD8RyomTXFElBKTDlTm5qrThHyktie8nG6uAUdC1FXKCS0Gj4sjo
+7lUzjRQ+mTC0e0eq5DjJtNqVqt0GzH1j/w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/test_case_vector.json
index 9b385b105c160b..461b111e9870a0 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example: valid, but less human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201cc30820173a0030201020208222b71d5a1d13ce9300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d030107034200049cc13c9bda5b4467329fc282e1402b6cad0892152f5bd4b019ece6a508b3f71759e39025c966fef92624e6253d88b3cfdaa02d06150f8f49e808457a3f0c19f0a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604149d6825f9aace8a107295da477940c321a4c451a1301f0603551d230418301680145ebe4c9714bfac58951bbf9350cadbbf12d6a8f7300a06082a8648ce3d040302034700304402201381ec6ffbe86726ec7f78ecafcc2acdd6099504032cf2fa8eec92507442eb3202203e04ca9542294b63d9992f8bdf73b07bc2d62f8caa3a4b8291f1c1490298f0f4",
-    "pai_cert": "308201d43082017aa00302010202081ac7c872b165cdab300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004087c9496855512ed452ebe5d68e3a5f9dbb3a12dc9f85c56e06dab711faadf6cb9919daa655e43fd3a9a0b4b5b6cc4a7ce0308de656488732537b8925418c1d4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145ebe4c9714bfac58951bbf9350cadbbf12d6a8f7301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204879f353c935db8df88936721edd0e5689cffc3f8f77e97ceedd5d4d7ab87208022100bd6a58dde9cc81d35e88637bdde0e762eb2955ae737fe012238572a2a533a0d0",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e77fd18b36a4d3211fb7ee5c3042961df807093662e210d9917e25510eb16f5902210087a9c532d3bf9442c3fc8abe3c1416fb237f721b09184dbfe8880ed82c6d1343",
-    "dac_private_key": "04be735090d7e11a97e260177f1fecac9bd3a7bffd50d170be2df66695f4976a",
-    "dac_public_key": "049cc13c9bda5b4467329fc282e1402b6cad0892152f5bd4b019ece6a508b3f71759e39025c966fef92624e6253d88b3cfdaa02d06150f8f49e808457a3f0c19f0"
+    "dac_cert": "308201cc30820173a00302010202082b65e3dc5275db3d300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004ba680af819b925bcdedc9bf8adb080cd4bcfc7b287236a499e0c1fe6bb33c30c18c95455aa07a98ffc65945a22d6e3e725b43bb070fd02f47d50e6859f02acfda360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141bd5a542acdd410c440c1224b492951f594ae3a9301f0603551d230418301680141c7b7b8c9b9444086455ca4ce3b6563d2db6fc5f300a06082a8648ce3d04030203470030440220506754efadb8356f065731f8ebcf22fd7d577978c9dc854b38e9fff872dcb401022017ebcb6fe47212cd883dd9e639283c69e819e248086bd5951591e2a0e93cbcc3",
+    "pai_cert": "308201d33082017aa003020102020818b1e076dc0aaedf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004383f11ca89935c512504a4c39539b9aab4e11f292d89ef271bab8051d0b51572824b41a3e2c8e8ee55338d143e9930b47b47aae438c9b4da95aadd06cc7d63ffa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141c7b7b8c9b9444086455ca4ce3b6563d2db6fc5f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022058540296ee569d219b66e12ea142dda6101d65be04485ca5feb514fc8e8ff6680220194efcf508d4adfa3e1e68203603e280e3dfd99c1f057a7faa358564571a5e44",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220427a3a99df86e798d5b7a2a840b0b260058873852a384eb67d8604eb3b78c500022100f59b32440d29408adcbcb3b608b1ce68382f6981e230fb5e7d637da4dbf878d1",
+    "dac_private_key": "43024d585ed23b0f3d5ac002981f2f97c7e6d32945898ba85b4467c608192147",
+    "dac_public_key": "04ba680af819b925bcdedc9bf8adb080cd4bcfc7b287236a499e0c1fe6bb33c30c18c95455aa07a98ffc65945a22d6e3e725b43bb070fd02f47d50e6859f02acfd"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/cd.der
index 9eafdeca2c5be5..f0f9b831f34218 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.der
index 5e058f15ff72a4..f9ba7a183f3e06 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.pem
index 2b6bbd9792f488..fb88e707598f71 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByTCCAW6gAwIBAgIIJ45b3h2TMZwwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIByDCCAW6gAwIBAgIIfIQh7P55SbowCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMCox
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMCox
 KDAmBgNVBAMMH01hdHRlciBEZXZlbCBEQUMgTXBpZDpNdmlkOkZmZjEwWTATBgcq
-hkjOPQIBBggqhkjOPQMBBwNCAAQPTyr25kU+9k7JwRuOPoyadkTZJ/+9v0f/1bzS
-NoAydNBx/u9jeYMXZkYoUOlHxHJy/aVOS5Rg2LoIjRAduYSPo2AwXjAMBgNVHRMB
-Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUemfzsm3Y6nidqX7t9Lgo
-XKudFNswHwYDVR0jBBgwFoAUsreMFKQanWi+c5wJov0/7Z8PIfQwCgYIKoZIzj0E
-AwIDSQAwRgIhAIWu/SiZtGSK9+40SOmzotFAAqQl+3OFPLNPKcGNDcJ7AiEA7Aut
-yvi3ihKeFhivBsRbQgjCIXQekB7hrhdguSXj9+k=
+hkjOPQIBBggqhkjOPQMBBwNCAAS9S6aMtYDgmTELiQ8auJPavn39zXlp5k4wejVl
+uF/2E+w2s1UinOwW7ei3l9hr/DThxIxaecRmK3hNkggQ+wEVo2AwXjAMBgNVHRMB
+Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQULscJRjqzM0of13yB7Zgt
+/6HRTyIwHwYDVR0jBBgwFoAU3fADddQ8ZQR8Hwj1gQFkYjpvpxMwCgYIKoZIzj0E
+AwIDSAAwRQIhAI2c/IxOhpytYzb2gmYmDaeIcrrTaW/BexaZO4ovTlRfAiBCPNZO
+YZr5vL9fqs1Eo65s9f6NDlu14Lu0ZTYSONzigg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.der
index 149072b7380e1d..eb673960c87c25 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.pem
index ab3117fb003835..6f89b74abd3c05 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIP6VgKXIgWBBs72lii01PW2fVYgB3dz7IQs0dYloeAemoAoGCCqGSM49
-AwEHoUQDQgAED08q9uZFPvZOycEbjj6MmnZE2Sf/vb9H/9W80jaAMnTQcf7vY3mD
-F2ZGKFDpR8Rycv2lTkuUYNi6CI0QHbmEjw==
+MHcCAQEEII18hGtas67Nhg/a4zLRCGkPwvgavNOFXH2e0S2hU3K1oAoGCCqGSM49
+AwEHoUQDQgAEvUumjLWA4JkxC4kPGriT2r59/c15aeZOMHo1Zbhf9hPsNrNVIpzs
+Fu3ot5fYa/w04cSMWnnEZit4TZIIEPsBFQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.der
index 20312dbf708520..d414a64f5cc143 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.pem
index c6e223a8b0c9f1..7524c094e06b6e 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIZxPTDGemVVUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIISuL9TGEedFswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQXZ0wtop3KWFSCGWwsGKmtsRJUyGMU
-62xBosc7j6ZJAX5zcv9/yOfHJHC3zgV+nNu8XzoHmJ/VFpEvCUx5we7go2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUsreM
-FKQanWi+c5wJov0/7Z8PIfQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgA98b5eYDTxuHIYZ8kFrpp+mE8p3W7UBV0MsM
-DzumKbECIAn+vDEbKT9bT+cUbrjrCsNvvqtM95+Vw54m/BBFaQ7h
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQeBgnzK44J1Jl2nHUMoHoToXduiNPF
+wLcJQtJHiGXGqCCNnzLtOl1uj+vCmgvqfI7EK8lYzkvNBXoC431oq86ro2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU3fAD
+ddQ8ZQR8Hwj1gQFkYjpvpxMwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAMFVDzqod438JVAy8vojId+QpF2uCClJwhGL
+PNSaLEznAiAkMOv5vat6aNpkLWMfPltqQelKtGoU1K5Vg3XbsRrZ1w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.der
index d3af2abcd8149e..92536204cd21b8 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.pem
index e67ec7f7f94a1a..226ce60f063ca6 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIA8UbQqTAVI+/u8Nt6NifiUus3hh6RXgmRQ2/Plmwff9oAoGCCqGSM49
-AwEHoUQDQgAEF2dMLaKdylhUghlsLBiprbESVMhjFOtsQaLHO4+mSQF+c3L/f8jn
-xyRwt84FfpzbvF86B5if1RaRLwlMecHu4A==
+MHcCAQEEIMliWgq05ZNCyCPtJP1OQXuJ+9d6jixiG3xTxjgsJ92yoAoGCCqGSM49
+AwEHoUQDQgAEHgYJ8yuOCdSZdpx1DKB6E6F3bojTxcC3CULSR4hlxqggjZ8y7Tpd
+bo/rwpoL6nyOxCvJWM5LzQV6AuN9aKvOqw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/test_case_vector.json
index 7c8dc423526f89..c947eb0d00da7b 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example: invalid, PID not present and VID not upper case",
     "is_success_case": "false",
-    "dac_cert": "308201c93082016ea0030201020208278e5bde1d93319c300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a302a3128302606035504030c1f4d617474657220446576656c20444143204d7069643a4d7669643a466666313059301306072a8648ce3d020106082a8648ce3d030107034200040f4f2af6e6453ef64ec9c11b8e3e8c9a7644d927ffbdbf47ffd5bcd236803274d071feef6379831766462850e947c47272fda54e4b9460d8ba088d101db9848fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147a67f3b26dd8ea789da97eedf4b8285cab9d14db301f0603551d23041830168014b2b78c14a41a9d68be739c09a2fd3fed9f0f21f4300a06082a8648ce3d040302034900304602210085aefd2899b4648af7ee3448e9b3a2d14002a425fb73853cb34f29c18d0dc27b022100ec0badcaf8b78a129e1618af06c45b4208c221741e901ee1ae1760b925e3f7e9",
-    "pai_cert": "308201d33082017aa00302010202086713d30c67a65555300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000417674c2da29dca585482196c2c18a9adb11254c86314eb6c41a2c73b8fa649017e7372ff7fc8e7c72470b7ce057e9cdbbc5f3a07989fd516912f094c79c1eee0a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b2b78c14a41a9d68be739c09a2fd3fed9f0f21f4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022003df1be5e6034f1b8721867c905ae9a7e984f29dd6ed4055d0cb0c0f3ba629b1022009febc311b293f5b4fe7146eb8eb0ac36fbeab4cf79f95c39e26fc1045690ee1",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022059ed1566d873ec02ed3a966dca830403b2a6a285af230e09f06c29627da62ca1022005f431992215f1fc38be50d86be77007498b52fcdc4a458715145604c2ff3da4",
-    "dac_private_key": "fe9580a5c8816041b3bda58a2d353d6d9f558801dddcfb210b347589687807a6",
-    "dac_public_key": "040f4f2af6e6453ef64ec9c11b8e3e8c9a7644d927ffbdbf47ffd5bcd236803274d071feef6379831766462850e947c47272fda54e4b9460d8ba088d101db9848f"
+    "dac_cert": "308201c83082016ea00302010202087c8421ecfe7949ba300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a302a3128302606035504030c1f4d617474657220446576656c20444143204d7069643a4d7669643a466666313059301306072a8648ce3d020106082a8648ce3d03010703420004bd4ba68cb580e099310b890f1ab893dabe7dfdcd7969e64e307a3565b85ff613ec36b355229cec16ede8b797d86bfc34e1c48c5a79c4662b784d920810fb0115a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604142ec709463ab3334a1fd77c81ed982dffa1d14f22301f0603551d23041830168014ddf00375d43c65047c1f08f5810164623a6fa713300a06082a8648ce3d04030203480030450221008d9cfc8c4e869cad6336f68266260da78872bad3696fc17b16993b8a2f4e545f0220423cd64e619af9bcbf5faacd44a3ae6cf5fe8d0e5bb5e0bbb465361238dce282",
+    "pai_cert": "308201d43082017aa00302010202084ae2fd4c611e745b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200041e0609f32b8e09d499769c750ca07a13a1776e88d3c5c0b70942d2478865c6a8208d9f32ed3a5d6e8febc29a0bea7c8ec42bc958ce4bcd057a02e37d68abceaba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ddf00375d43c65047c1f08f5810164623a6fa713301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100c1550f3aa8778dfc255032f2fa2321df90a45dae082949c2118b3cd49a2c4ce702202430ebf9bdab7a68da642d631f3e5b6a41e94ab46a14d4ae558375dbb11ad9d7",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201af8cbecbb93be21db9bfe79c87ec7a1ded945770b575ca07d0d3cbacced41620220794cc4afd4f78c505d6dce4f370d62d3baf077f19da4cf9880da21eed8190fa5",
+    "dac_private_key": "8d7c846b5ab3aecd860fdae332d108690fc2f81abcd3855c7d9ed12da15372b5",
+    "dac_public_key": "04bd4ba68cb580e099310b890f1ab893dabe7dfdcd7969e64e307a3565b85ff613ec36b355229cec16ede8b797d86bfc34e1c48c5a79c4662b784d920810fb0115"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/cd.der
index 4bca7171a623e5..d465786f625ff4 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.der
index 2601c6266d2a4b..cfa0cd2fca5ca4 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.pem
index d4f21847a8b975..2543269dc9d9c0 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXOgAwIBAgIIJoawc3KzJl8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIBzDCCAXOgAwIBAgIIP4Jj+4O/5q4wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
 LTArBgNVBAMMJE1hdHRlciBEZXZlbCBEQUMgTXBpZDowMEIxIE1WSUQ6RkZGMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABD2YE7Dh/stS3xRYC1y57dWtzrSxQrkn
-9yh7+eFnAp8rsZ/HPiEhjDUQuRlZv+TJsFMOTaMIGpPQmB9/6ii7O3KjYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBSnp8GK8BOOaw8n
-mIc0YP62llHsvDAfBgNVHSMEGDAWgBTxmCYaRU/vsZLnUJqoVj2CIzPc6jAKBggq
-hkjOPQQDAgNHADBEAiAGS75l2yaxBRTrxgmCApKHlIoavPSlcZw/9ojF/Ug9GAIg
-Jk77kqyrTSt54EqN5Febbq6sRzTNnAdbeZXliuncgdA=
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABJwAOP0nHa7ihJSpRfZHDoTEDgiC7bYk
+TdLfN8uw2gtaYuj0pSfZLDf/1yHazslWdqxHfhypvk40j9C9dZgphNWjYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTfBPY3RfzfAbNn
+DGwkvTWVGSqkzDAfBgNVHSMEGDAWgBQg4P1yBgl4Q4jG7/H1TJBBV8cMRDAKBggq
+hkjOPQQDAgNHADBEAiBJelWSyntJss66QlFn8ABRwE1oPJrEoZZuzyalJr/XxQIg
+SsFScu5CJNMA2GQEk2Iv0SD3JSLVfZovM8m7m25R5GA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.der
index 85f22fd08ee3a8..cc744463ecf928 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.pem
index e72a4a5a35a485..d8bb6de6acdad1 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOt817JNX/cGRmcDkd8lmfGVCyGeqp7KXq5Xnc2+eSdHoAoGCCqGSM49
-AwEHoUQDQgAEPZgTsOH+y1LfFFgLXLnt1a3OtLFCuSf3KHv54WcCnyuxn8c+ISGM
-NRC5GVm/5MmwUw5Nowgak9CYH3/qKLs7cg==
+MHcCAQEEINFT/QwFx+s4X774XTcBcaKR9gUYYIwgBMV+ywt00HXsoAoGCCqGSM49
+AwEHoUQDQgAEnAA4/ScdruKElKlF9kcOhMQOCILttiRN0t83y7DaC1pi6PSlJ9ks
+N//XIdrOyVZ2rEd+HKm+TjSP0L11mCmE1Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.der
index 1d412b898d5641..dd0c02b9fee482 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.pem
index 3c9496345a8098..66b5c434439a0e 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1DCCAXqgAwIBAgIIKwCw0pZt1n0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIIYYcZ4oCl8QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASjOBi50XxkvFyanADuEtQ6qd1655Lo
-VV1BwRknO2I8MdhlH5zGHqqEe00A8nn7ztW0Jql2jBAJDNWrt4TdxQW3o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU8Zgm
-GkVP77GS51CaqFY9giMz3OowHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSAAwRQIgIFviMFKoJty0ZEFS+ILKp8+8/YontJyttcBs
-7PFyRcICIQDLhyKSPuEfr+kRErVzelLJiUhyj0XgBA9EYWjvijFT2Q==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATqvI+qRQEunioVPKckTaUkz6FoZVVJ
+DQ2lmBB2sZxWZ+F7VET5XH74yJyjImh9CTCChViy/8e55UFh7FvzTJpco2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUIOD9
+cgYJeEOIxu/x9UyQQVfHDEQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgKBl4neghS8B9ZJUfLrx0pZ7CD1nJFVmeXkCx
+X33dmxgCIQDn3tgw43TeyPDYtlwuQvxdMABafA319O9nNAaQk8URZg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.der
index 03d764ac430fc4..d40e0f9136e00b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.pem
index b0cb3b31f73645..ff4a0b16df9fc8 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMT4q16XArgG4XNJHKQq8gjcF01i+ItBV0oAUldjjF2OoAoGCCqGSM49
-AwEHoUQDQgAEozgYudF8ZLxcmpwA7hLUOqndeueS6FVdQcEZJztiPDHYZR+cxh6q
-hHtNAPJ5+87VtCapdowQCQzVq7eE3cUFtw==
+MHcCAQEEIPvuAbukzhBgNkiwre/JzXlLH7DAFuifaf0P2ELDGx7DoAoGCCqGSM49
+AwEHoUQDQgAE6ryPqkUBLp4qFTynJE2lJM+haGVVSQ0NpZgQdrGcVmfhe1RE+Vx+
++MicoyJofQkwgoVYsv/HueVBYexb80yaXA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/test_case_vector.json
index e780b85c0d4f47..ac2017d012a1a7 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example: invalid VID prefix",
     "is_success_case": "false",
-    "dac_cert": "308201cc30820173a00302010202082686b07372b3265f300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20444143204d7069643a30304231204d5649443a464646313059301306072a8648ce3d020106082a8648ce3d030107034200043d9813b0e1fecb52df14580b5cb9edd5adceb4b142b927f7287bf9e167029f2bb19fc73e21218c3510b91959bfe4c9b0530e4da3081a93d0981f7fea28bb3b72a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a7a7c18af0138e6b0f2798873460feb69651ecbc301f0603551d23041830168014f198261a454fefb192e7509aa8563d822333dcea300a06082a8648ce3d04030203470030440220064bbe65db26b10514ebc60982029287948a1abcf4a5719c3ff688c5fd483d180220264efb92acab4d2b79e04a8de4579b6eaeac4734cd9c075b7995e58ae9dc81d0",
-    "pai_cert": "308201d43082017aa00302010202082b00b0d2966dd67d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004a33818b9d17c64bc5c9a9c00ee12d43aa9dd7ae792e8555d41c119273b623c31d8651f9cc61eaa847b4d00f279fbced5b426a9768c10090cd5abb784ddc505b7a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f198261a454fefb192e7509aa8563d822333dcea301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220205be23052a826dcb4644152f882caa7cfbcfd8a27b49cadb5c06cecf17245c2022100cb8722923ee11fafe91112b5737a52c98948728f45e0040f446168ef8a3153d9",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100a333d5d1b07fd518f4aa0aca7f864d94a31fe5330d0095402e0d035236608e17022100884ac815147940d2f6fce3de826a50562242300c10cb6a93167d9cac8c89bab7",
-    "dac_private_key": "eb7cd7b24d5ff70646670391df2599f1950b219eaa9eca5eae579dcdbe792747",
-    "dac_public_key": "043d9813b0e1fecb52df14580b5cb9edd5adceb4b142b927f7287bf9e167029f2bb19fc73e21218c3510b91959bfe4c9b0530e4da3081a93d0981f7fea28bb3b72"
+    "dac_cert": "308201cc30820173a00302010202083f8263fb83bfe6ae300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20444143204d7069643a30304231204d5649443a464646313059301306072a8648ce3d020106082a8648ce3d030107034200049c0038fd271daee28494a945f6470e84c40e0882edb6244dd2df37cbb0da0b5a62e8f4a527d92c37ffd721dacec95676ac477e1ca9be4e348fd0bd75982984d5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414df04f63745fcdf01b3670c6c24bd3595192aa4cc301f0603551d2304183016801420e0fd720609784388c6eff1f54c904157c70c44300a06082a8648ce3d04030203470030440220497a5592ca7b49b2ceba425167f00051c04d683c9ac4a1966ecf26a526bfd7c502204ac15272ee4224d300d8640493622fd120f72522d57d9a2f33c9bb9b6e51e460",
+    "pai_cert": "308201d43082017aa003020102020821861c678a0297c4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004eabc8faa45012e9e2a153ca7244da524cfa1686555490d0da5981076b19c5667e17b5444f95c7ef8c89ca322687d0930828558b2ffc7b9e54161ec5bf34c9a5ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041420e0fd720609784388c6eff1f54c904157c70c44301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502202819789de8214bc07d64951f2ebc74a59ec20f59c915599e5e40b15f7ddd9b18022100e7ded830e374dec8f0d8b65c2e42fc5d30005a7c0df5f4ef6734069093c51166",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022012193cc131c18e54fc39553eafd3819ca98e40bdc6972de116322888006a0552022100ed76446da827bfc346940b396e7a2ff41d451733972bb707762b6bea864b30c7",
+    "dac_private_key": "d153fd0c05c7eb385fbef85d370171a291f60518608c2004c57ecb0b74d075ec",
+    "dac_public_key": "049c0038fd271daee28494a945f6470e84c40e0882edb6244dd2df37cbb0da0b5a62e8f4a527d92c37ffd721dacec95676ac477e1ca9be4e348fd0bd75982984d5"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/cd.der
index d00b9434da8a46..299e096740fcd8 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.der
index f1d76ce7610ca1..fc271af7008453 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.pem
index f1f5c8971f48cf..88405d4e0da7a5 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXOgAwIBAgIIVg2NMaqRvN8wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIBzTCCAXOgAwIBAgIINFCgUhgtLNYwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMC8x
 LTArBgNVBAMMJE1hdHRlciBEZXZlbCBEQUMgTXBpZF8wMEIxIE12aWRfRkZGMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABIWMkD+Ug4B9PPc81FW4ujTVTquLawM3
-szXXFJXdEPaWFmuKwK3GWtSjXDQTJgZbIT98JI9M/AwxUv+QdWAdnVCjYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBSQaOIG9fJcSFTN
-7kfhGfSKJLgVQzAfBgNVHSMEGDAWgBTbxw0HeyeB+qFGZxBhgYmZiMVtazAKBggq
-hkjOPQQDAgNHADBEAiBt5V0DGrN+dKLdBag8dKSI8a9ln9ecu25Y0bB7f/GbnQIg
-KrOBUG8Ly96pY3swE1LT68sShbiJKF5RD5XctgNCEnc=
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABNTKRNNFLXjIJy2q6TtvnOWIUUboKo+E
+FWEjiP4++UWAtP7ZCT8QCGOQF4AeASXPN5K6Rzs30wVXbphMqL3XL/6jYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBQCI6iQBGpLtptx
+lVL9dLyK8JaCwjAfBgNVHSMEGDAWgBRSHS/IrmLfsg/X9d2+OnmDgOMaiTAKBggq
+hkjOPQQDAgNIADBFAiEAy0mRFCXOjlhVE78G7mjcn6OdatnhSSCC1C3bxJudbjMC
+IC/lnI6JXoYJXH9HhYclRFobXReo2YSKDqYLoUFiloyr
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.der
index 473d49b613f743..4ab1a3f1a9230c 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.pem
index bf67dd00fc2212..b793290f1e8ca7 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEUlSfHnDFz4hjpW5nFk4rW71TfAENYDkZt3WmUSFXBhoAoGCCqGSM49
-AwEHoUQDQgAEhYyQP5SDgH089zzUVbi6NNVOq4trAzezNdcUld0Q9pYWa4rArcZa
-1KNcNBMmBlshP3wkj0z8DDFS/5B1YB2dUA==
+MHcCAQEEIEgaQy0NZZXooxeYYpKPppxKbOL98sWEHGJszZIiaEsUoAoGCCqGSM49
+AwEHoUQDQgAE1MpE00UteMgnLarpO2+c5YhRRugqj4QVYSOI/j75RYC0/tkJPxAI
+Y5AXgB4BJc83krpHOzfTBVdumEyovdcv/g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.der
index df78e8d5f0cba9..9852c262fa7034 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.pem
index 323e22afc8d7b2..b3f03d8cc7e1c4 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIIY0hkFn57Ob0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIFl+LeTISCTAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQs49kjA/uYDD/G86Stcnf2Bd68L3t1
-/xZrmm8JMwbuf+SKVDXYqRjEtV8BoLXm/nu2W2tS5BZzE7uWl6nbXRTOo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU28cN
-B3sngfqhRmcQYYGJmYjFbWswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgTE1uIA/veJz/c7bkpeAxFybHmIFb8aVElxOp
-VmZlFTICICeApLnNJAgz1YFnbQ2+QgU046TUNko6+MM/RDRaQPIi
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQHikR2utt7IvuXE3B9n5pMO6VWvJN/
+w0an5Ag6u97mOxJALDR1Au3nf4iWIQmnp+Vz47wvlpcNeYCieXrGOEw0o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUUh0v
+yK5i37IP1/Xdvjp5g4DjGokwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJGsSDgh8IEMMYvM8XdjqiAB+3oLgbn5taxo
+SK5etO+UAiBzfg569tH0aG38kZ5PLGNaMc9PdRbtM3OGV2Ed55CfTA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.der
index 1bec7a000dd95c..bee87aa24f681e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.pem
index 291a5c8971f237..4227df361639d1 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIG3E4ILZmuH5CpP6izCl+ksJ8jsggl9IES7HsNTQkUGRoAoGCCqGSM49
-AwEHoUQDQgAELOPZIwP7mAw/xvOkrXJ39gXevC97df8Wa5pvCTMG7n/kilQ12KkY
-xLVfAaC15v57tltrUuQWcxO7lpep210Uzg==
+MHcCAQEEIADELYUTGUyUeyKxve9p6AuxGDL7mXiU7OqBEsGLCv+1oAoGCCqGSM49
+AwEHoUQDQgAEB4pEdrrbeyL7lxNwfZ+aTDulVryTf8NGp+QIOrve5jsSQCw0dQLt
+53+IliEJp6flc+O8L5aXDXmAonl6xjhMNA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/test_case_vector.json
index b68a1dd44c12de..2d05374bcdf6c2 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Fallback VID and PID encoding example: invalid PID and VID prefixes",
     "is_success_case": "false",
-    "dac_cert": "308201cc30820173a0030201020208560d8d31aa91bcdf300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20444143204d7069645f30304231204d7669645f464646313059301306072a8648ce3d020106082a8648ce3d03010703420004858c903f9483807d3cf73cd455b8ba34d54eab8b6b0337b335d71495dd10f696166b8ac0adc65ad4a35c341326065b213f7c248f4cfc0c3152ff9075601d9d50a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604149068e206f5f25c4854cdee47e119f48a24b81543301f0603551d23041830168014dbc70d077b2781faa14667106181899988c56d6b300a06082a8648ce3d040302034700304402206de55d031ab37e74a2dd05a83c74a488f1af659fd79cbb6e58d1b07b7ff19b9d02202ab381506f0bcbdea9637b301352d3ebcb1285b889285e510f95dcb603421277",
-    "pai_cert": "308201d33082017aa0030201020208634864167e7b39bd300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200042ce3d92303fb980c3fc6f3a4ad7277f605debc2f7b75ff166b9a6f093306ee7fe48a5435d8a918c4b55f01a0b5e6fe7bb65b6b52e4167313bb9697a9db5d14cea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414dbc70d077b2781faa14667106181899988c56d6b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402204c4d6e200fef789cff73b6e4a5e0311726c798815bf1a5449713a9566665153202202780a4b9cd240833d581676d0dbe420534e3a4d4364a3af8c33f44345a40f222",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402207d0bae88c626436b800173b592788d95ef3537cb221243de2721101e99bbc11802201d9bc69783677291529edd5afa4c3df3d5ed5f8c4514e7b3149b78b6ec29ffda",
-    "dac_private_key": "452549f1e70c5cf8863a56e67164e2b5bbd537c010d603919b775a6512157061",
-    "dac_public_key": "04858c903f9483807d3cf73cd455b8ba34d54eab8b6b0337b335d71495dd10f696166b8ac0adc65ad4a35c341326065b213f7c248f4cfc0c3152ff9075601d9d50"
+    "dac_cert": "308201cd30820173a00302010202083450a052182d2cd6300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20444143204d7069645f30304231204d7669645f464646313059301306072a8648ce3d020106082a8648ce3d03010703420004d4ca44d3452d78c8272daae93b6f9ce5885146e82a8f8415612388fe3ef94580b4fed9093f1008639017801e0125cf3792ba473b37d305576e984ca8bdd72ffea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140223a890046a4bb69b719552fd74bc8af09682c2301f0603551d23041830168014521d2fc8ae62dfb20fd7f5ddbe3a798380e31a89300a06082a8648ce3d0403020348003045022100cb49911425ce8e585513bf06ee68dc9fa39d6ad9e1492082d42ddbc49b9d6e3302202fe59c8e895e86095c7f47858725445a1b5d17a8d9848a0ea60ba14162968cab",
+    "pai_cert": "308201d43082017aa0030201020208165f8b7932120930300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004078a4476badb7b22fb9713707d9f9a4c3ba556bc937fc346a7e4083abbdee63b12402c347502ede77f88962109a7a7e573e3bc2f96970d7980a2797ac6384c34a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414521d2fc8ae62dfb20fd7f5ddbe3a798380e31a89301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210091ac483821f0810c318bccf17763aa2001fb7a0b81b9f9b5ac6848ae5eb4ef940220737e0e7af6d1f4686dfc919e4f2c635a31cf4f7516ed33738657611de7909f4c",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100f1da2112b47840cd3598b14f5e9a305724b89041869b6c8f3a248d48669b99fc02207203ef330fed84804ea37cb901fa0e516ed0ddbb78db798e3298410880428e80",
+    "dac_private_key": "481a432d0d6595e8a3179862928fa69c4a6ce2fdf2c5841c626ccd9222684b14",
+    "dac_public_key": "04d4ca44d3452d78c8272daae93b6f9ce5885146e82a8f8415612388fe3ef94580b4fed9093f1008639017801e0125cf3792ba473b37d305576e984ca8bdd72ffe"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/cd.der
index 9a993fb7995708..ce7afd122d0db0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.der
index 00c423477ed9f7..281acaf4b5c865 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.pem
index fc76279671c0ac..00b3f14c24f2a8 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICBzCCAa2gAwIBAgIIbwEkPkVQQiEwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIICBjCCAa2gAwIBAgIIfy9Erev9D74wCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMGkx
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMGkx
 OzA5BgNVBAMMMkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
 RjIgTXBpZDowMEIyMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8
-AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASj5jHAGTvFGqBIyQwH
-DExq9BfeBnBwcSI8IDU7a8rim3feUfR3wBn6J+0h6hgCqh2XDuYzG+6mtpQWErNH
-4c/so2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-Z5szM3RMZw4kR5wDfYlxXdXfg4MwHwYDVR0jBBgwFoAUx+i3HGjb7lsGb3zJ5e9p
-nbOA/wIwCgYIKoZIzj0EAwIDSAAwRQIhAIUs4cHLSglk+4N9UvsggxBnRC/Jkvck
-ooCzq4QXa8sHAiAMXqtSq/Q+wcV10MpVm6S7WfU4M5zxhHyvdkDqTTxVpg==
+AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARILk8t+UpBOmv3WY+K
+WooK3R3U5K4y/8wMRJoHwzT9XKeNByltv8Qs6LEGhhMo+nIdEgN1DsG/H774ujqk
+HUFoo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+w5pBYkBRW9244Jj0NiZl9LfW0NowHwYDVR0jBBgwFoAUe8813+ettsa6AUQK4s14
+OgfA6/UwCgYIKoZIzj0EAwIDRwAwRAIgSHrdJox0lkOOgsSxiU9BjKdIM2F17w/M
+fbMltP2uJFcCIBeGYUrxXtX2L5JoERVJX0U4mMsSkPfiJlGVSmShcsN/
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.der
index b3d69672f2ae84..298fbd206cd222 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.pem
index 8617d66f7fd1d2..6baf409ea9f77a 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOjL+zFefFiuS4a1HjcEv+6gICmj3M0RFGKfO+dgP4bzoAoGCCqGSM49
-AwEHoUQDQgAEo+YxwBk7xRqgSMkMBwxMavQX3gZwcHEiPCA1O2vK4pt33lH0d8AZ
-+iftIeoYAqodlw7mMxvupraUFhKzR+HP7A==
+MHcCAQEEILi3id8KbxJlsCjx0fy+cC04wvl1CpNIAkEE78zqZINFoAoGCCqGSM49
+AwEHoUQDQgAESC5PLflKQTpr91mPilqKCt0d1OSuMv/MDESaB8M0/VynjQcpbb/E
+LOixBoYTKPpyHRIDdQ7Bvx+++Lo6pB1BaA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.der
index ba98f583cf0bf5..91126d949671ef 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.pem
index 1402f85e104a23..7ed515d5bcf1a1 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0zCCAXqgAwIBAgIICCXx5ufFkiQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIdxc47CIzx0owCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQVUfBZTQDbGqJIRgsQTK4McynQG0M/
-PjtMw/zfXjgDgHpB+QEOW+M+CcwdlbtFbPCe4oOkypsbLeIeq13f6LBXo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUx+i3
-HGjb7lsGb3zJ5e9pnbOA/wIwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDRwAwRAIgZq2VL1JhgY86boYVdxGDguQe5RQ0TKTgXgiC
-K+a/YdYCIBFM13EVYK4MU+gY63zLhCKH5IqH6WmM5u/3Dbvdp3jK
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ2Z9vYNTZG8U+Cwho/IE5Egp70ER1a
+m2Ga+eru8Yz0Mp/5LP/Sam48ON+RrJNC7qWCyBTm7iDDVZv3L/s82CV/o2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUe881
+3+ettsa6AUQK4s14OgfA6/UwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgXtJ6qomjFnq8OMBBfb6GxVSJq+pdVESdERmd
+q4pHEf4CIQDevt/n5gJt0m0uvazsY6JS6GyGcPRlq4nRF5LB3lzk2g==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.der
index ff4399994476c5..6d5cf69d380c99 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.pem
index 070fdc24e92b7f..5c575053557edf 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKGn/U/yv44VIdJtg8WCRSLpG+nnqbLotA/9W+/zs2sUoAoGCCqGSM49
-AwEHoUQDQgAEFVHwWU0A2xqiSEYLEEyuDHMp0BtDPz47TMP83144A4B6QfkBDlvj
-PgnMHZW7RWzwnuKDpMqbGy3iHqtd3+iwVw==
+MHcCAQEEIJ3hL+a0IUyPQO1Rl7mlE0FOr2dIxdbOW3mXv/igk+2PoAoGCCqGSM49
+AwEHoUQDQgAENmfb2DU2RvFPgsIaPyBORIKe9BEdWpthmvnq7vGM9DKf+Sz/0mpu
+PDjfkayTQu6lgsgU5u4gw1Wb9y/7PNglfw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/test_case_vector.json
index 112dc298490cbe..b0299181dcf5f6 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_15/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: valid, Matter OIDs are used and wrong values in the common-name are ignored",
     "is_success_case": "true",
-    "dac_cert": "30820207308201ada00302010202086f01243e45504221300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004a3e631c0193bc51aa048c90c070c4c6af417de06707071223c20353b6bcae29b77de51f477c019fa27ed21ea1802aa1d970ee6331beea6b6941612b347e1cfeca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414679b3333744c670e24479c037d89715dd5df8383301f0603551d23041830168014c7e8b71c68dbee5b066f7cc9e5ef699db380ff02300a06082a8648ce3d0403020348003045022100852ce1c1cb4a0964fb837d52fb20831067442fc992f724a280b3ab84176bcb0702200c5eab52abf43ec1c575d0ca559ba4bb59f538339cf1847caf7640ea4d3c55a6",
-    "pai_cert": "308201d33082017aa00302010202080825f1e6e7c59224300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200041551f0594d00db1aa248460b104cae0c7329d01b433f3e3b4cc3fcdf5e3803807a41f9010e5be33e09cc1d95bb456cf09ee283a4ca9b1b2de21eab5ddfe8b057a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414c7e8b71c68dbee5b066f7cc9e5ef699db380ff02301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022066ad952f5261818f3a6e861577118382e41ee514344ca4e05e08822be6bf61d60220114cd7711560ae0c53e818eb7ccb842287e48a87e9698ce6eff70dbbdda778ca",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221009570dcfc63b8d0852959152c71929d5ef87ac156695b9e3bb23e480fc0ae93da0220166eaf33b177d4f8bb9527445698e16e0dd69228ecca0e8a9189a59cda068b55",
-    "dac_private_key": "e8cbfb315e7c58ae4b86b51e3704bfeea02029a3dccd1114629f3be7603f86f3",
-    "dac_public_key": "04a3e631c0193bc51aa048c90c070c4c6af417de06707071223c20353b6bcae29b77de51f477c019fa27ed21ea1802aa1d970ee6331beea6b6941612b347e1cfec"
+    "dac_cert": "30820206308201ada00302010202087f2f44adebfd0fbe300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004482e4f2df94a413a6bf7598f8a5a8a0add1dd4e4ae32ffcc0c449a07c334fd5ca78d07296dbfc42ce8b106861328fa721d1203750ec1bf1fbef8ba3aa41d4168a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c39a416240515bddb8e098f4362665f4b7d6d0da301f0603551d230418301680147bcf35dfe7adb6c6ba01440ae2cd783a07c0ebf5300a06082a8648ce3d04030203470030440220487add268c7496438e82c4b1894f418ca748336175ef0fcc7db325b4fdae245702201786614af15ed5f62f92681115495f453898cb1290f7e22651954a64a172c37f",
+    "pai_cert": "308201d43082017aa0030201020208771738ec2233c74a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200043667dbd8353646f14f82c21a3f204e44829ef4111d5a9b619af9eaeef18cf4329ff92cffd26a6e3c38df91ac9342eea582c814e6ee20c3559bf72ffb3cd8257fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147bcf35dfe7adb6c6ba01440ae2cd783a07c0ebf5301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205ed27aaa89a3167abc38c0417dbe86c55489abea5d54449d11199dab8a4711fe022100debedfe7e6026dd26d2ebdacec63a252e86c8670f465ab89d11792c1de5ce4da",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201219fcff318b3195d01aa3c4b240849bb3b3234ab2fb974b71ad11bb70ef728d022050dcba92eb4886ab90488dfde585184e19033b9e38fe1819826edc8619a58d1d",
+    "dac_private_key": "b8b789df0a6f1265b028f1d1fcbe702d38c2f9750a9348024104efccea648345",
+    "dac_public_key": "04482e4f2df94a413a6bf7598f8a5a8a0add1dd4e4ae32ffcc0c449a07c334fd5ca78d07296dbfc42ce8b106861328fa721d1203750ec1bf1fbef8ba3aa41d4168"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/cd.der
index 4cd994296c8261..6389b12d3e5650 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.der
index 8dde8cf9cb896a..b98b435973e2ba 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.pem
index 5a10e8b92844ae..aade9069c714ba 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICBjCCAa2gAwIBAgIILqhMbuW7NRAwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIICCDCCAa2gAwIBAgIICgNHDenIMEMwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMGkx
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMGkx
 OzA5BgNVBAMMMkFDTUUgTWF0dGVyIERldmVsIERBQyA1Q0RBOTg5OSBNdmlkOkZG
 RjEgTXBpZDowMEIxMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQBgqJ8
-AgIMBDAwQjIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATXNHkP/pBT20mNbvdH
-5d+FHIKSJyKbWyVNF2RlipV3oIfU3sMkjtEjn7efUB3rCf3d4/mAv/PCsSZEPTQi
-U9rso2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-xn/TcEdBoTvDgJmIcoHFHxjciScwHwYDVR0jBBgwFoAUli12C+xZHaE8a3F+joC+
-MwKf1n4wCgYIKoZIzj0EAwIDRwAwRAIgPmv9jBeEVU31n3oMEu67aWozHN2BADr8
-lnBGQ/VbCVsCIEhtbu2xsvWYeUjh7Zb4u2xcBtjeT7kE0UC8IqzGAiC3
+AgIMBDAwQjIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATnhAoHqgBj4MKXUgv+
+su8PAdq/sNQiGDopOJoghWnXpYnULMkTEebCeE7+nGAUuw702pENrqvnLIH75k95
+UyoTo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+WeF54514TvvMirVyTI8LGSsWd8swHwYDVR0jBBgwFoAUQc93HIfa7yfZYtCOGl0B
+qW/6a/owCgYIKoZIzj0EAwIDSQAwRgIhANuYWxaZvWjLvo1HZq9kVwJ4QB0Gnkzj
+AeB0TXgB/w4RAiEAypALHe3VcyIB0YneBqEyTs9zKa0pPXKrQxsOtMcvZJI=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.der
index b3fc140b87f1e9..5ab87726a1547e 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.pem
index 3a54c78facf802..69c78a83a5c6ce 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHBo7nxxyWg9iCUortSMe+ZG2Kux2wmGdhOot2pYL7b2oAoGCCqGSM49
-AwEHoUQDQgAE1zR5D/6QU9tJjW73R+XfhRyCkicim1slTRdkZYqVd6CH1N7DJI7R
-I5+3n1Ad6wn93eP5gL/zwrEmRD00IlPa7A==
+MHcCAQEEIMZz8zmwJJiFLFNeZ15BfrYCoNLI0O+tL2Cw14KWRJgIoAoGCCqGSM49
+AwEHoUQDQgAE54QKB6oAY+DCl1IL/rLvDwHav7DUIhg6KTiaIIVp16WJ1CzJExHm
+wnhO/pxgFLsO9NqRDa6r5yyB++ZPeVMqEw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.der
index 2fc1f805324815..a20b765f4b1ccc 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.pem
index 6eea855ad059c1..4113cd92f3fdad 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIUn994QSoiMQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1TCCAXqgAwIBAgIIKWHq5F/7Ds4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARKR3he3lKGJxN2BqFip+WapWK1X5xP
-fkIvYVUTfBWdXbjGc4xe1AC8qxUGHs1mCvDVAqShFiPnd7k2RVtAVgkqo2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUli12
-C+xZHaE8a3F+joC+MwKf1n4wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhANXFvE/hT8zTF7thlNPyKNrEfe/Vv5Gun4/A
-rT8HNX5ZAiEAmsitBpHyUoQKGV61/gH3d2hBlF/zkFghYcCjdPw2FHs=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATVCk/YgSFT1qu0Gqby78QMpywNbqwm
+7/+xN6di7hX8fQzsArJ1kee2fthBLxS7Lpy/mZ1pJ3MxZPkUNR7s5/Rpo2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUQc93
+HIfa7yfZYtCOGl0BqW/6a/owHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSQAwRgIhAM6Vu7gxfSeWap582q1KSBWbtYaSB2sZMS3N
+Rn5+y5wVAiEAnpY4rLPMTeMXDpdc7PhVSVpKEOwzJZNKmX7IVwwDj1M=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.der
index e6e03966cba452..bcb314844be4c1 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.pem
index 6e40def81c40f7..5984325b40bd17 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICzV2iUncZw5z5x9KYUkruZzVINW6gQMHND6QhjCFL5SoAoGCCqGSM49
-AwEHoUQDQgAESkd4Xt5ShicTdgahYqflmqVitV+cT35CL2FVE3wVnV24xnOMXtQA
-vKsVBh7NZgrw1QKkoRYj53e5NkVbQFYJKg==
+MHcCAQEEIDSbe8gCj1M0VjEqlUuzUugJZBZwsimqi5RLdPBgzkk6oAoGCCqGSM49
+AwEHoUQDQgAE1QpP2IEhU9artBqm8u/EDKcsDW6sJu//sTenYu4V/H0M7AKydZHn
+tn7YQS8Uuy6cv5mdaSdzMWT5FDUe7Of0aQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/test_case_vector.json
index 13b4cdc9afbd2f..733a9965c7d559 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_16/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: wrong, Correct values encoded in the common-name are ignored",
     "is_success_case": "false",
-    "dac_cert": "30820206308201ada00302010202082ea84c6ee5bb3510300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323059301306072a8648ce3d020106082a8648ce3d03010703420004d734790ffe9053db498d6ef747e5df851c829227229b5b254d1764658a9577a087d4dec3248ed1239fb79f501deb09fddde3f980bff3c2b126443d342253daeca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c67fd3704741a13bc38099887281c51f18dc8927301f0603551d23041830168014962d760bec591da13c6b717e8e80be33029fd67e300a06082a8648ce3d040302034700304402203e6bfd8c1784554df59f7a0c12eebb696a331cdd81003afc96704643f55b095b0220486d6eedb1b2f5987948e1ed96f8bb6c5c06d8de4fb904d140bc22acc60220b7",
-    "pai_cert": "308201d53082017aa0030201020208527f7de104a888c4300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200044a47785ede528627137606a162a7e59aa562b55f9c4f7e422f6155137c159d5db8c6738c5ed400bcab15061ecd660af0d502a4a11623e777b936455b4056092aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414962d760bec591da13c6b717e8e80be33029fd67e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100d5c5bc4fe14fccd317bb6194d3f228dac47defd5bf91ae9f8fc0ad3f07357e590221009ac8ad0691f252840a195eb5fe01f7776841945ff390582161c0a374fc36147b",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022054d4f8eb89bc45c49a46e5a1ec8fe2158f2f2f0576aa81502badc79126b278fb02206c1d4ac2a3f5c0ef5494b61e2ee73ddd7db92b5eb36c06d71d07867eb255091f",
-    "dac_private_key": "7068ee7c71c9683d882528aed48c7be646d8abb1db09867613a8b76a582fb6f6",
-    "dac_public_key": "04d734790ffe9053db498d6ef747e5df851c829227229b5b254d1764658a9577a087d4dec3248ed1239fb79f501deb09fddde3f980bff3c2b126443d342253daec"
+    "dac_cert": "30820208308201ada00302010202080a03470de9c83043300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20444143203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323059301306072a8648ce3d020106082a8648ce3d03010703420004e7840a07aa0063e0c297520bfeb2ef0f01dabfb0d422183a29389a208569d7a589d42cc91311e6c2784efe9c6014bb0ef4da910daeabe72c81fbe64f79532a13a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041459e179e39d784efbcc8ab5724c8f0b192b1677cb301f0603551d2304183016801441cf771c87daef27d962d08e1a5d01a96ffa6bfa300a06082a8648ce3d0403020349003046022100db985b1699bd68cbbe8d4766af64570278401d069e4ce301e0744d7801ff0e11022100ca900b1dedd5732201d189de06a1324ecf7329ad293d72ab431b0eb4c72f6492",
+    "pai_cert": "308201d53082017aa00302010202082961eae45ffb0ece300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004d50a4fd8812153d6abb41aa6f2efc40ca72c0d6eac26efffb137a762ee15fc7d0cec02b27591e7b67ed8412f14bb2e9cbf999d6927733164f914351eece7f469a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041441cf771c87daef27d962d08e1a5d01a96ffa6bfa301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100ce95bbb8317d27966a9e7cdaad4a48159bb58692076b19312dcd467e7ecb9c150221009e9638acb3cc4de3170e975cecf855495a4a10ec3325934a997ec8570c038f53",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ec1c30f9f1faf9d449e3dcb911079759f5218b2c046cf4439357a4c97555309702207629f39b6819882403f061008ba6b5839a0bb42b62211ee70a382e168199fa94",
+    "dac_private_key": "c673f339b02498852c535e675e417eb602a0d2c8d0efad2f60b0d78296449808",
+    "dac_public_key": "04e7840a07aa0063e0c297520bfeb2ef0f01dabfb0d422183a29389a208569d7a589d42cc91311e6c2784efe9c6014bb0ef4da910daeabe72c81fbe64f79532a13"
 }
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/cd.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/cd.der
index f0a1ed6f790226..48386a54c8a0f0 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/cd.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.der
index 1bbbd2bd4bf5da..9ea65a771fec93 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.pem
index b99938cdf22f88..87141543529ccb 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBxzCCAW6gAwIBAgIIWJdI46o6regwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
+MIIByDCCAW6gAwIBAgIIG6DfGcaqNeIwCgYIKoZIzj0EAwIwRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMCox
+gqJ8AgIMBDAwQjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMCox
 EjAQBgNVBAMMCU12aWQ6RkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEwWTATBgcq
-hkjOPQIBBggqhkjOPQMBBwNCAARun5LEBJtF1wRawWwfl5LbAgz8DAmLhF5CdB/Q
-toBUV+BZUkbEhOzu33SDDh3Av6A3aHp4YtGsjq66mjXD6ULso2AwXjAMBgNVHRMB
-Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUP6OaAF+6k5RmBxCbYsZL
-RabFrkAwHwYDVR0jBBgwFoAUBXJp7MeSkoMdBZ2XEj4CyZaCDzEwCgYIKoZIzj0E
-AwIDRwAwRAIgavjZDZL1OtS2kOhwHvbNmytoUndniIARtDUulohB6AgCIFg9jmEG
-vMEoW0OJKVpmR2g1LjebJZBMzbPorFWgYZkJ
+hkjOPQIBBggqhkjOPQMBBwNCAAQwcLa+qKKUCJRo8Z81H2vNFvsWI3rRA51cpy41
+7GPKMv0UIOo0BYs2cdZqx9j6Y3Bii2JXEcIGRt0pJiqKEQMFo2AwXjAMBgNVHRMB
+Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU/f5Nrkcet8ujd0KzyX73
+xu02xegwHwYDVR0jBBgwFoAUO2iFoAEFac6yWvILJpaO8ThqiCswCgYIKoZIzj0E
+AwIDSAAwRQIgJePN9H4GD5CZ/F6xHRJoo3CucBTJMzbpJe8mkPUtsBACIQCYW6fg
+0HM1+NlS9SjyKnITlwA2E9vcNkvQhGGeMB47dg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.der
index 27e69e2364f438..3f9b76c6199725 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.pem
index e20753c97fe17a..e9ee0a141decff 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOcY+vKVDJQhnkQpPvm45uMWZ5uZtKuWnsSW+r6eReWeoAoGCCqGSM49
-AwEHoUQDQgAEbp+SxASbRdcEWsFsH5eS2wIM/AwJi4ReQnQf0LaAVFfgWVJGxITs
-7t90gw4dwL+gN2h6eGLRrI6uupo1w+lC7A==
+MHcCAQEEIIXTdrd+NlKKsKGqyK7SCBvLyFCevSoTVmOzX2gR707ooAoGCCqGSM49
+AwEHoUQDQgAEMHC2vqiilAiUaPGfNR9rzRb7FiN60QOdXKcuNexjyjL9FCDqNAWL
+NnHWasfY+mNwYotiVxHCBkbdKSYqihEDBQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.der
index fc926827bedb51..419cf0f8578e3b 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.pem
index 9a5029e1967932..dd071f674c5285 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1TCCAXqgAwIBAgIIJ65pOPwh5j4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB1DCCAXqgAwIBAgIIK5SjshxTCrEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS+3YFhrcIC42Od4N8eNddzcux3c8ag
-KZuZHfDFPFGlrIfkMZK1cC4+Pj0UdUBld/RnP9oh23vx8fOW1fPe71k6o2YwZDAS
-BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUBXJp
-7MeSkoMdBZ2XEj4CyZaCDzEwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
-cX4wCgYIKoZIzj0EAwIDSQAwRgIhAImacmfJUf9w4ARfKwI0Rfa/7Wo2TD736w04
-fFedhBMgAiEA76BhBcj0oI0iSpVK5vdoGrwXvWwUyAaZHIK4uPnpVGo=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASX+WWa4WqCRL1GmPgiF0RDv0ZVpBUn
+X0d2YdWcOVSiobIO1Ariyn5RIlOtA2kboLXNvW3QB5KzGl7MfIU8k/hro2YwZDAS
+BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUO2iF
+oAEFac6yWvILJpaO8ThqiCswHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGh
+cX4wCgYIKoZIzj0EAwIDSAAwRQIgC8pazwtKBTDepwr3GSFxIt6THETLGoe+DIrz
+PATsl7ACIQDQ6xax/erJHc7FP84t7NSsAZ0J0b7LciRSgI1jWI4Skw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.der
index a5965d49ede14e..fc0afb9b591b2d 100644
Binary files a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.der and b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.pem
index 8987613ea9ef49..cbbc70a6f8e3a1 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPN3fpsZ/yNsdiy+AcUyuNWcwkF9k/yQnSGkBvKYTFBKoAoGCCqGSM49
-AwEHoUQDQgAEvt2BYa3CAuNjneDfHjXXc3Lsd3PGoCmbmR3wxTxRpayH5DGStXAu
-Pj49FHVAZXf0Zz/aIdt78fHzltXz3u9ZOg==
+MHcCAQEEIAkl8uML0I3HfO6CkHsO6FOUKzlzoJf8yjmkHoHRjJwhoAoGCCqGSM49
+AwEHoUQDQgAEl/llmuFqgkS9Rpj4IhdEQ79GVaQVJ19HdmHVnDlUoqGyDtQK4sp+
+USJTrQNpG6C1zb1t0AeSsxpezHyFPJP4aw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/test_case_vector.json
index ebdd7328468015..dd60dd1a87ed20 100644
--- a/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "DAC Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: invalid, PID is using Matter OID then VID must also use Matter OID",
     "is_success_case": "false",
-    "dac_cert": "308201c73082016ea0030201020208589748e3aa3aade8300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200046e9f92c4049b45d7045ac16c1f9792db020cfc0c098b845e42741fd0b6805457e0595246c484eceedf74830e1dc0bfa037687a7862d1ac8eaeba9a35c3e942eca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143fa39a005fba93946607109b62c64b45a6c5ae40301f0603551d23041830168014057269ecc79292831d059d97123e02c996820f31300a06082a8648ce3d040302034700304402206af8d90d92f53ad4b690e8701ef6cd9b2b68527767888011b4352e968841e8080220583d8e6106bcc1285b4389295a664768352e379b25904ccdb3e8ac55a0619909",
-    "pai_cert": "308201d53082017aa003020102020827ae6938fc21e63e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004bedd8161adc202e3639de0df1e35d77372ec7773c6a0299b991df0c53c51a5ac87e43192b5702e3e3e3d1475406577f4673fda21db7bf1f1f396d5f3deef593aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414057269ecc79292831d059d97123e02c996820f31301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100899a7267c951ff70e0045f2b023445f6bfed6a364c3ef7eb0d387c579d841320022100efa06105c8f4a08d224a954ae6f7681abc17bd6c14c806991c82b8b8f9e9546a",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022077056b7ebcad73f44ed82b436b0b0b61417a4a2ec7e4529ba7536b9a144229cd022000f2b776c7c311e04bf41162046c1bd48ecc28253e750aba0c323ef4951b96cf",
-    "dac_private_key": "e718faf2950c94219e44293ef9b8e6e316679b99b4ab969ec496fabe9e45e59e",
-    "dac_public_key": "046e9f92c4049b45d7045ac16c1f9792db020cfc0c098b845e42741fd0b6805457e0595246c484eceedf74830e1dc0bfa037687a7862d1ac8eaeba9a35c3e942ec"
+    "dac_cert": "308201c83082016ea00302010202081ba0df19c6aa35e2300a06082a8648ce3d04030230463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200043070b6bea8a294089468f19f351f6bcd16fb16237ad1039d5ca72e35ec63ca32fd1420ea34058b3671d66ac7d8fa6370628b625711c20646dd29262a8a110305a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414fdfe4dae471eb7cba37742b3c97ef7c6ed36c5e8301f0603551d230418301680143b6885a0010569ceb25af20b26968ef1386a882b300a06082a8648ce3d0403020348003045022025e3cdf47e060f9099fc5eb11d1268a370ae7014c93336e925ef2690f52db010022100985ba7e0d07335f8d952f528f22a721397003613dbdc364bd084619e301e3b76",
+    "pai_cert": "308201d43082017aa00302010202082b94a3b21c530ab1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000497f9659ae16a8244bd4698f822174443bf4655a415275f477661d59c3954a2a1b20ed40ae2ca7e512253ad03691ba0b5cdbd6dd00792b31a5ecc7c853c93f86ba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604143b6885a0010569ceb25af20b26968ef1386a882b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502200bca5acf0b4a0530dea70af719217122de931c44cb1a87be0c8af33c04ec97b0022100d0eb16b1fdeac91dcec53fce2decd4ac019d09d1becb722452808d63588e1293",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220307a9a66f9aca664b34c8a14eaa71358395e7961599c88aef48b5c1af143bc4a02204895f6bf1127b829d31f7dd4c4bfd6b838802c5f6de4641beb93626557ad1b4e",
+    "dac_private_key": "85d376b77e36528ab0a1aac8aed2081bcbc8509ebd2a135663b35f6811ef4ee8",
+    "dac_public_key": "043070b6bea8a294089468f19f351f6bcd16fb16237ad1039d5ca72e35ec63ca32fd1420ea34058b3671d66ac7d8fa6370628b625711c20646dd29262a8a110305"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/cd.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/cd.der
index de49cc02f16eae..090390bbaf97da 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/cd.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.der
index 657e741c914e17..11091042f35ab7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.pem
index d4b32595c2ad82..6637d99aed056c 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIIQQosaiMfqUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIIU0menJVbYfwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASTzbtW5xWVMe8ENwY9+P/Ix7h9Fssl
-UVfa3z4Z7yr0YMtPdk0JQz/oHu8j4ByukxrTWuDZ/kjveS+bCvxRLzxLo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUUqlr9P+3zI6e
-x/RNxkfkszSkvoQwHwYDVR0jBBgwFoAUKWjZp2GFytRjh8q+GNBKO8Xp1YcwCgYI
-KoZIzj0EAwIDSAAwRQIhAPVLrITl7ZpQW1IsJXIeHFugXpNw/tN4VO0MRjdYyhG9
-AiAu6GBIexM7uiMMuhNU09HYjKtcC8RpNgaHcDqVB93VbQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATwqJQhdP4hmlS39q08lJMBUV3m3kGU
+QI+BFqR11+oLKfAP7q0Hlemh6A5I1qeJSegwGu24dlL/JnH4rWHYRqyHo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUFKFA9GpeM06U
+PaANjV5mqtaFDBMwHwYDVR0jBBgwFoAUcCOZdDRxhFfI24ZC63YdcR4zo0gwCgYI
+KoZIzj0EAwIDRwAwRAIgd1mAXEoF5j3lAQJZ+FdRYYLaN95Rvr8VQL0M0TUgtkUC
+ID6Qghwh6jtuBHCYYw0eeVkzmHMv/AK/FW+VfKDoH17N
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.der
index fe2eaa133b056c..60b3da609d639a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.pem
index d7d7995712c4c4..67eaec73791289 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHiFi9M4HFU+qBFvIPbEQ/bKoAMWmdJX+7Nt5ReTvAXtoAoGCCqGSM49
-AwEHoUQDQgAEk827VucVlTHvBDcGPfj/yMe4fRbLJVFX2t8+Ge8q9GDLT3ZNCUM/
-6B7vI+AcrpMa01rg2f5I73kvmwr8US88Sw==
+MHcCAQEEIIfnS3J54c7NkV9mndEaWA6NVW2lvKOjFGBmP04oVYkioAoGCCqGSM49
+AwEHoUQDQgAE8KiUIXT+IZpUt/atPJSTAVFd5t5BlECPgRakddfqCynwD+6tB5Xp
+oegOSNaniUnoMBrtuHZS/yZx+K1h2Eashw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.der
index 47e33bfbcd43b7..a9a9747a9b305a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.pem
index 559552f4d657be..919de6258c09b3 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAQIIHGApekU9qSQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
-MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
-UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABI6jR8dpr47vQIoStJTPtvtvPfUNWUhSwkulQWotrHPWCP3DAwqkqttIKCx9
-/Ku8CWSfthSfAvf4Q2KNVZnQNTOjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQpaNmnYYXK1GOHyr4Y0Eo7xenVhzAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-xJIFHJqWy0OQI+k9Vuup5dFkXWvy5HzjjQjs21NCticCIQCh7dpI/vZB1QFOK0dp
-kMy8Oa5yvHUFzaCHLD3LjphGdA==
+MIIBvTCCAWOgAwIBAQIHHhMiNJzxHDAKBggqhkjOPQQDAjAwMRgwFgYDVQQDDA9N
+YXR0ZXIgVGVzdCBQQUExFDASBgorBgEEAYKifAIBDARGRkYxMCAXDTIyMDkyMzAw
+MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjAwMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBQ
+QUkxFDASBgorBgEEAYKifAIBDARGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+QgAEdyhcQtjR5zSaKMlfWLngjXWtsgxbRMJlKZbI78sxOuH0Tl7K0NU2NzqRKL8d
+xtMJWKvYEVVBATKhIt/ona4efqNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHAjmXQ0cYRXyNuGQut2HXEeM6NIMB8GA1Ud
+IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0gAMEUCIFYk
+jEgD/SVNGX9VuQHwo/M/kHMGihuedQY10oj5fO2KAiEAig5oe/xz7OALd5XIa87t
+BTY2oznJwMvxEa0lyCoCzxM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.der
index c50ea97018a7e9..e61652519ac3a5 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.pem
index 76137245ab7047..b577ce9fbba892 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIu0g+ZguvJ0S6tXETpRRlE2JmHxGqHAaYvN8HxuuFL8oAoGCCqGSM49
-AwEHoUQDQgAEjqNHx2mvju9AihK0lM+2+2899Q1ZSFLCS6VBai2sc9YI/cMDCqSq
-20goLH38q7wJZJ+2FJ8C9/hDYo1VmdA1Mw==
+MHcCAQEEIOYOcTceg3+DYwxFqmWxD4MM28Ty9wRT/qVblV3lO0HaoAoGCCqGSM49
+AwEHoUQDQgAEdyhcQtjR5zSaKMlfWLngjXWtsgxbRMJlKZbI78sxOuH0Tl7K0NU2
+NzqRKL8dxtMJWKvYEVVBATKhIt/ona4efg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/test_case_vector.json
index 866f5931944842..9e5e28fe05f7a1 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Invalid certificate version field set to v2(1)",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208210428b1a88c7ea5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000493cdbb56e7159531ef0437063df8ffc8c7b87d16cb255157dadf3e19ef2af460cb4f764d09433fe81eef23e01cae931ad35ae0d9fe48ef792f9b0afc512f3c4ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041452a96bf4ffb7cc8e9ec7f44dc647e4b334a4be84301f0603551d230418301680142968d9a76185cad46387cabe18d04a3bc5e9d587300a06082a8648ce3d0403020348003045022100f54bac84e5ed9a505b522c25721e1c5ba05e9370fed37854ed0c463758ca11bd02202ee860487b133bba230cba1354d3d1d88cab5c0bc469360687703a9507ddd56d",
-    "pai_cert": "308201bf30820164a00302010102081c60297a453da924300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200048ea347c769af8eef408a12b494cfb6fb6f3df50d594852c24ba5416a2dac73d608fdc3030aa4aadb48282c7dfcabbc09649fb6149f02f7f843628d5599d03533a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604142968d9a76185cad46387cabe18d04a3bc5e9d587301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c492051c9a96cb439023e93d56eba9e5d1645d6bf2e47ce38d08ecdb5342b627022100a1edda48fef641d5014e2b476990ccbc39ae72bc7505cda0872c3dcb8e984674",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100f920383fe42cbee0e7c30cf3ef1c30b0aa0ff7db82a8be6e3b1f3f45471c8525022100f1c8d07ae266390db2af0376ed7723636f8afb596360c6307a8bc1e1fd448082",
-    "dac_private_key": "78858bd3381c553ea8116f20f6c443f6caa0031699d257fbb36de51793bc05ed",
-    "dac_public_key": "0493cdbb56e7159531ef0437063df8ffc8c7b87d16cb255157dadf3e19ef2af460cb4f764d09433fe81eef23e01cae931ad35ae0d9fe48ef792f9b0afc512f3c4b"
+    "dac_cert": "308201cd30820174a003020102020853499e9c955b61fc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f0a8942174fe219a54b7f6ad3c949301515de6de4194408f8116a475d7ea0b29f00feead0795e9a1e80e48d6a78949e8301aedb87652ff2671f8ad61d846ac87a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041414a140f46a5e334e943da00d8d5e66aad6850c13301f0603551d230418301680147023997434718457c8db8642eb761d711e33a348300a06082a8648ce3d040302034700304402207759805c4a05e63de5010259f857516182da37de51bebf1540bd0cd13520b64502203e90821c21ea3b6e047098630d1e79593398732ffc02bf156f957ca0e81f5ecd",
+    "pai_cert": "308201bd30820163a00302010102071e1322349cf11c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000477285c42d8d1e7349a28c95f58b9e08d75adb20c5b44c2652996c8efcb313ae1f44e5ecad0d536373a9128bf1dc6d30958abd81155410132a122dfe89dae1e7ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604147023997434718457c8db8642eb761d711e33a348301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022056248c4803fd254d197f55b901f0a3f33f9073068a1b9e750635d288f97ced8a0221008a0e687bfc73ece00b7795c86bceed053636a339c9c0cbf111ad25c82a02cf13",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100d59084416599184bb5169ee6a392ce3488eb86bd06e317752e1563a72add18e70220146e03a36e55eed8f4467b2426f853b91a157746618fca05662de230fcecd2d5",
+    "dac_private_key": "87e74b7279e1cecd915f669dd11a580e8d556da5bca3a31460663f4e28558922",
+    "dac_public_key": "04f0a8942174fe219a54b7f6ad3c949301515de6de4194408f8116a475d7ea0b29f00feead0795e9a1e80e48d6a78949e8301aedb87652ff2671f8ad61d846ac87"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/cd.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/cd.der
index 9557dceea446ef..6b741f8e4af4eb 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/cd.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.der
index d956a202ad8218..56bdf167ca623f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.pem
index f9ca7f0f303e15..c2bc1cc3bb9f21 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIEthVub1tYWgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIILMC7fX6/racwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQeoEYlRQofZo3k39AZjQ0jDMkIOrqf
-kDvXyixrZmCu8Cu6WFLVoUOlHyKxQ7V92Rob1i8gyG2GtxB+QLDfVvmRo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUU2AiZ5uqESqU
-g9s5lz6RNz8PGJkwHwYDVR0jBBgwFoAUvdwOk95U4BkPNT7vV7cFYTSDPCQwCgYI
-KoZIzj0EAwIDSAAwRQIgI3EscIACjq9SX/siigIpIK0Png072WfPBch/0Cp2su0C
-IQDhkdRqyBYQq3ryio3tft4hVnyV3OpYI+A8mmhOqFckqg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAToyoXRPZHcA2+iGgyTNb2A5/j7duLd
+XTiENTUcPPdDUAAs6skCORhwIIOq4U7vd9sh56c3U40N8e3Mdewdb40Lo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU0pbNgZ9ILIbZ
+wfgwWlJLDa9HOIQwHwYDVR0jBBgwFoAU0XaaSPcox/Cbb5HvnYDHUioEoUEwCgYI
+KoZIzj0EAwIDSAAwRQIhAKj8KW1R0/LL/N2EZQMCHfnX+HiEZ2hlWDefAgzMlNY+
+AiAR/OpRfxeBIFZS0RznrG+wywcPNr6Isrg7L0pw1RgZgA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.der
index 605f0034a02e59..5a56aa43d3ee31 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.pem
index 5c7fdff0dff151..e1153f4db8afbc 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGmEIh0P4BYUBihLw/e6BKZ3QXmNzwlTUOOi9ULgzlezoAoGCCqGSM49
-AwEHoUQDQgAEHqBGJUUKH2aN5N/QGY0NIwzJCDq6n5A718osa2ZgrvArulhS1aFD
-pR8isUO1fdkaG9YvIMhthrcQfkCw31b5kQ==
+MHcCAQEEIJfq12KlFEteD5J8MChpLh7hOWVKhf2NouU3iUQyOcxWoAoGCCqGSM49
+AwEHoUQDQgAE6MqF0T2R3ANvohoMkzW9gOf4+3bi3V04hDU1HDz3Q1AALOrJAjkY
+cCCDquFO73fbIeenN1ONDfHtzHXsHW+NCw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.der
index e739cf1d4db27c..7182ad61743c96 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.pem
index ad3109b4dd59a5..5f1809f644e1a1 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIObLsKM1rYZEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIYRF6f0dcU+swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABJ0oDQdcA5FC+pv0Y7DSUQJyjLF2WjhB0PUwis1pvzj9NE96u4PKKqxfTDsX
-w1uZckn0XRgpaeW17Kb/0//OJSijZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS93A6T3lTgGQ81Pu9XtwVhNIM8JDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAC
-7HC5PSYWgnWHq90YMje7FkMkhMqsg/ebSYjNsa/XCAIhANt++GWqNhWfGWbIj5xh
-68/4chpK2XclEYK+KrmI3QZ2
+A0IABFvvDCjY2sPLCeIHlHMi52LHkYZLoyF1TI/FdJq64JE5PHu8JLS70v/ryRjt
+24EXK1aRe2JwLpXIhXHAO9HdtHijZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTRdppI9yjH8Jtvke+dgMdSKgShQTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiB/
+N5nyxTWtHZcmigyQVCxHkhE+7tkk2Jy6cnSngls3MwIhAKeFbMVmW4+rDkRH9Nrj
+oEwaX7pFnA+z0fr3ejyKQbvu
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.der
index 3ba50131683186..7e53c30680f7d5 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.pem
index c7139050b37e6d..a9b980bbb6c730 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICMppPWV/ek9fNr8GcAKG+30oTeBrYzQ/iK40SntxxYioAoGCCqGSM49
-AwEHoUQDQgAEnSgNB1wDkUL6m/RjsNJRAnKMsXZaOEHQ9TCKzWm/OP00T3q7g8oq
-rF9MOxfDW5lySfRdGClp5bXspv/T/84lKA==
+MHcCAQEEIGxuOskX6xkytLe8p96f6ZYSA3PKNk3h2MF/AzXawgk5oAoGCCqGSM49
+AwEHoUQDQgAEW+8MKNjaw8sJ4geUcyLnYseRhkujIXVMj8V0mrrgkTk8e7wktLvS
+/+vJGO3bgRcrVpF7YnAulciFccA70d20eA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/test_case_vector.json
index d70ec1d9ce29dc..6fcc37d0d05f16 100644
--- a/credentials/development/commissioner_dut/struct_pai_cert_version_v3/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_cert_version_v3/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Valid certificate version field set to v3(2)",
     "is_success_case": "true",
-    "dac_cert": "308201ce30820174a003020102020812d855b9bd6d6168300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041ea04625450a1f668de4dfd0198d0d230cc9083aba9f903bd7ca2c6b6660aef02bba5852d5a143a51f22b143b57dd91a1bd62f20c86d86b7107e40b0df56f991a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414536022679baa112a9483db39973e91373f0f1899301f0603551d23041830168014bddc0e93de54e0190f353eef57b7056134833c24300a06082a8648ce3d0403020348003045022023712c7080028eaf525ffb228a022920ad0f9e0d3bd967cf05c87fd02a76b2ed022100e191d46ac81610ab7af28a8ded7ede21567c95dcea5823e03c9a684ea85724aa",
-    "pai_cert": "308201be30820164a003020102020839b2ec28cd6b6191300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200049d280d075c039142fa9bf463b0d25102728cb1765a3841d0f5308acd69bf38fd344f7abb83ca2aac5f4c3b17c35b997249f45d182969e5b5eca6ffd3ffce2528a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414bddc0e93de54e0190f353eef57b7056134833c24301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022002ec70b93d2616827587abdd183237bb16432484caac83f79b4988cdb1afd708022100db7ef865aa36159f1966c88f9c61ebcff8721a4ad977251182be2ab988dd0676",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100bd7611b8c95ea21de5ed69e3564174766ada86fc80b72e0faaa7f2cc44d3a8f70221008a74964531575fc1285818cca8dca8150776fb7f398c211d910e161e4e456ea4",
-    "dac_private_key": "6984221d0fe0161406284bc3f7ba04a67741798dcf095350e3a2f542e0ce57b3",
-    "dac_public_key": "041ea04625450a1f668de4dfd0198d0d230cc9083aba9f903bd7ca2c6b6660aef02bba5852d5a143a51f22b143b57dd91a1bd62f20c86d86b7107e40b0df56f991"
+    "dac_cert": "308201ce30820174a00302010202082cc0bb7d7ebfada7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e8ca85d13d91dc036fa21a0c9335bd80e7f8fb76e2dd5d388435351c3cf74350002ceac9023918702083aae14eef77db21e7a737538d0df1edcc75ec1d6f8d0ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d296cd819f482c86d9c1f8305a524b0daf473884301f0603551d23041830168014d1769a48f728c7f09b6f91ef9d80c7522a04a141300a06082a8648ce3d0403020348003045022100a8fc296d51d3f2cbfcdd846503021df9d7f8788467686558379f020ccc94d63e022011fcea517f1781205652d11ce7ac6fb0cb070f36be88b2b83b2f4a70d5181980",
+    "pai_cert": "308201be30820164a003020102020861117a7f475c53eb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200045bef0c28d8dac3cb09e207947322e762c791864ba321754c8fc5749abae091393c7bbc24b4bbd2ffebc918eddb81172b56917b62702e95c88571c03bd1ddb478a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d1769a48f728c7f09b6f91ef9d80c7522a04a141301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207f3799f2c535ad1d97268a0c90542c4792113eeed924d89cba7274a7825b3733022100a7856cc5665b8fab0e4447f4dae3a04c1a5fba459c0fb3d1faf77a3c8a41bbee",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100acded09e95dcbd884b869f5ed6cdaf524a1467fd1eee5bdb28b5958278175389022100f9d0e11ce33df0c97e9412d78828aa0ed1ac14b6324987a103274036c49c7393",
+    "dac_private_key": "97ead762a5144b5e0f927c3028692e1ee139654a85fd8da2e53789443239cc56",
+    "dac_public_key": "04e8ca85d13d91dc036fa21a0c9335bd80e7f8fb76e2dd5d388435351c3cf74350002ceac9023918702083aae14eef77db21e7a737538d0df1edcc75ec1d6f8d0b"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/cd.der
index 3eae714755b35e..748acc0e75182b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.der
index 67fe89c0aa09ad..98e97d795fcf76 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.pem
index 6a66e14a45b82c..5677acd7f52be9 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIaixjNNHVtTkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzzCCAXSgAwIBAgIIG5ODbF3a1WowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQig7TJSz/wlFSfxdyxJ07VZuk324me
-6MyrL6Anm5ALFhxbtndrSp025q+Qa+qp+zamS1uTUYoEUC+PvLS/yAfJo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUrNe2GcpHe9TY
-z2w0MxQdWChFM8cwHwYDVR0jBBgwFoAUYGv9LsCn6k9C3y6YFLAQ1ct7qE0wCgYI
-KoZIzj0EAwIDSAAwRQIhALd8I+ZJB8bUCW0RkwT8hhxghKesLVW9p1hcTvEKqL+b
-AiBplE+0Yu3BPuRxXgZLHLaEUrV41seu9gPMRByImVGDxA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR4QK7SJAR+/3IgaK6SaqP5/03BqouV
+8s9jw5/WmZujUHPZbPeNvy06YFhVbXXhdZFtFbhWPfbxyZ52j4nIOWqio2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUcs0LJ61H/rF6
+7K8Mb/caZiihFbYwHwYDVR0jBBgwFoAU9L1iUmhC6GJFqC1qQpAK1OM4YHIwCgYI
+KoZIzj0EAwIDSQAwRgIhAMqNITTnEwM0+c6uzcB2vHzOQBmOI6PvHHvp0oZDtAsO
+AiEA42qioXBfxAgUWba1Pz0hjHdTjS2mnA7iCVqk7vzoELk=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.der
index 2037b58515db48..7f9ffa502e4fa8 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.pem
index 6bec7796639089..63e10b2de28d84 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMT3ChKXFfTjTbQFzRxe2JY7f1Cj0O6yKPdCnbRkUrbloAoGCCqGSM49
-AwEHoUQDQgAEIoO0yUs/8JRUn8XcsSdO1WbpN9uJnujMqy+gJ5uQCxYcW7Z3a0qd
-NuavkGvqqfs2pktbk1GKBFAvj7y0v8gHyQ==
+MHcCAQEEIAe2OK21SjXn/PnT039KOefplvYhOiCuqwYcOnNk/zIXoAoGCCqGSM49
+AwEHoUQDQgAEeECu0iQEfv9yIGiukmqj+f9NwaqLlfLPY8Of1pmbo1Bz2Wz3jb8t
+OmBYVW114XWRbRW4Vj328cmedo+JyDlqog==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.der
index 413aeddf9cd240..4f954b4df942ab 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.pem
index 12df491da16f22..ec63d7a63efda7 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Cert.pem
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBnjCCAUOgAwIBAgIIAmVHq66pnQkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBnDCCAUOgAwIBAgIITxLK6OXgWtUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABNSwp3emKsVJFN09xeT2eRNRu73zVTa4CwLV9BpMG2QcSugS7HvTgfg2Z10j
-/IaP9N3P3kDV9RIwBXpRMzFxx3CjRTBDMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRga/0uwKfqT0LfLpgUsBDVy3uoTTAKBggq
-hkjOPQQDAgNJADBGAiEA1RSDlCgmnb6yT71zCQfCfz59IU/m05LIFrV9GXIhM34C
-IQDNw7l0b87763FdDlI+UQOIy0cVn6logXuXPq0qjGcVKg==
+A0IABLJkWhcSlqf1GrA/BoVHrF7GlmDFnsssoa3O8cp+gL8kH/zxdwSdqeS0iJ9g
+VBVwPLd/EoKRqEJvtNTqbv3ItIGjRTBDMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBT0vWJSaELoYkWoLWpCkArU4zhgcjAKBggq
+hkjOPQQDAgNHADBEAiB3wwp2ky/iuTVzK76caJdLMtBk9snx6caSCusJ8jvv2wIg
+QqhMuhXsZ61TVVKyye0p1zFMc5HEWDjQqk5V4xaJBU0=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.der
index 6ecfd4dc9d363b..f1853c88482d42 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.pem
index f2ddec536c1927..4041f92af66e63 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIdfKtbL9pBxjJzt5kde1zGJopmgR6BFc0qEWIGNJ5N/oAoGCCqGSM49
-AwEHoUQDQgAE1LCnd6YqxUkU3T3F5PZ5E1G7vfNVNrgLAtX0GkwbZBxK6BLse9OB
-+DZnXSP8ho/03c/eQNX1EjAFelEzMXHHcA==
+MHcCAQEEIDKNp1HdXE+cZ0bJAXJI15UEETSjPGE4iJ9G9X88HXEboAoGCCqGSM49
+AwEHoUQDQgAEsmRaFxKWp/UasD8GhUesXsaWYMWeyyyhrc7xyn6AvyQf/PF3BJ2p
+5LSIn2BUFXA8t38SgpGoQm+01Opu/ci0gQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/test_case_vector.json
index 2cc997c985f2b7..fa54b4abe77c5a 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate doesn't include Authority Key ID (AKID) extension",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202086a2c6334d1d5b539300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042283b4c94b3ff094549fc5dcb1274ed566e937db899ee8ccab2fa0279b900b161c5bb6776b4a9d36e6af906beaa9fb36a64b5b93518a04502f8fbcb4bfc807c9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414acd7b619ca477bd4d8cf6c3433141d58284533c7301f0603551d23041830168014606bfd2ec0a7ea4f42df2e9814b010d5cb7ba84d300a06082a8648ce3d0403020348003045022100b77c23e64907c6d4096d119304fc861c6084a7ac2d55bda7585c4ef10aa8bf9b022069944fb462edc13ee4715e064b1cb68452b578d6c7aef603cc441c88995183c4",
-    "pai_cert": "3082019e30820143a0030201020208026547abaea99d09300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004d4b0a777a62ac54914dd3dc5e4f6791351bbbdf35536b80b02d5f41a4c1b641c4ae812ec7bd381f836675d23fc868ff4ddcfde40d5f51230057a51333171c770a345304330120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414606bfd2ec0a7ea4f42df2e9814b010d5cb7ba84d300a06082a8648ce3d0403020349003046022100d514839428269dbeb24fbd730907c27f3e7d214fe6d392c816b57d197221337e022100cdc3b9746fcefbeb715d0e523e510388cb47159fa968817b973ead2a8c67152a",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220627897ec6ff502d8883d68b2241c9df68f5939fbf12cd4e9c47092172b28862d0220587b5b1de37a6cedc9eae779b610676a54685230ae28cc667786d76d1a872ff7",
-    "dac_private_key": "c4f70a129715f4e34db405cd1c5ed8963b7f50a3d0eeb228f7429db46452b6e5",
-    "dac_public_key": "042283b4c94b3ff094549fc5dcb1274ed566e937db899ee8ccab2fa0279b900b161c5bb6776b4a9d36e6af906beaa9fb36a64b5b93518a04502f8fbcb4bfc807c9"
+    "dac_cert": "308201cf30820174a00302010202081b93836c5ddad56a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047840aed224047eff722068ae926aa3f9ff4dc1aa8b95f2cf63c39fd6999ba35073d96cf78dbf2d3a6058556d75e175916d15b8563df6f1c99e768f89c8396aa2a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041472cd0b27ad47feb17aecaf0c6ff71a6628a115b6301f0603551d23041830168014f4bd62526842e86245a82d6a42900ad4e3386072300a06082a8648ce3d0403020349003046022100ca8d2134e7130334f9ceaecdc076bc7cce40198e23a3ef1c7be9d28643b40b0e022100e36aa2a1705fc4081459b6b53f3d218c77538d2da69c0ee2095aa4eefce810b9",
+    "pai_cert": "3082019c30820143a00302010202084f12cae8e5e05ad5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004b2645a171296a7f51ab03f068547ac5ec69660c59ecb2ca1adcef1ca7e80bf241ffcf177049da9e4b4889f605415703cb77f128291a8426fb4d4ea6efdc8b481a345304330120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f4bd62526842e86245a82d6a42900ad4e3386072300a06082a8648ce3d0403020347003044022077c30a76932fe2b935732bbe9c68974b32d064f6c9f1e9c6920aeb09f23befdb022042a84cba15ec67ad535552b2c9ed29d7314c7391c45838d0aa4e55e31689054d",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100e0cb8b443946cd3594a80e9c18b3df41a16491fbeeee8892b895c6cd052e49ef022067594e7c83d152d1d91a955f9eae9e12de19919baa9000eaa92d52f754ab507e",
+    "dac_private_key": "07b638adb54a35e7fcf9d3d37f4a39e7e996f6213a20aeab061c3a7364ff3217",
+    "dac_public_key": "047840aed224047eff722068ae926aa3f9ff4dc1aa8b95f2cf63c39fd6999ba35073d96cf78dbf2d3a6058556d75e175916d15b8563df6f1c99e768f89c8396aa2"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/cd.der
index ec5bee369e4e50..4c27b094bc7a7f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.der
index a7983b9e5f8a95..284c9bae206887 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.pem
index 7e0be81bca6f00..995476d7b0d7d4 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIWItL4EAVFVwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIIBF+Pwr83hwMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQbW7NUhTZtA1PY1TdVDqRwRRff45w0
-gQzb9U+lrsvCLmx+ig9Xn9jJh31Xvsfhj77o5fgsa/cxBNZDYYwH0xjWo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUZEZwl+tsAESA
-FL/iDUg9HKrpW9MwHwYDVR0jBBgwFoAUumYhYkpNV6u9mbsTa5vh3Xeik+kwCgYI
-KoZIzj0EAwIDRwAwRAIgVqDowlgAR7wwtpwPXw/y+Vq9jC/PLpd7oAnfWpNVddAC
-IDRGw9LKYiK5Cn4tR+jiyXbFd1n7RqlnINJXOEHvinBs
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARIxk74TAYypmCNPLNkv2mgB50pq5Ad
+f/O0tZfENmOO9CiivnT0v4/Ddz5s37uxdt2/jFAvKY+93/hPlyaaKeHMo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU6mhvt5SVsO+c
+a2tWFWGWT16sgSwwHwYDVR0jBBgwFoAUWp+lXysFTz3QdrHr6y3q9cGDMNIwCgYI
+KoZIzj0EAwIDRwAwRAIgItfB6axjFponzf573/DyX7eOXDRErZLsPTiQ4nJqe8oC
+IDLyCjGBMJvHVhXUnAzW/SsMJ+u67nGBuLNuOImeY9sj
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.der
index ab2d6df36cb267..e4ba62559002af 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.pem
index 70eaf76e747fa8..a66f7c3e95181c 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKZjaT2+i+mmoj52WOm1j3DVcAPrEB+h1nyEZAdBQ7wroAoGCCqGSM49
-AwEHoUQDQgAEG1uzVIU2bQNT2NU3VQ6kcEUX3+OcNIEM2/VPpa7Lwi5sfooPV5/Y
-yYd9V77H4Y++6OX4LGv3MQTWQ2GMB9MY1g==
+MHcCAQEEIDcbSo8GWLgHSmNeg43pZjfUH0knXuO7bp8uo3jb6j2RoAoGCCqGSM49
+AwEHoUQDQgAESMZO+EwGMqZgjTyzZL9poAedKauQHX/ztLWXxDZjjvQoor509L+P
+w3c+bN+7sXbdv4xQLymPvd/4T5cmminhzA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.der
index 0c75933caa1a2d..a006061f8ef415 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.pem
index f3523952f82fe4..ab8b3c5156a2cf 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB9TCCAZygAwIBAgIIBOjHNmKsTIEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB9jCCAZygAwIBAgIIWS4PZRV7bFEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABLD55NOV5Uiiebwn7j/oX54cG8zor2boSjGIdqNZ8mTkeMNxEfmnQ97Wyrz2
-mbB52ekct55msQCtOOcvZefFjO+jgZ0wgZowEgYDVR0TAQH/BAgwBgEB/wIBADAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFLpmIWJKTVervZm7E2ub4d13opPpMB8G
+A0IABP1lmqloZ9dx5HoZXy7lEPpVlOgxjLSKZShdjltYpZAHoKVscoGVAQCLOL14
+XXxn5LzQPs/PhgPd6XYvxBJPlKWjgZ0wgZowEgYDVR0TAQH/BAgwBgEB/wIBADAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFFqfpV8rBU890Hax6+st6vXBgzDSMB8G
 A1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MDQGCCsGAQUFBwEBBCgwJjAk
 BggrBgEFBQcwAYYYaHR0cDovL29jc3AuZXhhbXBsZS5jb20vMAoGCCqGSM49BAMC
-A0cAMEQCIBOUPTnkYx+CReKRHBN2j2/uAUUjhXuU0cGix030oSQkAiB7oPW6nlcF
-BmI97C4xqokqQ4rWSPvay04Lzaf7fZjiDg==
+A0gAMEUCIHNQmZ7qoDhPAeUDeR3Jd6BInaSj2rJzB3mj3DMHzHWcAiEAsLu/CYDL
+ejevK9KPaCAwCY8lA9tD1zYtoeTKlRvYRvM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.der
index a1dc2b2d7b4d43..86eabca4a1a4e7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.pem
index db053a7dc7c44e..3798b07222e421 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMyclcLHRjuKyMKvpWpHc7NRkGeICLkUM3DKiDYcqMJLoAoGCCqGSM49
-AwEHoUQDQgAEsPnk05XlSKJ5vCfuP+hfnhwbzOivZuhKMYh2o1nyZOR4w3ER+adD
-3tbKvPaZsHnZ6Ry3nmaxAK045y9l58WM7w==
+MHcCAQEEIJBYT6tInIMzKJE7wK8RXH5WMDA/lLz97ZMnVWGlwS9MoAoGCCqGSM49
+AwEHoUQDQgAE/WWaqWhn13HkehlfLuUQ+lWU6DGMtIplKF2OW1ilkAegpWxygZUB
+AIs4vXhdfGfkvNA+z8+GA93pdi/EEk+UpQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/test_case_vector.json
index 1131a079b1cb33..38545eddb78cea 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_authority_info_access_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate includes optional Authority Information Access extension",
     "is_success_case": "true",
-    "dac_cert": "308201cd30820174a0030201020208588b4be04015155c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041b5bb35485366d0353d8d537550ea4704517dfe39c34810cdbf54fa5aecbc22e6c7e8a0f579fd8c9877d57bec7e18fbee8e5f82c6bf73104d643618c07d318d6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041464467097eb6c00448014bfe20d483d1caae95bd3301f0603551d23041830168014ba6621624a4d57abbd99bb136b9be1dd77a293e9300a06082a8648ce3d0403020347003044022056a0e8c2580047bc30b69c0f5f0ff2f95abd8c2fcf2e977ba009df5a935575d002203446c3d2ca6222b90a7e2d47e8e2c976c57759fb46a96720d2573841ef8a706c",
-    "pai_cert": "308201f53082019ca003020102020804e8c73662ac4c81300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004b0f9e4d395e548a279bc27ee3fe85f9e1c1bcce8af66e84a318876a359f264e478c37111f9a743ded6cabcf699b079d9e91cb79e66b100ad38e72f65e7c58cefa3819d30819a30120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ba6621624a4d57abbd99bb136b9be1dd77a293e9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e303406082b0601050507010104283026302406082b060105050730018618687474703a2f2f6f6373702e6578616d706c652e636f6d2f300a06082a8648ce3d0403020347003044022013943d39e4631f8245e2911c13768f6fee014523857b94d1c1a2c74df4a1242402207ba0f5ba9e570506623dec2e31aa892a438ad648fbdacb4e0bcda7fb7d98e20e",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ceaf8369dda146f1daf60316286ffe2b45ce0215cde0a73832986460afba69e502200c61f02551e1dcd4882e7d05369dde0b213a05668eed8f5c73444d6442ca57de",
-    "dac_private_key": "a663693dbe8be9a6a23e7658e9b58f70d57003eb101fa1d67c8464074143bc2b",
-    "dac_public_key": "041b5bb35485366d0353d8d537550ea4704517dfe39c34810cdbf54fa5aecbc22e6c7e8a0f579fd8c9877d57bec7e18fbee8e5f82c6bf73104d643618c07d318d6"
+    "dac_cert": "308201cd30820174a0030201020208045f8fc2bf378703300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000448c64ef84c0632a6608d3cb364bf69a0079d29ab901d7ff3b4b597c436638ef428a2be74f4bf8fc3773e6cdfbbb176ddbf8c502f298fbddff84f97269a29e1cca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ea686fb79495b0ef9c6b6b561561964f5eac812c301f0603551d230418301680145a9fa55f2b054f3dd076b1ebeb2deaf5c18330d2300a06082a8648ce3d0403020347003044022022d7c1e9ac63169a27cdfe7bdff0f25fb78e5c3444ad92ec3d3890e2726a7bca022032f20a3181309bc75615d49c0cd6fd2b0c27ebbaee7181b8b36e38899e63db23",
+    "pai_cert": "308201f63082019ca0030201020208592e0f65157b6c51300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004fd659aa96867d771e47a195f2ee510fa5594e8318cb48a65285d8e5b58a59007a0a56c72819501008b38bd785d7c67e4bcd03ecfcf8603dde9762fc4124f94a5a3819d30819a30120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145a9fa55f2b054f3dd076b1ebeb2deaf5c18330d2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e303406082b0601050507010104283026302406082b060105050730018618687474703a2f2f6f6373702e6578616d706c652e636f6d2f300a06082a8648ce3d040302034800304502207350999eeaa0384f01e503791dc977a0489da4a3dab2730779a3dc3307cc759c022100b0bbbf0980cb7a37af2bd28f682030098f2503db43d7362da1e4ca951bd846f3",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100f36cb0e6769c61700f27a50387d2ce379705a0f223e52d5d8b6260cfdf28445a02204eb0bfd34be8d16a9b87cce43a6516fdd6655e52c4b5a6cde13ad407c42f2c98",
+    "dac_private_key": "371b4a8f0658b8074a635e838de96637d41f49275ee3bb6e9f2ea378dbea3d91",
+    "dac_public_key": "0448c64ef84c0632a6608d3cb364bf69a0079d29ab901d7ff3b4b597c436638ef428a2be74f4bf8fc3773e6cdfbbb176ddbf8c502f298fbddff84f97269a29e1cc"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/cd.der
index fec2d68e67a592..849b3c69d5cc2e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.der
index 2a7c32967e6958..2345637a8e97b3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.pem
index 65e64058b6ddf0..3558741b8f8584 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIcbsMeoJjhVgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIPaUFRRnmzj0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQB6OrI4rYnu6Y9hywvEsxGFHrppfuq
-qaVKH9zuwqQipBSEaHhXpWpOQmPpAS8R5XO84JUX4LQBHGkOzVfhzJbso2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUqzLFYPU7H4kG
-tr5s7nR95Ox0X/4wHwYDVR0jBBgwFoAU++S8uISgK2HT0Vz3gcmPpSryfB4wCgYI
-KoZIzj0EAwIDSAAwRQIgabc3ioSKwGks5OAA2JHVK7iAV8TsciWk3huEzKoEeY8C
-IQCsDKIP7UHhvLZrKNMLSdywttEngGq/t7WlE4oUdrRoQg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQGTlq8BPyytH0mjRP9T/cvjOVfHDwp
+PhJB0KFKONEaIh+7Ddn2cR0Uw34Hnufd4kZ6KKuFelo4eiMSXwo22C81o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUxn4FEm9XwE4K
+u279tMmgEdJcMqIwHwYDVR0jBBgwFoAUf3fQG99FWZzLduDTc/F5dyyE8IwwCgYI
+KoZIzj0EAwIDSAAwRQIhANSf4lm6R37b3j8wxB+D0o2xM4hTEqLTzxDQhw/OtxQy
+AiAgkgQSxGaDbYDJ+x3nKyUDmJPAeto4eFT+xFANvaKpjA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.der
index 66547c3d067ee1..ebd256820b8cbe 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.pem
index c80e35d844ec40..0b77cb068d06e6 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBRo4a6HIddBzf233NQIAMk7jHjjdcA2+mEPBM/cx8QxoAoGCCqGSM49
-AwEHoUQDQgAEAejqyOK2J7umPYcsLxLMRhR66aX7qqmlSh/c7sKkIqQUhGh4V6Vq
-TkJj6QEvEeVzvOCVF+C0ARxpDs1X4cyW7A==
+MHcCAQEEIIY0jGktmShf6kvpJ8jOjWZI/f8fhEmqq/gxsyId49w/oAoGCCqGSM49
+AwEHoUQDQgAEBk5avAT8srR9Jo0T/U/3L4zlXxw8KT4SQdChSjjRGiIfuw3Z9nEd
+FMN+B57n3eJGeiirhXpaOHojEl8KNtgvNQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.der
index 76fdab9fcac554..560543dceb4294 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.pem
index 88a6bd617f1bb6..a724d84f38b235 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuzCCAWGgAwIBAgIIJbLujEzNDwQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBuzCCAWGgAwIBAgIITsknyuZVSCgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABDGPaIW1n8NWzUkq4a8F8Q6uzdnHMtX7uHk6HR8wFsh1wj3QmO9m0f9qluDS
-6bok7u7E/n8i4CJfeK9Q+7vwAuijYzBhMA8GA1UdEwEB/wQFMAMCAQAwDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBT75Ly4hKArYdPRXPeByY+lKvJ8HjAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBzrZdB
-Jx2W1Qo31fPV7J93V0MZcOA8855eC0hsHGU0TgIhAMGQGVWfEfSYJpJ5bt2cHnCF
-aP2hvUWBIPNTx/jVfYtY
+A0IABPNK5iWz/g++5PWWEo1h+d7aU4HJgx5Q/k5r3iXIX4QmusdmHVu25DGAvEse
+GpH6lwuB59O3XGDY6M5TQZP/F5SjYzBhMA8GA1UdEwEB/wQFMAMCAQAwDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBR/d9Ab30VZnMt24NNz8Xl3LITwjDAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiB/sJhm
+tfbODZmuxd9UrJTA4Pu4lgI6FeAntVNxgDOt0wIhAP+kPpwdAsUgNeKTkao6N0is
+0LobmnDXlpMs1vPZEfDM
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.der
index 338bbae687d27f..f3fd010aba9056 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.pem
index 92444d7b1456db..19c0f13eb663cd 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMmYm/h1vPlRDkZbMdDzDY+5xJaeJNSZ4jfyN9SO7vleoAoGCCqGSM49
-AwEHoUQDQgAEMY9ohbWfw1bNSSrhrwXxDq7N2ccy1fu4eTodHzAWyHXCPdCY72bR
-/2qW4NLpuiTu7sT+fyLgIl94r1D7u/AC6A==
+MHcCAQEEIN6FGZY1VwuYrAicDoTqRjsAFgMpkJlJS3fk6nHCEz5GoAoGCCqGSM49
+AwEHoUQDQgAE80rmJbP+D77k9ZYSjWH53tpTgcmDHlD+TmveJchfhCa6x2YdW7bk
+MYC8Sx4akfqXC4Hn07dcYNjozlNBk/8XlA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/test_case_vector.json
index f7d9ede1b6d398..1c59b0639725f7 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension CA field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020871bb0c7a82638558300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000401e8eac8e2b627bba63d872c2f12cc46147ae9a5fbaaa9a54a1fdceec2a422a41484687857a56a4e4263e9012f11e573bce09517e0b4011c690ecd57e1cc96eca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ab32c560f53b1f8906b6be6cee747de4ec745ffe301f0603551d23041830168014fbe4bcb884a02b61d3d15cf781c98fa52af27c1e300a06082a8648ce3d0403020348003045022069b7378a848ac0692ce4e000d891d52bb88057c4ec7225a4de1b84ccaa04798f022100ac0ca20fed41e1bcb66b28d30b49dcb0b6d127806abfb7b5a5138a1476b46842",
-    "pai_cert": "308201bb30820161a003020102020825b2ee8c4ccd0f04300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004318f6885b59fc356cd492ae1af05f10eaecdd9c732d5fbb8793a1d1f3016c875c23dd098ef66d1ff6a96e0d2e9ba24eeeec4fe7f22e0225f78af50fbbbf002e8a3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020106301d0603551d0e04160414fbe4bcb884a02b61d3d15cf781c98fa52af27c1e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022073ad9741271d96d50a37d5f3d5ec9f7757431970e03cf39e5e0b486c1c65344e022100c19019559f11f4982692796edd9c1e708568fda1bd458120f353c7f8d57d8b58",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ff9a7e62129e4f44f202898ab632beb427ba3171abbff4ceed6a671c2628caa50221008b9fee1eb0faa4047751d12c768ac186605625dffeb6896973406559b32bf941",
-    "dac_private_key": "1468e1ae8721d741cdfdb7dcd40800c93b8c78e375c036fa610f04cfdcc7c431",
-    "dac_public_key": "0401e8eac8e2b627bba63d872c2f12cc46147ae9a5fbaaa9a54a1fdceec2a422a41484687857a56a4e4263e9012f11e573bce09517e0b4011c690ecd57e1cc96ec"
+    "dac_cert": "308201ce30820174a00302010202083da5054519e6ce3d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004064e5abc04fcb2b47d268d13fd4ff72f8ce55f1c3c293e1241d0a14a38d11a221fbb0dd9f6711d14c37e079ee7dde2467a28ab857a5a387a23125f0a36d82f35a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c67e05126f57c04e0abb6efdb4c9a011d25c32a2301f0603551d230418301680147f77d01bdf45599ccb76e0d373f179772c84f08c300a06082a8648ce3d0403020348003045022100d49fe259ba477edbde3f30c41f83d28db133885312a2d3cf10d0870fceb71432022020920412c466836d80c9fb1de72b25039893c07ada387854fec4500dbda2a98c",
+    "pai_cert": "308201bb30820161a00302010202084ec927cae6554828300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f34ae625b3fe0fbee4f596128d61f9deda5381c9831e50fe4e6bde25c85f8426bac7661d5bb6e43180bc4b1e1a91fa970b81e7d3b75c60d8e8ce534193ff1794a3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020106301d0603551d0e041604147f77d01bdf45599ccb76e0d373f179772c84f08c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207fb09866b5f6ce0d99aec5df54ac94c0e0fbb896023a15e027b553718033add3022100ffa43e9c1d02c52035e29391aa3a3748acd0ba1b9a70d796932cd6f3d911f0cc",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220538824384db76fd9c646a69a8f9db13e607e38b793bb7be892cf20c0ba1d3fd40220577258b59a9aa3071799525ff00596c24263cee0c4ce8c81a8bea92872c665c7",
+    "dac_private_key": "86348c692d99285fea4be927c8ce8d6648fdff1f8449aaabf831b3221de3dc3f",
+    "dac_public_key": "04064e5abc04fcb2b47d268d13fd4ff72f8ce55f1c3c293e1241d0a14a38d11a221fbb0dd9f6711d14c37e079ee7dde2467a28ab857a5a387a23125f0a36d82f35"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/cd.der
index ecb09dac258bf0..7a1362fb5432fc 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.der
index 51989b110805c3..743afc01639eea 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.pem
index 36eec166d5f06c..941d6891710692 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIS4jxz81t364wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIX1aXUJ0U2kIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATiWCpujmMWMXKieY+oZunzOx4XTRjS
-/OVNjyrJ31hTitAjdf7lytLoNRSforqGlrViIXUG/tCrmjjST8LnLL2co2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUCsANtjvjndIv
-xROCWXFRgHRTkZswHwYDVR0jBBgwFoAUIRnmT86ATWnQG345djOEe7VBAhkwCgYI
-KoZIzj0EAwIDSAAwRQIhAKCvl33BBNVf6eY2asYPySLlzPYaTC/EHyMBO4OdBqnb
-AiAxvcNuF5zGd+MP5AZlOnfmIylrYE1uNKj6TXbZVwYh3g==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4psKpeHyERkvrT3SU17gaoBDrWPvo
+hIfzEk15cbCcN8fIL4pq5jNlcmNkRF7IoMJQhTDjyUQtmbbhj9ZJ6qH9o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU/K9YmOSjSAuj
+c4xrKE8hhf0BmjEwHwYDVR0jBBgwFoAUPFdvmtprlcMsai90RQaW9kivx6UwCgYI
+KoZIzj0EAwIDSAAwRQIhAJ+7ws/rRsbGp9A57xoFnAsCYJqgsyOmZlWOSi//GhKh
+AiB9QTXkpVMkIxgW55+poOUaiWHgIy3nOB/gM3QSvtA1+A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.der
index 81100c6eef05e3..9ade076970a48b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.pem
index 64a6c04a81aaa9..a58424c28294e4 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDUffoXTyV8tRml3kbGKZPf6btOha+cVJLb0ZIdbzOxQoAoGCCqGSM49
-AwEHoUQDQgAE4lgqbo5jFjFyonmPqGbp8zseF00Y0vzlTY8qyd9YU4rQI3X+5crS
-6DUUn6K6hpa1YiF1Bv7Qq5o40k/C5yy9nA==
+MHcCAQEEIMKnYVobGVfdkkCMY8ngNWIoUIc02YAd3QXLi6wd9w7WoAoGCCqGSM49
+AwEHoUQDQgAEuKbCqXh8hEZL6090lNe4GqAQ61j76ISH8xJNeXGwnDfHyC+KauYz
+ZXJjZEReyKDCUIUw48lELZm24Y/WSeqh/Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.der
index 9ef446121fef77..7d06347bc73fe2 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.pem
index 5f18921ad6a589..7d4e2d98ca3220 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuzCCAWGgAwIBAgIIdERKOCOViG8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBuzCCAWGgAwIBAgIIcdCsMsXIjBEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABElBxFevacK5AG9hIKzNSD9xQGX/GcNyLsbqvjMf4beHzUxEysb8h3Fwfejl
-5bjYMbpOLkXRNjhexjD+C/yXcRyjYzBhMA8GA1UdEwEB/wQFMAMCAQAwDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBQhGeZPzoBNadAbfjl2M4R7tUECGTAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAPLgpa
-4uKmrtNlLXDXyISoW+tRr7pydOuJCb6ecwOQMgIhAMiS7fKoW/tT//ABwqWzfCG9
-eUYMtMnbHTy/gqWdEJod
+A0IABA/kidH96fS6/zyYqffBrBSHMO1C2s/OwPYPq/PCNdKAgx7rx6S5MUifHSid
+oBQsUqACQCG25zLm7rtI9B+uMXujYzBhMA8GA1UdEwEB/wQFMAMCAQAwDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQ8V2+a2muVwyxqL3RFBpb2SK/HpTAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiB7V/NB
+RUGzSo6Qw1qmqgqww5Wvt/yM1YWeGhr5CRvSHQIhAOauo0EmthcZX7xFPkJjh4nl
+E9DGVpxnpk5goBItoGQs
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.der
index 72c38594ca8721..1362d05fe778f6 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.pem
index 6daec99a9f276a..5f3ede8c5ab018 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMDhjGDHXErMrnUyU7F9KC+EBvvRzefyEH6TGWxwIPJpoAoGCCqGSM49
-AwEHoUQDQgAESUHEV69pwrkAb2EgrM1IP3FAZf8Zw3Iuxuq+Mx/ht4fNTETKxvyH
-cXB96OXluNgxuk4uRdE2OF7GMP4L/JdxHA==
+MHcCAQEEIKJhgIgm2//WFd64lHHTB/9O2gQOMlqtLHt/18dxFoM3oAoGCCqGSM49
+AwEHoUQDQgAED+SJ0f3p9Lr/PJip98GsFIcw7ULaz87A9g+r88I10oCDHuvHpLkx
+SJ8dKJ2gFCxSoAJAIbbnMubuu0j0H64xew==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/test_case_vector.json
index 365fab302748c6..873c265f87537c 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension CA field is wrong (TRUE for DAC and FALSE for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202084b88f1cfcd6ddfae300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e2582a6e8e63163172a2798fa866e9f33b1e174d18d2fce54d8f2ac9df58538ad02375fee5cad2e835149fa2ba8696b562217506fed0ab9a38d24fc2e72cbd9ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140ac00db63be39dd22fc51382597151807453919b301f0603551d230418301680142119e64fce804d69d01b7e397633847bb5410219300a06082a8648ce3d0403020348003045022100a0af977dc104d55fe9e6366ac60fc922e5ccf61a4c2fc41f23013b839d06a9db022031bdc36e179cc677e30fe406653a77e623296b604d6e34a8fa4d76d9570621de",
-    "pai_cert": "308201bb30820161a003020102020874444a382395886f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044941c457af69c2b9006f6120accd483f714065ff19c3722ec6eabe331fe1b787cd4c44cac6fc8771707de8e5e5b8d831ba4e2e45d136385ec630fe0bfc97711ca3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020106301d0603551d0e041604142119e64fce804d69d01b7e397633847bb5410219301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502200f2e0a5ae2e2a6aed3652d70d7c884a85beb51afba7274eb8909be9e73039032022100c892edf2a85bfb53fff001c2a5b37c21bd79460cb4c9db1d3cbf82a59d109a1d",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022036d204f608c677e18e9208ec774c10d34153f4c1788716f031075d791b6ecb190220576198ba705ddbd8d2a083db1f5c84212859041e70cb6fec0ff61525054fb546",
-    "dac_private_key": "351f7e85d3c95f2d46697791b18a64f7fa6ed3a16be71524b6f464875bccec50",
-    "dac_public_key": "04e2582a6e8e63163172a2798fa866e9f33b1e174d18d2fce54d8f2ac9df58538ad02375fee5cad2e835149fa2ba8696b562217506fed0ab9a38d24fc2e72cbd9c"
+    "dac_cert": "308201ce30820174a00302010202085f5697509d14da42300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b8a6c2a9787c84464beb4f7494d7b81aa010eb58fbe88487f3124d7971b09c37c7c82f8a6ae63365726364445ec8a0c2508530e3c9442d99b6e18fd649eaa1fda360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414fcaf5898e4a3480ba3738c6b284f2185fd019a31301f0603551d230418301680143c576f9ada6b95c32c6a2f74450696f648afc7a5300a06082a8648ce3d04030203480030450221009fbbc2cfeb46c6c6a7d039ef1a059c0b02609aa0b323a666558e4a2fff1a12a102207d4135e4a55324231816e79fa9a0e51a8961e0232de7381fe0337412bed035f8",
+    "pai_cert": "308201bb30820161a003020102020871d0ac32c5c88c11300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200040fe489d1fde9f4baff3c98a9f7c1ac148730ed42dacfcec0f60fabf3c235d280831eebc7a4b931489f1d289da0142c52a0024021b6e732e6eebb48f41fae317ba3633061300f0603551d130101ff04053003020100300e0603551d0f0101ff040403020106301d0603551d0e041604143c576f9ada6b95c32c6a2f74450696f648afc7a5301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207b57f3414541b34a8e90c35aa6aa0ab0c395afb7fc8cd5859e1a1af9091bd21d022100e6aea34126b617195fbc453e42638789e513d0c6569c67a64e60a0122da0642c",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ae657400ce20681866c99961b4ba2d88cdf61d3f7c618d9dce44545b89f1839702201ee4c334498527feafe8e987d83b46c72351ee4ccfcbbcd316be89f9ee5f4867",
+    "dac_private_key": "c2a7615a1b1957dd92408c63c9e0356228508734d9801ddd05cb8bac1df70ed6",
+    "dac_public_key": "04b8a6c2a9787c84464beb4f7494d7b81aa010eb58fbe88487f3124d7971b09c37c7c82f8a6ae63365726364445ec8a0c2508530e3c9442d99b6e18fd649eaa1fd"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/cd.der
index 64a98d58987369..bb861931f63624 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.der
index 61c91fd3559eb9..49fe3828779eac 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.pem
index 8ffcc4d1f7f1cb..d356f09a606508 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIMQ/civCtW7YwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIIVzWqTfD7eNowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS1zJgIlCuuTRwhQduQQFdkHbw5UlAZ
-MejDtYg9lMSt31CIB18sc/bWVcIBiCC1DW3IGoQe8mBuKig+yESVnQ2uo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUKyZkxDM6yrsQ
-ITIu4svJOceffl0wHwYDVR0jBBgwFoAUR1F3/qv6Q5ZrCccDU7KmmrGeAw0wCgYI
-KoZIzj0EAwIDRwAwRAIgLDnrRn0UbPn0v3gbpwqPwPXIN2sVc+pdHV1km/DdnSIC
-IGudo/2NrAM5HzpJ+UXQRSF5KWMIQCMFQEIr97u9zCbp
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASHyIVHH+mua7fzhAgTIJffJBv3fqTn
+4zTFK99G4sVcu7QSu/QIHyGiTsvPu+93cTxf4s+W5guAqO9O7LHePMt8o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUIq2u3TuMua2f
+s3ZYLJ8qQzRD1XYwHwYDVR0jBBgwFoAUodsOLi5+AsDmcuEgOIRYSv69l/cwCgYI
+KoZIzj0EAwIDRwAwRAIgVoAzlBQlbACbEeMFVNRazbBHExifomdUrEfnY6HKH5EC
+IHBWd82+aJu8B6+AI5FbjJBlSh1Ss+kwRAn/c3B5tro8
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.der
index bff67330dde089..d4559e8afb944e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.pem
index 3d32a0a6002a35..f1f8d4d0654e89 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFqUYgb8iAuwGCTAQK57hlakBjLFR4n44DvL08NvDn0IoAoGCCqGSM49
-AwEHoUQDQgAEtcyYCJQrrk0cIUHbkEBXZB28OVJQGTHow7WIPZTErd9QiAdfLHP2
-1lXCAYggtQ1tyBqEHvJgbiooPshElZ0Nrg==
+MHcCAQEEIL2bwBAfof2blGplL8+wxJEEqiJUGlCpv8yyd+o/GB8AoAoGCCqGSM49
+AwEHoUQDQgAEh8iFRx/prmu384QIEyCX3yQb936k5+M0xSvfRuLFXLu0Erv0CB8h
+ok7Lz7vvd3E8X+LPluYLgKjvTuyx3jzLfA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.der
index 863f8c6548eae9..a5305ba183f8c7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.pem
index 59845375d24c24..8493849380e5b3 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvDCCAWGgAwIBAgIIcGGOo7HhXB0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBujCCAWGgAwIBAgIIPepDsbiEc5QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCcgeTMSC5ulBJWeb8gl+VMdDeHFr1xkwyYsRDJc3INsGs39qTqarFjfwLYZ
-x8jkn7iy7msSKQXs1yHC67dwSLejYzBhMA8GA1UdEwQIMAYBAf8CAQAwDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBRHUXf+q/pDlmsJxwNTsqaasZ4DDTAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEApvXD
-+2vsByWK8VgF7Ao632MFwD2s6riB7uPlknbhxicCIQCVFvM54vOG4rO1aYeH6BUX
-JcLIDdi4/w4X7MXn8BXXgQ==
+A0IABBCwpIvhnIMQU1ERTN8t/n2ZNSpQSvpjUG4OoGbS/qmuqFC4y71CIYuVthYX
+8/yyfj6RHPqOi97Hx4EP0ycEE8KjYzBhMA8GA1UdEwQIMAYBAf8CAQAwDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBSh2w4uLn4CwOZy4SA4hFhK/r2X9zAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBHBlBu
+E7w3HQS57uGMqQLrFvbiV1VtXtZtN9nBSyItBgIgdVgxUBwCUlX1tprciqsM1NZ6
+acMn3Kt+ZC+QXZOGAdA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.der
index ff09d27cf77f6e..3b084aeed07388 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.pem
index 3ba0560adaf85c..0462fcc45cc66a 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOi6T39oHEjXexFDqV8ojaFUo28kOgMcgkcWMj2vwnv8oAoGCCqGSM49
-AwEHoUQDQgAEJyB5MxILm6UElZ5vyCX5Ux0N4cWvXGTDJixEMlzcg2wazf2pOpqs
-WN/AthnHyOSfuLLuaxIpBezXIcLrt3BItw==
+MHcCAQEEIFVq01g4LA3qbpLDbUCAqFMd95qPF/FFHmZAGueiCIawoAoGCCqGSM49
+AwEHoUQDQgAEELCki+GcgxBTURFM3y3+fZk1KlBK+mNQbg6gZtL+qa6oULjLvUIh
+i5W2Fhfz/LJ+PpEc+o6L3sfHgQ/TJwQTwg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/test_case_vector.json
index b037f082989c9d..dc74be67a4eb5e 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension critical field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820174a0030201020208310fdc8af0ad5bb6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b5cc9808942bae4d1c2141db904057641dbc3952501931e8c3b5883d94c4addf5088075f2c73f6d655c2018820b50d6dc81a841ef2606e2a283ec844959d0daea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604142b2664c4333acabb1021322ee2cbc939c79f7e5d301f0603551d23041830168014475177feabfa43966b09c70353b2a69ab19e030d300a06082a8648ce3d040302034700304402202c39eb467d146cf9f4bf781ba70a8fc0f5c8376b1573ea5d1d5d649bf0dd9d2202206b9da3fd8dac03391f3a49f945d045217929630840230540422bf7bbbdcc26e9",
-    "pai_cert": "308201bc30820161a003020102020870618ea3b1e15c1d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000427207933120b9ba504959e6fc825f9531d0de1c5af5c64c3262c44325cdc836c1acdfda93a9aac58dfc0b619c7c8e49fb8b2ee6b122905ecd721c2ebb77048b7a3633061300f0603551d13040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414475177feabfa43966b09c70353b2a69ab19e030d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a6f5c3fb6bec07258af15805ec0a3adf6305c03daceab881eee3e59276e1c6270221009516f339e2f386e2b3b5698787e8151725c2c80dd8b8ff0e17ecc5e7f015d781",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402200a1a03af66ab1977de0f5b4c46ea1df8ead3badf11abd413bfbc0e24d69688aa022017849bd80c1495d9669415db572faa0d11be10b004f228fa549630feebeae710",
-    "dac_private_key": "5a946206fc880bb01824c040ae7b8656a40632c54789f8e03bcbd3c36f0e7d08",
-    "dac_public_key": "04b5cc9808942bae4d1c2141db904057641dbc3952501931e8c3b5883d94c4addf5088075f2c73f6d655c2018820b50d6dc81a841ef2606e2a283ec844959d0dae"
+    "dac_cert": "308201cd30820174a00302010202085735aa4df0fb78da300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000487c885471fe9ae6bb7f38408132097df241bf77ea4e7e334c52bdf46e2c55cbbb412bbf4081f21a24ecbcfbbef77713c5fe2cf96e60b80a8ef4eecb1de3ccb7ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041422adaedd3b8cb9ad9fb376582c9f2a433443d576301f0603551d23041830168014a1db0e2e2e7e02c0e672e1203884584afebd97f7300a06082a8648ce3d040302034700304402205680339414256c009b11e30554d45acdb04713189fa26754ac47e763a1ca1f910220705677cdbe689bbc07af8023915b8c90654a1d52b3e9304409ff737079b6ba3c",
+    "pai_cert": "308201ba30820161a00302010202083dea43b1b8847394300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000410b0a48be19c83105351114cdf2dfe7d99352a504afa63506e0ea066d2fea9aea850b8cbbd42218b95b61617f3fcb27e3e911cfa8e8bdec7c7810fd3270413c2a3633061300f0603551d13040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a1db0e2e2e7e02c0e672e1203884584afebd97f7301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402204706506e13bc371d04b9eee18ca902eb16f6e257556d5ed66d37d9c14b222d060220755831501c025255f5b69adc8aab0cd4d67a69c327dcab7e642f905d938601d0",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ee77d7928d173e1fc11ab55622df33f35bde695a80eac6320f029e9e9536c8d002204748360facc01b838b708fffb3e928c20a27f6526926baa3d32325abee5fd852",
+    "dac_private_key": "bd9bc0101fa1fd9b946a652fcfb0c49104aa22541a50a9bfccb277ea3f181f00",
+    "dac_public_key": "0487c885471fe9ae6bb7f38408132097df241bf77ea4e7e334c52bdf46e2c55cbbb412bbf4081f21a24ecbcfbbef77713c5fe2cf96e60b80a8ef4eecb1de3ccb7c"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/cd.der
index 8d7fe9690b3d89..7cd0c20d25cf97 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.der
index fee4ec2e57a9c7..8d5f58dcdf33a8 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.pem
index 9a2708d92eccab..a553a09e136f56 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIdb3Nlp5blpswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIaEKKz6fnOZMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT+HHBpV+Xgs8TXk2QwyNIrE49hs33T
-dBsmjGxkFtvkC63F9yZ3/ETgel6PC90gaSSKS3kbASlS1r1wouXZCGIuo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUlUm6FFY5w3+P
-QoRRaS5Cn0hwdUwwHwYDVR0jBBgwFoAU9V8WUhHCne1IBikMKbyKDYxNLWMwCgYI
-KoZIzj0EAwIDSAAwRQIhALKGIRutW3nqvvNYsC//YYXbvwuUqwKNrvG7xZqNZi9t
-AiAGcHMmY47S9HzYQ5Lba0219tXwqnCeBGxQy3mYss9GnQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQsftjuCIPmxk52fostZioN9+gJv9bf
+OrVTYmHacfMzp2+FKnj+bhcFITw94gH+kNYqrvXCJg8jMER8LcoWoFVdo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUsEfsddoPfIlK
+bpEc4vpBMcYKuOUwHwYDVR0jBBgwFoAUbhw5uFm2AumJQSVgZFUIqMooMyowCgYI
+KoZIzj0EAwIDSAAwRQIhAKmQfUAZeZDBifp7g6FNsucx/AYgSDzd+OcCW/tehkn/
+AiArbEjygvAyh36PpYNpZXGIEY8dgerlHlKfgHZK2ipNNw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.der
index cc39e9ff8b773f..a9ad6764c840a4 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.pem
index 0f311485fec959..641aca4fea6c91 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHIPnpRdewmid4BTuNpqP/TOUz/NDmv55vbVfgdPLROBoAoGCCqGSM49
-AwEHoUQDQgAE/hxwaVfl4LPE15NkMMjSKxOPYbN903QbJoxsZBbb5Autxfcmd/xE
-4HpejwvdIGkkikt5GwEpUta9cKLl2QhiLg==
+MHcCAQEEIImBWFtyMgs1SXdvqMPZhy+wbOTV3Hok1VOsakz/csoVoAoGCCqGSM49
+AwEHoUQDQgAELH7Y7giD5sZOdn6LLWYqDffoCb/W3zq1U2Jh2nHzM6dvhSp4/m4X
+BSE8PeIB/pDWKq71wiYPIzBEfC3KFqBVXQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.der
index 7ccc1420cfaeae..9d9036f81d9d75 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.pem
index acd5faef5a81e9..633c27239fd994 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBujCCAWGgAwIBAgIIVMm6Jv+mxPcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBuzCCAWGgAwIBAgIIQ52HNQwjyf8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABJ2Wl9l6l+gs9rqbfbTsbzCtvEUUwAUrk7KCuAk5T9jZ8BLiM7tZt35zflmK
-kb8z3kjs4ixR5yRDlhHE/xY0zMqjYzBhMA8GA1UdEwQIMAYBAf8CAQAwDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBT1XxZSEcKd7UgGKQwpvIoNjE0tYzAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAr+rce
-p33wOyktgrS9GyGihoGPW2QYe/VwKdJlKhQ38gIgHc9B3Am9Dzh7g5GrPWMGN3rU
-l+7ep/ftYp2J0zavcjM=
+A0IABHaj0W5Xa4MxNXDtjo05iFbFmI0whcYbi7DAlTaDV09ON+JR+uZdgDjpUYUq
+w/HwEhLKg9N3qp5jV4uUt2EsH3KjYzBhMA8GA1UdEwQIMAYBAf8CAQAwDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBRuHDm4WbYC6YlBJWBkVQioyigzKjAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBrATC7
+DaTt/xFFS5fqMHP8YdjAIH4QyDbRmS7VFD7tZgIhAINPNDWGogTGvDG0f7Ce57hb
+Isqa3g4/bhIvx8mFrKsF
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.der
index 68f5fb0b51710a..b1f6c16e831d35 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.pem
index ee9bc684a7cdd0..517db5eaedee89 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM8HlMqytGy/LgAdt+U5DQZcRU2WkFCd3c6sAngjD3e3oAoGCCqGSM49
-AwEHoUQDQgAEnZaX2XqX6Cz2upt9tOxvMK28RRTABSuTsoK4CTlP2NnwEuIzu1m3
-fnN+WYqRvzPeSOziLFHnJEOWEcT/FjTMyg==
+MHcCAQEEIHv7HXNQIufHBsgRp8Il9s92B3jIjxNzbLvS8HvBMsEzoAoGCCqGSM49
+AwEHoUQDQgAEdqPRbldrgzE1cO2OjTmIVsWYjTCFxhuLsMCVNoNXT0434lH65l2A
+OOlRhSrD8fASEsqD03eqnmNXi5S3YSwfcg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/test_case_vector.json
index f2571061790254..2856d5a09fc731 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension critical field is set as 'non-critical'",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020875bdcd969e5b969b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fe1c706957e5e0b3c4d7936430c8d22b138f61b37dd3741b268c6c6416dbe40badc5f72677fc44e07a5e8f0bdd2069248a4b791b012952d6bd70a2e5d908622ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604149549ba145639c37f8f428451692e429f4870754c301f0603551d23041830168014f55f165211c29ded4806290c29bc8a0d8c4d2d63300a06082a8648ce3d0403020348003045022100b286211bad5b79eabef358b02fff6185dbbf0b94ab028daef1bbc59a8d662f6d022006707326638ed2f47cd84392db6b4db5f6d5f0aa709e046c50cb7998b2cf469d",
-    "pai_cert": "308201ba30820161a003020102020854c9ba26ffa6c4f7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200049d9697d97a97e82cf6ba9b7db4ec6f30adbc4514c0052b93b282b809394fd8d9f012e233bb59b77e737e598a91bf33de48ece22c51e724439611c4ff1634cccaa3633061300f0603551d13040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414f55f165211c29ded4806290c29bc8a0d8c4d2d63301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402202bfab71ea77df03b292d82b4bd1b21a286818f5b64187bf57029d2652a1437f202201dcf41dc09bd0f387b8391ab3d6306377ad497eedea7f7ed629d89d336af7233",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100815f5318a677166a66950bdf02be6212ef4f1a99e1a0fc81ab80f68c3fa2fc880221008410e82ea0095fdd328b4571d21045da47880c0f0399d3a2801a5f6543a17f02",
-    "dac_private_key": "720f9e945d7b09a2778053b8da6a3ff4ce533fcd0e6bf9e6f6d57e074f2d1381",
-    "dac_public_key": "04fe1c706957e5e0b3c4d7936430c8d22b138f61b37dd3741b268c6c6416dbe40badc5f72677fc44e07a5e8f0bdd2069248a4b791b012952d6bd70a2e5d908622e"
+    "dac_cert": "308201ce30820174a003020102020868428acfa7e73993300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042c7ed8ee0883e6c64e767e8b2d662a0df7e809bfd6df3ab5536261da71f333a76f852a78fe6e1705213c3de201fe90d62aaef5c2260f2330447c2dca16a0555da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b047ec75da0f7c894a6e911ce2fa4131c60ab8e5301f0603551d230418301680146e1c39b859b602e989412560645508a8ca28332a300a06082a8648ce3d0403020348003045022100a9907d40197990c189fa7b83a14db2e731fc0620483cddf8e7025bfb5e8649ff02202b6c48f282f032877e8fa58369657188118f1d81eae51e529f80764ada2a4d37",
+    "pai_cert": "308201bb30820161a0030201020208439d87350c23c9ff300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000476a3d16e576b83313570ed8e8d398856c5988d3085c61b8bb0c0953683574f4e37e251fae65d8038e951852ac3f1f01212ca83d377aa9e63578b94b7612c1f72a3633061300f0603551d13040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146e1c39b859b602e989412560645508a8ca28332a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502206b0130bb0da4edff11454b97ea3073fc61d8c0207e10c836d1992ed5143eed66022100834f343586a204c6bc31b47fb09ee7b85b22ca9ade0e3f6e122fc7c985acab05",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ad10134969b09e9b74a0489d9621b79638fb9bf224d84be4ebe5eaf882593b1602200bd739740d0ff82387853b60beebd147eaac9274861d64a9044a79d25fb0deda",
+    "dac_private_key": "8981585b72320b3549776fa8c3d9872fb06ce4d5dc7a24d553ac6a4cff72ca15",
+    "dac_public_key": "042c7ed8ee0883e6c64e767e8b2d662a0df7e809bfd6df3ab5536261da71f333a76f852a78fe6e1705213c3de201fe90d62aaef5c2260f2330447c2dca16a0555d"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/cd.der
index ce8f850e77da00..f23ca150636325 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.der
index 32cedf18c2d3bc..d3d0819e16c19c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.pem
index c7b1258d5f0989..83d879406d2486 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIW8xZsDy+utUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIetYrcjBslrkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARdAdeOpU8zzB58Pc6CJHRoAX4OG9nO
-VOJrp56gH6igILibAMEGpBuHgAg8yP90uONyaaV8bqv1M3pyjaDkpR4No2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU98kIxRrO4iSq
-jJDvrNSQQUxbirUwHwYDVR0jBBgwFoAUlHQI+M208hYbyi6p4Lap2pXp5IQwCgYI
-KoZIzj0EAwIDSAAwRQIhAOovv+N8V3k4SDQXzGNv/XPU4pL4yx9d9mxOcJR6BQvi
-AiANwIAb9a312zgGMHPBqlk/jd6OF2jwGurjSjx741BJ6g==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATHo3QfCvAjo+s2RVLMFrNjPysn+N3S
+JKrZ6Lkwj0IW/JD30OwK+FDbk2wZ42PQM8Wt6HxtjF2fxZg9hvAcn/5no2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUaT8KE7VElaii
+9mj6J3Xm7i9TJmowHwYDVR0jBBgwFoAUewoAxgGJRBJk6UuaRzBJMBIA6pgwCgYI
+KoZIzj0EAwIDSAAwRQIgQisLNl9fiTcno+1xsghSmUBkRPNSRqaWztw3Z4oMIr0C
+IQCgtnsGcKrkoIOFJop0OnOUFAO4i3yZlwsgvUFRnFg7Zg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.der
index af169affecf2cb..f9bf5a203a16a7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.pem
index 121bb77756a400..b3b3c808e3115b 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDuxLZXbl2lK1CIbNoRdSk2mn03DbyHzR7CdTjD0dnmjoAoGCCqGSM49
-AwEHoUQDQgAEXQHXjqVPM8wefD3OgiR0aAF+DhvZzlTia6eeoB+ooCC4mwDBBqQb
-h4AIPMj/dLjjcmmlfG6r9TN6co2g5KUeDQ==
+MHcCAQEEIChxpa4/ofDZzH7jmjMWaXKTxSKXjTRyXAubdZDeHP0JoAoGCCqGSM49
+AwEHoUQDQgAEx6N0HwrwI6PrNkVSzBazYz8rJ/jd0iSq2ei5MI9CFvyQ99DsCvhQ
+25NsGeNj0DPFreh8bYxdn8WYPYbwHJ/+Zw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.der
index 219f330f5b27d9..0e4d4011cba6f4 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.pem
index 25694d8d330941..5bc1c2b1110ea3 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Cert.pem
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBqjCCAVCgAwIBAgIID878EHeYm7cwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBqjCCAVCgAwIBAgIILUHJzfxzgu4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABEH0GBS7xtXgBDl/sLWn0aRdIDX2QSbboPdW37A8V7wjBxOQXRoir9iQmPXX
-sAVTH1zWS8svwm+kls9vCKwBiAejUjBQMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
-FgQUlHQI+M208hYbyi6p4Lap2pXp5IQwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGX
-ZxDc3DGhcX4wCgYIKoZIzj0EAwIDSAAwRQIhAJG7tQaKXSVo7RArM2/RwwU4y9UV
-bY8LiO807Fun7OKjAiAVjKxUjnhEsp3tzBLXopv2AL3qoz7rlvPmRWyxcC4kcA==
+A0IABG4pQNykG47c81m6R6XdKMwBJfaDHAnCy8b0nJDcNASgGn7Qy8YDQFMtAilw
+wT1CJE6hcuNd2IzLDny6ojfNjlSjUjBQMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUewoAxgGJRBJk6UuaRzBJMBIA6pgwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGX
+ZxDc3DGhcX4wCgYIKoZIzj0EAwIDSAAwRQIgfF63matf/TKvhXZ0sNsitVCW+BPs
+mys+f/a5vTH6jOQCIQC333q2kHvP/t3Gg/SBg+8IKHoa5ba8b1PmPb7CY01Ckw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.der
index fade1e59b6e855..8526afcbd7c753 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.pem
index 1b59cd60eaaac5..7ff75cffabe91d 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBYD5L9Q/WcmGpnsWW9DI2NgK+RXFVxUZPAS2cW+Mb0YoAoGCCqGSM49
-AwEHoUQDQgAEQfQYFLvG1eAEOX+wtafRpF0gNfZBJtug91bfsDxXvCMHE5BdGiKv
-2JCY9dewBVMfXNZLyy/Cb6SWz28IrAGIBw==
+MHcCAQEEIK+usgdb5f+VEG6qqDURXLyPSwn+pxjgi++av+yYdF0RoAoGCCqGSM49
+AwEHoUQDQgAEbilA3KQbjtzzWbpHpd0ozAEl9oMcCcLLxvSckNw0BKAaftDLxgNA
+Uy0CKXDBPUIkTqFy413YjMsOfLqiN82OVA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/test_case_vector.json
index d31f029ea996f7..e88f53c63ae608 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate doesn't include Basic Constraint extension",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202085bcc59b03cbebad5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045d01d78ea54f33cc1e7c3dce82247468017e0e1bd9ce54e26ba79ea01fa8a020b89b00c106a41b8780083cc8ff74b8e37269a57c6eabf5337a728da0e4a51e0da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f7c908c51acee224aa8c90efacd490414c5b8ab5301f0603551d23041830168014947408f8cdb4f2161bca2ea9e0b6a9da95e9e484300a06082a8648ce3d0403020348003045022100ea2fbfe37c577938483417cc636ffd73d4e292f8cb1f5df66c4e70947a050be202200dc0801bf5adf5db38063073c1aa593f8dde8e1768f01aeae34a3c7be35049ea",
-    "pai_cert": "308201aa30820150a00302010202080fcefc1077989bb7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000441f41814bbc6d5e004397fb0b5a7d1a45d2035f64126dba0f756dfb03c57bc230713905d1a22afd89098f5d7b005531f5cd64bcb2fc26fa496cf6f08ac018807a3523050300e0603551d0f0101ff040403020106301d0603551d0e04160414947408f8cdb4f2161bca2ea9e0b6a9da95e9e484301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210091bbb5068a5d2568ed102b336fd1c30538cbd5156d8f0b88ef34ec5ba7ece2a30220158cac548e7844b29dedcc12d7a29bf600bdeaa33eeb96f3e6456cb1702e2470",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b527f4d1698836f14ef8ecae20a643375b642197bf8a6ff2651149e0ebfd9b66022100b9f1e4ab4a3d59f17fc3947eaa70e1dc4acf29cca4715ff5f6504342a522ad02",
-    "dac_private_key": "3bb12d95db97694ad4221b36845d4a4da69f4dc36f21f347b09d4e30f47679a3",
-    "dac_public_key": "045d01d78ea54f33cc1e7c3dce82247468017e0e1bd9ce54e26ba79ea01fa8a020b89b00c106a41b8780083cc8ff74b8e37269a57c6eabf5337a728da0e4a51e0d"
+    "dac_cert": "308201ce30820174a00302010202087ad62b72306c96b9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c7a3741f0af023a3eb364552cc16b3633f2b27f8ddd224aad9e8b9308f4216fc90f7d0ec0af850db936c19e363d033c5ade87c6d8c5d9fc5983d86f01c9ffe67a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414693f0a13b54495a8a2f668fa2775e6ee2f53266a301f0603551d230418301680147b0a00c60189441264e94b9a473049301200ea98300a06082a8648ce3d04030203480030450220422b0b365f5f893727a3ed71b2085299406444f35246a696cedc37678a0c22bd022100a0b67b0670aae4a08385268a743a73941403b88b7c99970b20bd41519c583b66",
+    "pai_cert": "308201aa30820150a00302010202082d41c9cdfc7382ee300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200046e2940dca41b8edcf359ba47a5dd28cc0125f6831c09c2cbc6f49c90dc3404a01a7ed0cbc60340532d022970c13d42244ea172e35dd88ccb0e7cbaa237cd8e54a3523050300e0603551d0f0101ff040403020106301d0603551d0e041604147b0a00c60189441264e94b9a473049301200ea98301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207c5eb799ab5ffd32af857674b0db22b55096f813ec9b2b3e7ff6b9bd31fa8ce4022100b7df7ab6907bcffeddc683f48183ef08287a1ae5b6bc6f53e63dbec2634d4293",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044830460221009da0f7f0329a4287636107a5eeafa3d92ec28176079b24c2a79e53c299a26776022100e1569a19519b6fb1f885236524cfa1fa18cfbd427f64d5c33af00c0b39badba7",
+    "dac_private_key": "2871a5ae3fa1f0d9cc7ee39a3316697293c522978d34725c0b9b7590de1cfd09",
+    "dac_public_key": "04c7a3741f0af023a3eb364552cc16b3633f2b27f8ddd224aad9e8b9308f4216fc90f7d0ec0af850db936c19e363d033c5ade87c6d8c5d9fc5983d86f01c9ffe67"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/cd.der
index 8016cfb7bd7512..2a2bfc7e70802c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.der
index 884b8c03214507..86c6b8f5bb1b29 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.pem
index 5e0936280de507..b3dada20f72ac0 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIIE87T7r1Bhp0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIGw77JAYtA1gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT7o6rYmlkehsGURjgyN+4h6eCNDW+D
-N9vdFYPtszQBXKEfuimlcvxWC/HJMnXPK/Ccf4wZUjWcqVMMuI1880JDo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUeWBrOG/Fzmox
-3mqvlCqKDO+6HeUwHwYDVR0jBBgwFoAUo1n1g1fHzDc7aKU/iiq7m8QviUEwCgYI
-KoZIzj0EAwIDSQAwRgIhAJITH7q0spz0PtDmj+ZNd5VrKp4NpdvwMGPGjJ8LGrDO
-AiEAmV9qYMsA8i/jNesvzrM9iBl3LLQiBNT7st+8OtBROTY=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARfIdGoQIWZhlC9S8bOWMJ9jRVSac3i
+0d/FwqGnRI1QboV+ONet099eWvuxPeI+zIbFbWTKX2I0VDbNpsYduc6Bo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUkNbhrUHICxJG
+Z7lozmVDA6djb1cwHwYDVR0jBBgwFoAUEM3o7jKy0Rj0nXxnqzCOUfwFg/QwCgYI
+KoZIzj0EAwIDSAAwRQIhAKHsKHrJ6upgyEmlR3AQS0ZXswTCWBiab2NNyL8dS1L7
+AiAObT8vvMf5BMq7g+9WBdDkLF4aPRX+1GLonSGdPL/SsQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.der
index 83ba60871de70b..7be56edc0c39cb 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.pem
index 80a5143f784a92..4fd4ac12d7297f 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIN0NjQ+lqAT4i/SzFYhpMPkfRYt3olg4X3/khROQi1Y1oAoGCCqGSM49
-AwEHoUQDQgAE+6Oq2JpZHobBlEY4MjfuIengjQ1vgzfb3RWD7bM0AVyhH7oppXL8
-VgvxyTJ1zyvwnH+MGVI1nKlTDLiNfPNCQw==
+MHcCAQEEIHFBHH9wg58HFDv4nI4DP+20Pb6ekpX+7M5O1vvwZgvzoAoGCCqGSM49
+AwEHoUQDQgAEXyHRqECFmYZQvUvGzljCfY0VUmnN4tHfxcKhp0SNUG6FfjjXrdPf
+Xlr7sT3iPsyGxW1kyl9iNFQ2zabGHbnOgQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.der
index 95bf7811ec38ba..3af7bf776f149f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.pem
index 79935fd9a6638b..d25256de3e18da 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIID5v84wYVAMMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIUsnHAo5bwxMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABFLwkBRiGLl56zj7bjkVNTLKADMtouNS5kIKli3ZV8UyUxyY1bMYhSAjYX+3
-rxkfj0knRp3y8xzKMUNfkLR9krGjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSjWfWDV8fMNztopT+KKrubxC+JQTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBn
-l65zTZ72EseoQ5Xm9+FlVapbbSEBkvys8TMnivKYXAIhAI8+8OgRulGG1Qp7qQMK
-3VGQ/iY3wH4pCjdh5QnXe2gL
+A0IABOJyYFUaYhsUyHzR0L7Ztnp5KPDzz05AEUA04idDJAuqMJrduNOSjjYDz8XP
+ak1VoQ072F1aESl2iZeasnFxQm+jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQQzejuMrLRGPSdfGerMI5R/AWD9DAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+nH/H1s6HAPgACexJr1Jl5mWVWfm7nC4xdl7czeNzj8QCICiuhMLHNID2VTjr374O
+xovKxGBfoz98SJDiwCKuinFg
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.der
index f770a9420b027b..1f8c22448db2af 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.pem
index c1e48c613972c3..03c2cc1dd2954d 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBP4UxtzAtK7s/yKzpOESJxMzX21INk9IzfJH9uc0YatoAoGCCqGSM49
-AwEHoUQDQgAEUvCQFGIYuXnrOPtuORU1MsoAMy2i41LmQgqWLdlXxTJTHJjVsxiF
-ICNhf7evGR+PSSdGnfLzHMoxQ1+QtH2SsQ==
+MHcCAQEEIMtgmzi8H4Xisq3Z/XQjrV5vGjxnMOMjWzcfKCLYKDb8oAoGCCqGSM49
+AwEHoUQDQgAE4nJgVRpiGxTIfNHQvtm2enko8PPPTkARQDTiJ0MkC6owmt2405KO
+NgPPxc9qTVWhDTvYXVoRKXaJl5qycXFCbw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/test_case_vector.json
index d34fe3a7dbda3c..626f1fb215c45f 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen0/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension PathLen field set to 0",
-    "is_success_case": "false",
-    "dac_cert": "308201cf30820174a003020102020813ced3eebd41869d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fba3aad89a591e86c19446383237ee21e9e08d0d6f8337dbdd1583edb334015ca11fba29a572fc560bf1c93275cf2bf09c7f8c1952359ca9530cb88d7cf34243a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041479606b386fc5ce6a31de6aaf942a8a0cefba1de5301f0603551d23041830168014a359f58357c7cc373b68a53f8a2abb9bc42f8941300a06082a8648ce3d040302034900304602210092131fbab4b29cf43ed0e68fe64d77956b2a9e0da5dbf03063c68c9f0b1ab0ce022100995f6a60cb00f22fe335eb2fceb33d8819772cb42204d4fbb2dfbc3ad0513936",
-    "pai_cert": "308201be30820164a00302010202080f9bfce3061500c3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000452f090146218b979eb38fb6e39153532ca00332da2e352e6420a962dd957c532531c98d5b318852023617fb7af191f8f4927469df2f31cca31435f90b47d92b1a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a359f58357c7cc373b68a53f8a2abb9bc42f8941301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502206797ae734d9ef612c7a84395e6f7e16555aa5b6d210192fcacf133278af2985c0221008f3ef0e811ba5186d50a7ba9030add5190fe2637c07e290a3761e509d77b680b",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022021196a35d5eb76cb150bb3f70663ded9bad9bcdd5848d20ee3b73d5031a4d9b3022100edfc04bfbfc9308e76339abe7736e1989b2402681a38d7d2801a721ac5156629",
-    "dac_private_key": "dd0d8d0fa5a804f88bf4b315886930f91f458b77a258385f7fe48513908b5635",
-    "dac_public_key": "04fba3aad89a591e86c19446383237ee21e9e08d0d6f8337dbdd1583edb334015ca11fba29a572fc560bf1c93275cf2bf09c7f8c1952359ca9530cb88d7cf34243"
+    "is_success_case": "true",
+    "dac_cert": "308201ce30820174a00302010202081b0efb24062d0358300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200045f21d1a84085998650bd4bc6ce58c27d8d155269cde2d1dfc5c2a1a7448d506e857e38d7add3df5e5afbb13de23ecc86c56d64ca5f62345436cda6c61db9ce81a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041490d6e1ad41c80b124667b968ce654303a7636f57301f0603551d2304183016801410cde8ee32b2d118f49d7c67ab308e51fc0583f4300a06082a8648ce3d0403020348003045022100a1ec287ac9eaea60c849a54770104b4657b304c258189a6f634dc8bf1d4b52fb02200e6d3f2fbcc7f904cabb83ef5605d0e42c5e1a3d15fed462e89d219d3cbfd2b1",
+    "pai_cert": "308201be30820164a003020102020852c9c7028e5bc313300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004e27260551a621b14c87cd1d0bed9b67a7928f0f3cf4e40114034e22743240baa309addb8d3928e3603cfc5cf6a4d55a10d3bd85d5a11297689979ab27171426fa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041410cde8ee32b2d118f49d7c67ab308e51fc0583f4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009c7fc7d6ce8700f80009ec49af5265e6659559f9bb9c2e31765edccde3738fc4022028ae84c2c73480f65538ebdfbe0ec68bcac4605fa33f7c4890e2c022ae8a7160",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220515f2129149d39d763f4741aac9cfd8d63f2854794e04d9910accc1a26905125022100affd2a0d45a97fda7507e93c3c0a61530e34ae2b58aa74393d79983025b3a5dd",
+    "dac_private_key": "71411c7f70839f07143bf89c8e033fedb43dbe9e9295feecce4ed6fbf0660bf3",
+    "dac_public_key": "045f21d1a84085998650bd4bc6ce58c27d8d155269cde2d1dfc5c2a1a7448d506e857e38d7add3df5e5afbb13de23ecc86c56d64ca5f62345436cda6c61db9ce81"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/cd.der
index c2d19e05abadb5..1a8c37cab1fec4 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.der
index 6cc32e5bf84b5f..d8c9e628a5fd9d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.pem
index 5d012c88f80d05..a82e28a72847e0 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIQ94ezKBuz7owCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIRd3DVetEywswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATOeerGnSKKK9gKaFTwwWb9oTlXENpk
-8zckRPmGf8uDQA34e2h4ko+pkjyuYGgTUbjKNmO1zrMQUKrpSEjshTYQo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUdcRCF3OJpCGI
-sJ3ESiRxddQc+IIwHwYDVR0jBBgwFoAU0bj1sSC1TYQMeRMB9qezc8mgnAswCgYI
-KoZIzj0EAwIDRwAwRAIgKJnHTBXQHqC/TR941xO40h7RM12VR3mFy/aBGd3iWMIC
-IDbIaRJuLPIhFtQ8ubmQHSOrrzx5EDQfimi3HiZmtqqy
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASXpyqTRg78OJvS3NmNQXtRaEswDmol
+V3MjULdTZEKuhKzTYe82nrGjwTYyy5y/LgUEKxkGsHbrNMt+xwDMxQ/Co2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUdGu09dZQf3JU
+knc/CH7JoSnLr24wHwYDVR0jBBgwFoAUNZLEUJet1n8TBUmVajKNRexl17MwCgYI
+KoZIzj0EAwIDSAAwRQIhAMMpFuG6h5SmdPhR72l5CXOiRhy4uENrn1lxs59ATl6o
+AiBCjwWe7jHcQHotyhajThUSQwwUT+LeD+vTSv7zbhAdhA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.der
index fd60d60addca87..89f5158b93a6bc 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.pem
index 7cb0ef0f3e13bf..b6601b685bea62 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIF19URBX3zQIrBdZrhxnTC5oKdP5E8Iz/hBvpwcoTOs1oAoGCCqGSM49
-AwEHoUQDQgAEznnqxp0iiivYCmhU8MFm/aE5VxDaZPM3JET5hn/Lg0AN+HtoeJKP
-qZI8rmBoE1G4yjZjtc6zEFCq6UhI7IU2EA==
+MHcCAQEEIF3ws2j7j2OBgd36AQ61q6zdh2vYQWu+5oyIvpqsmQcLoAoGCCqGSM49
+AwEHoUQDQgAEl6cqk0YO/Dib0tzZjUF7UWhLMA5qJVdzI1C3U2RCroSs02HvNp6x
+o8E2Msucvy4FBCsZBrB26zTLfscAzMUPwg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.der
index 9a7716ecd52973..2393f75db0c178 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.pem
index 0a80b6d9a65a18..3a5fa50da55e7d 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIJngdx/fnGaEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWSgAwIBAgIIHGhVuMADvB8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABD0Xv6bFdvRzHD1WE9gybQ/WvaE5+N3oWCUEFCscmNW1bLeJqR5l/3c9cUPu
-OfbV7xQul6KLwJJAcyRQZBs8K0qjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTRuPWxILVNhAx5EwH2p7NzyaCcCzAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBc
-tRMOIZlyWi5YjdE/keJDNl4qpouwFABhWTJ0jiZZ0wIgXG4UadFkPFNiKCGayZlw
-1eDX6nQnnpQUJcbCLrBEzvQ=
+A0IABMbl12bQJ2VYsGtnGQc5QtLE+Cu0vWizoq12lhDma8ZxC5gv/xJch9IwTT8i
+24dkv8fkU43YzEyqaMqDPWkGwLKjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQ1ksRQl63WfxMFSZVqMo1F7GXXszAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+oNgUj2tkzjkllNCwdA5BESGyCrKzIXGzeoh9S1jHM5YCIQCd/rVf0+2X4JuTiIM+
+ktdiitzaL5gEZs68IfFO9h1JRw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.der
index b8201abac38649..05117b21aaefb8 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.pem
index c06f22a23a68f1..264c396d7c79d2 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICzkD+kLllNSUQYc+iRa+zWw2DrpqW0ISFXIctbwqOcooAoGCCqGSM49
-AwEHoUQDQgAEPRe/psV29HMcPVYT2DJtD9a9oTn43ehYJQQUKxyY1bVst4mpHmX/
-dz1xQ+459tXvFC6XoovAkkBzJFBkGzwrSg==
+MHcCAQEEIMeMboHhJ4yNeGLJ8P8LVTK6U3asbX6IQWMicVQKuZYFoAoGCCqGSM49
+AwEHoUQDQgAExuXXZtAnZViwa2cZBzlC0sT4K7S9aLOirXaWEOZrxnELmC//ElyH
+0jBNPyLbh2S/x+RTjdjMTKpoyoM9aQbAsg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/test_case_vector.json
index fd73e026aac2a7..73b9d0f4485043 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension PathLen field set to 1",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820174a003020102020843de1ecca06ecfba300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ce79eac69d228a2bd80a6854f0c166fda1395710da64f3372444f9867fcb83400df87b6878928fa9923cae60681351b8ca3663b5ceb31050aae94848ec853610a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041475c442177389a42188b09dc44a247175d41cf882301f0603551d23041830168014d1b8f5b120b54d840c791301f6a7b373c9a09c0b300a06082a8648ce3d040302034700304402202899c74c15d01ea0bf4d1f78d713b8d21ed1335d95477985cbf68119dde258c2022036c869126e2cf22116d43cb9b9901d23abaf3c7910341f8a68b71e2666b6aab2",
-    "pai_cert": "308201bd30820164a003020102020826781dc7f7e719a1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200043d17bfa6c576f4731c3d5613d8326d0fd6bda139f8dde8582504142b1c98d5b56cb789a91e65ff773d7143ee39f6d5ef142e97a28bc09240732450641b3c2b4aa366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e04160414d1b8f5b120b54d840c791301f6a7b373c9a09c0b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402205cb5130e2199725a2e588dd13f91e243365e2aa68bb01400615932748e2659d302205c6e1469d1643c536228219ac99970d5e0d7ea74279e941425c6c22eb044cef4",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100cec5eed2434fd86ca1fb9c30815b79af49c6740a9e76a5f26268f83c73f816a40221008d3eb5d6c27153b0d1c9393e336088628e79a3bdf188c0314ab4165c024f8f90",
-    "dac_private_key": "5d7d511057df3408ac1759ae1c674c2e6829d3f913c233fe106fa707284ceb35",
-    "dac_public_key": "04ce79eac69d228a2bd80a6854f0c166fda1395710da64f3372444f9867fcb83400df87b6878928fa9923cae60681351b8ca3663b5ceb31050aae94848ec853610"
+    "dac_cert": "308201ce30820174a003020102020845ddc355eb44cb0b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000497a72a93460efc389bd2dcd98d417b51684b300e6a2557732350b7536442ae84acd361ef369eb1a3c13632cb9cbf2e05042b1906b076eb34cb7ec700ccc50fc2a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414746bb4f5d6507f725492773f087ec9a129cbaf6e301f0603551d230418301680143592c45097add67f130549956a328d45ec65d7b3300a06082a8648ce3d0403020348003045022100c32916e1ba8794a674f851ef69790973a2461cb8b8436b9f5971b39f404e5ea80220428f059eee31dc407a2dca16a34e1512430c144fe2de0febd34afef36e101d84",
+    "pai_cert": "308201bf30820164a00302010202081c6855b8c003bc1f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004c6e5d766d0276558b06b6719073942d2c4f82bb4bd68b3a2ad769610e66bc6710b982fff125c87d2304d3f22db8764bfc7e4538dd8cc4caa68ca833d6906c0b2a366306430120603551d130101ff040830060101ff020101300e0603551d0f0101ff040403020106301d0603551d0e041604143592c45097add67f130549956a328d45ec65d7b3301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a0d8148f6b64ce392594d0b0740e411121b20ab2b32171b37a887d4b58c733960221009dfeb55fd3ed97e09b9388833e92d7628adcda2f980466cebc21f14ef61d4947",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100dbe77876c0798d5b2dd778fb2836f60c02e433d8dac1e268c910a8b312eb7d9002203d73c8347b3afdf61324fec7d3757401086950c5b3e202c2893339708fb02f13",
+    "dac_private_key": "5df0b368fb8f638181ddfa010eb5abacdd876bd8416bbee68c88be9aac99070b",
+    "dac_public_key": "0497a72a93460efc389bd2dcd98d417b51684b300e6a2557732350b7536442ae84acd361ef369eb1a3c13632cb9cbf2e05042b1906b076eb34cb7ec700ccc50fc2"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/cd.der
index faa14b0514f108..b6a02cdbf5d5ed 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.der
index c6c613f770a8f3..5d43b5730285c3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.pem
index 03730369ca6826..7ccbba7d685a4c 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIIfG3PSXrUp5AwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIIU2MScUr5Yo0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAScQK+vNk3a9vS/l6oBY0Nv2oZ29PVI
-lvjkkz5Aa6fjhBFN3Due1hvHcLdT85kFve/Gf8t0CBSO4dEfGSEcLv+Lo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUWPUbc0CF8ugL
-8o0YXpvZWaIdIXowHwYDVR0jBBgwFoAUh6gjsu6cuZwBiMjEuuiJG/b1UUwwCgYI
-KoZIzj0EAwIDSQAwRgIhAISt06Ew8fbEh8OR1Z8zkt9bzMAN0qlFbNKKbMF/XJXX
-AiEAzdvw5Dc+ExGtyRrpZcujUAQKJM/QO+m2d9Sa0RIhAMg=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQooqtCu0mn1sj5vBKjm7ZTldj3VCsf
+wSCAXin8le7JKjIPg5WosANT0uaKhbw0+m7FJDmsecI37nDlN9lm6w9So2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUGT1eK3h+RUZo
+nze3YLA0wFoYKhQwHwYDVR0jBBgwFoAUZTAImEVfAOOaHN9BciweT6o1FIAwCgYI
+KoZIzj0EAwIDRwAwRAIgZrFGSqQocRPk0Jug9QkdH+pbG/fXjMQGxwNKFvXtDW4C
+IDbLzqdX23nusY9YEYxhSoKT4rw5ETu6Oxb+xiP0epMI
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.der
index 2af72dfaa4b664..5d7bb8f5f6b226 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.pem
index f19ad8a151cd9a..d95fdd0fb8b6dc 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIH/V9RrJGKo2o2j7NPYRphXAMbyXs+I2xPAwZh0DobTkoAoGCCqGSM49
-AwEHoUQDQgAEnECvrzZN2vb0v5eqAWNDb9qGdvT1SJb45JM+QGun44QRTdw7ntYb
-x3C3U/OZBb3vxn/LdAgUjuHRHxkhHC7/iw==
+MHcCAQEEINGF3OzmUUGaHWcK9OcMj+nxWN6oi5BU2fssJFZMPSB0oAoGCCqGSM49
+AwEHoUQDQgAEKKKrQrtJp9bI+bwSo5u2U5XY91QrH8EggF4p/JXuySoyD4OVqLAD
+U9LmioW8NPpuxSQ5rHnCN+5w5TfZZusPUg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.der
index c17b97ee0b9cd1..814e591289f227 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.pem
index 9faa5dd17e2d81..1af955e593ff89 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIdsMoPtX/9w4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWSgAwIBAgIICP7ebpz95p8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABPaemmcL9+U8mlSVPbnpsBbkRVyo6dGvMmaUfjSlXnD1ulkwxQGQVFMfSp6X
-LuUnMr4mWo80i1K2xjCJzpeM1i+jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQIwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSHqCOy7py5nAGIyMS66Ikb9vVRTDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiAb
-766EKsI2khkRRrpx7UC0PUWDOKqtglm9TpXsyFnTIAIhANOiKDcbSCzDsi4jxVuP
-UVdT4IBAkL6vy3bcHKNeklvY
+A0IABE1b6OWt64KngP5IQ/YWVr1m+Hl+TR0pua47XYWj/XY6dQZ3Q14LfH0bwx3l
+NIckt3fRGlBkGqfpOdqJcjpYp9ejZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQIwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlMAiYRV8A45oc30FyLB5PqjUUgDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+qYFV9U+UwSZC88wpQ97wdolsWcVqbvBbKwuqrIutUlUCIQDSJnXkfAlMIHKHB/M2
+MI4FBoQNgu+t78Jln6UN8OFMOw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.der
index 212c6b80732011..a99bf29cfa781b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.pem
index 03fb33662a7383..1d29a7fdcdab9e 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIL6s5SgeRMtiOY3MqwBe1e1j2M1u0I2m3IYxWftH/MbWoAoGCCqGSM49
-AwEHoUQDQgAE9p6aZwv35TyaVJU9uemwFuRFXKjp0a8yZpR+NKVecPW6WTDFAZBU
-Ux9Knpcu5ScyviZajzSLUrbGMInOl4zWLw==
+MHcCAQEEIEqQGjSIBfB5QZs/wqSsUM5++97nDq+fmmnF3Ku+b8yxoAoGCCqGSM49
+AwEHoUQDQgAETVvo5a3rgqeA/khD9hZWvWb4eX5NHSm5rjtdhaP9djp1BndDXgt8
+fRvDHeU0hyS3d9EaUGQap+k52olyOlin1w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/test_case_vector.json
index 99e2be6a85b650..2dc89941584741 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension PathLen field set to 2",
     "is_success_case": "false",
-    "dac_cert": "308201cf30820174a00302010202087c6dcf497ad4a790300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200049c40afaf364ddaf6f4bf97aa0163436fda8676f4f54896f8e4933e406ba7e384114ddc3b9ed61bc770b753f39905bdefc67fcb7408148ee1d11f19211c2eff8ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041458f51b734085f2e80bf28d185e9bd959a21d217a301f0603551d2304183016801487a823b2ee9cb99c0188c8c4bae8891bf6f5514c300a06082a8648ce3d040302034900304602210084add3a130f1f6c487c391d59f3392df5bccc00dd2a9456cd28a6cc17f5c95d7022100cddbf0e4373e1311adc91ae965cba350040a24cfd03be9b677d49ad1122100c8",
-    "pai_cert": "308201be30820164a003020102020876c3283ed5fff70e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f69e9a670bf7e53c9a54953db9e9b016e4455ca8e9d1af3266947e34a55e70f5ba5930c5019054531f4a9e972ee52732be265a8f348b52b6c63089ce978cd62fa366306430120603551d130101ff040830060101ff020102300e0603551d0f0101ff040403020106301d0603551d0e0416041487a823b2ee9cb99c0188c8c4bae8891bf6f5514c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502201befae842ac23692191146ba71ed40b43d458338aaad8259bd4e95ecc859d320022100d3a228371b482cc3b22e23c55b8f515753e0804090beafcb76dc1ca35e925bd8",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100df7cfa66bc487dd71b6fffc5c2276e564a90a9d93d90efbf9bbf1875efabb85c022100849c622af3f68637631448f93cf2621e83701357c98588b746c7f48677a6a8d6",
-    "dac_private_key": "7fd5f51ac918aa36a368fb34f611a615c031bc97b3e236c4f030661d03a1b4e4",
-    "dac_public_key": "049c40afaf364ddaf6f4bf97aa0163436fda8676f4f54896f8e4933e406ba7e384114ddc3b9ed61bc770b753f39905bdefc67fcb7408148ee1d11f19211c2eff8b"
+    "dac_cert": "308201cd30820174a0030201020208536312714af9628d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000428a2ab42bb49a7d6c8f9bc12a39bb65395d8f7542b1fc120805e29fc95eec92a320f8395a8b00353d2e68a85bc34fa6ec52439ac79c237ee70e537d966eb0f52a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414193d5e2b787e4546689f37b760b034c05a182a14301f0603551d2304183016801465300898455f00e39a1cdf41722c1e4faa351480300a06082a8648ce3d0403020347003044022066b1464aa4287113e4d09ba0f5091d1fea5b1bf7d78cc406c7034a16f5ed0d6e022036cbcea757db79eeb18f58118c614a8293e2bc39113bba3b16fec623f47a9308",
+    "pai_cert": "308201bf30820164a003020102020808fede6e9cfde69f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044d5be8e5adeb82a780fe4843f61656bd66f8797e4d1d29b9ae3b5d85a3fd763a750677435e0b7c7d1bc31de5348724b777d11a50641aa7e939da89723a58a7d7a366306430120603551d130101ff040830060101ff020102300e0603551d0f0101ff040403020106301d0603551d0e0416041465300898455f00e39a1cdf41722c1e4faa351480301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a98155f54f94c12642f3cc2943def076896c59c56a6ef05b2b0baaac8bad5255022100d22675e47c094c20728707f336308e0506840d82efadefc2659fa50df0e14c3b",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022043857ce28dc06fc4f47dec75539d0fb06db7a83b004c33fa15aaec319c893770022045919bcf544eb9f9f2fabdb2d531086ff8d5267b1f2973178285bfdd3a0a8ff3",
+    "dac_private_key": "d185dcece651419a1d670af4e70c8fe9f158dea88b9054d9fb2c24564c3d2074",
+    "dac_public_key": "0428a2ab42bb49a7d6c8f9bc12a39bb65395d8f7542b1fc120805e29fc95eec92a320f8395a8b00353d2e68a85bc34fa6ec52439ac79c237ee70e537d966eb0f52"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/cd.der
index ca98bdc52c0abd..468c3008c6066e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.der
index 6933bdd5c0073c..9cc83f33b86247 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.pem
index ab1889ceb41edd..d22686a6948792 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIIF3ABhg0fzoEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIIBTx1TJjgbXAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS5VjiaYP9O3r3V367zxG5h+EniXf4A
-ckAd0y7Xkt/qu5w9MQ8PubK7DfYmKw18XlIRlcGI+XeLJQ7l2Oa4mepYo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU0Qp/+39UWh3l
-beR2hK1L+WOGEFUwHwYDVR0jBBgwFoAUSka0yngGRYcCrZfYGsuRd/pHtm0wCgYI
-KoZIzj0EAwIDSQAwRgIhAMbVrF29QysBg8woejHZAyLvud4cmCP4S0PGBwl6A60l
-AiEAlfhYy9DHuZtdX0gu4TYeA91+Is64HyHBs2Ro7cf57DU=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT120eXKlD5QzMILyLetUQdnTtomift
+N/mRYTpOSXVYSi5jpu4KvOob5BZ1gaMlVwRM3XjpVTDDuRrY9iSd0QSJo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUtMGizqITQfbV
+43u9GOzMLFHOd5MwHwYDVR0jBBgwFoAUkzz+tgBSnbPasF/b2AfkdQiVXzwwCgYI
+KoZIzj0EAwIDRwAwRAIgbROqXuKBQj2YpgLLGYlTyFpJ6kr2ia4h8KRlAXV/7EgC
+IFX53qYI4m7qwMcuU1aFotE3+GtlLPtyLttTSikv2ZEq
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.der
index 25f4d7a1c6d455..32104b593b1122 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.pem
index f38c28a5128561..91e15764a53c05 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINnhowhk5o+71z5nmKIV05BiR/+QYr7Q1ddK5vqAUIHAoAoGCCqGSM49
-AwEHoUQDQgAEuVY4mmD/Tt691d+u88RuYfhJ4l3+AHJAHdMu15Lf6rucPTEPD7my
-uw32JisNfF5SEZXBiPl3iyUO5djmuJnqWA==
+MHcCAQEEIIWkoHq1HBvbfa+fgKiOhYhJ4kF1zKawSQJBw1fUONNfoAoGCCqGSM49
+AwEHoUQDQgAE9dtHlypQ+UMzCC8i3rVEHZ07aJon7Tf5kWE6Tkl1WEouY6buCrzq
+G+QWdYGjJVcETN146VUww7ka2PYkndEEiQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.der
index 859ad54d51b2d9..bfdb0facdda5b1 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.pem
index 34781615fe3cb5..d2065f8b3686d0 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuzCCAWGgAwIBAgIIYRWM8m/zuXcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBuzCCAWGgAwIBAgIIdFvqQn0uxbcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABPf6Xom3hXDktwJUvPX3MmiyLc053QnW/toY7L1JHO3rckSs5/q5E1T/YT8r
-JevpTL8947OebSST9swbY8QORXKjYzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBRKRrTKeAZFhwKtl9gay5F3+ke2bTAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBNNCgk
-WIHebvPAYrAeG7AEmDzMhnJblHhwPlcBaiy0OQIhAN+0TK/OCFT43KG1oshZ8KvL
-F97Fprn9yLB//iKSHb5+
+A0IABMp1LqdkwKdcVtMDVSPOSL7k2B+NR3grOSQTD7iPTG8ytUDRhvj5tHm8gDp1
+lZ9yg4Z5f3RdJcHK+2fE+g4FhgCjYzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBSTPP62AFKds9qwX9vYB+R1CJVfPDAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiA2R073
++YBzgcmNKlBM+NHzVXpqLG4XXkjS5VG8CBS5CAIhAK08CFVd6QXpTa/NidNra08K
+iXUS7b29TToc/2miQaCw
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.der
index 4f2c2e1b23a5c7..e66f381255ff95 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.pem
index 98e86610292599..9cf630279ece36 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPgrDi5y9QR1SEpLiGAzJGhObBa+E8rwhSRLAllPe4mDoAoGCCqGSM49
-AwEHoUQDQgAE9/peibeFcOS3AlS89fcyaLItzTndCdb+2hjsvUkc7etyRKzn+rkT
-VP9hPysl6+lMvz3js55tJJP2zBtjxA5Fcg==
+MHcCAQEEINytwt3FjYbGgxq/mblD8sqAzVH/USjwt8dA/HyfX8HOoAoGCCqGSM49
+AwEHoUQDQgAEynUup2TAp1xW0wNVI85IvuTYH41HeCs5JBMPuI9MbzK1QNGG+Pm0
+ebyAOnWVn3KDhnl/dF0lwcr7Z8T6DgWGAA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/test_case_vector.json
index eca1b09f6d8744..c8299dddcc0703 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Basic Constraint extension PathLen field presence is wrong (present for DAC not present for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201cf30820174a0030201020208177001860d1fce81300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b956389a60ff4edebdd5dfaef3c46e61f849e25dfe0072401dd32ed792dfeabb9c3d310f0fb9b2bb0df6262b0d7c5e521195c188f9778b250ee5d8e6b899ea58a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d10a7ffb7f545a1de56de47684ad4bf963861055301f0603551d230418301680144a46b4ca7806458702ad97d81acb9177fa47b66d300a06082a8648ce3d0403020349003046022100c6d5ac5dbd432b0183cc287a31d90322efb9de1c9823f84b43c607097a03ad2502210095f858cbd0c7b99b5d5f482ee1361e03dd7e22ceb81f21c1b36468edc7f9ec35",
-    "pai_cert": "308201bb30820161a003020102020861158cf26ff3b977300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f7fa5e89b78570e4b70254bcf5f73268b22dcd39dd09d6feda18ecbd491cedeb7244ace7fab91354ff613f2b25ebe94cbf3de3b39e6d2493f6cc1b63c40e4572a3633061300f0603551d130101ff040530030101ff300e0603551d0f0101ff040403020106301d0603551d0e041604144a46b4ca7806458702ad97d81acb9177fa47b66d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502204d3428245881de6ef3c062b01e1bb004983ccc86725b9478703e57016a2cb439022100dfb44cafce0854f8dca1b5a2c859f0abcb17dec5a6b9fdc8b07ffe22921dbe7e",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022062eeefc0052eaac009c76378e120731b3850f71c581c4b20ffdb5005975df9bb022050f1c6b7796e54b43897f3319e0a68cab1465d2f7d39f416717605ca0b746b98",
-    "dac_private_key": "d9e1a30864e68fbbd73e6798a215d3906247ff9062bed0d5d74ae6fa805081c0",
-    "dac_public_key": "04b956389a60ff4edebdd5dfaef3c46e61f849e25dfe0072401dd32ed792dfeabb9c3d310f0fb9b2bb0df6262b0d7c5e521195c188f9778b250ee5d8e6b899ea58"
+    "dac_cert": "308201cd30820174a0030201020208053c754c98e06d70300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004f5db47972a50f94333082f22deb5441d9d3b689a27ed37f991613a4e4975584a2e63a6ee0abcea1be4167581a32557044cdd78e95530c3b91ad8f6249dd10489a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b4c1a2cea21341f6d5e37bbd18eccc2c51ce7793301f0603551d23041830168014933cfeb600529db3dab05fdbd807e47508955f3c300a06082a8648ce3d040302034700304402206d13aa5ee281423d98a602cb198953c85a49ea4af689ae21f0a46501757fec48022055f9dea608e26eeac0c72e535685a2d137f86b652cfb722edb534a292fd9912a",
+    "pai_cert": "308201bb30820161a0030201020208745bea427d2ec5b7300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ca752ea764c0a75c56d3035523ce48bee4d81f8d47782b3924130fb88f4c6f32b540d186f8f9b479bc803a75959f728386797f745d25c1cafb67c4fa0e058600a3633061300f0603551d130101ff040530030101ff300e0603551d0f0101ff040403020106301d0603551d0e04160414933cfeb600529db3dab05fdbd807e47508955f3c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022036474ef7f9807381c98d2a504cf8d1f3557a6a2c6e175e48d2e551bc0814b908022100ad3c08555de905e94dafcd89d36b6b4f0a897512edbdbd4d3a1cff69a241a0b0",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022070452625af7b0288d6316771c93405847db0b1d5baeaeb3fba505c55cd0e5c44022100ec154c7011209cad3e0b2a3f3286bb0c748bb2393612248d01a09c6943e2f932",
+    "dac_private_key": "85a4a07ab51c1bdb7daf9f80a88e858849e24175cca6b0490241c357d438d35f",
+    "dac_public_key": "04f5db47972a50f94333082f22deb5441d9d3b689a27ed37f991613a4e4975584a2e63a6ee0abcea1be4167581a32557044cdd78e95530c3b91ad8f6249dd10489"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/cd.der
index 6b8cb835bd3017..db107a264027ea 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.der
index 2e599b966a00ec..62b9949991c1c9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.pem
index bce9eff3a6758b..a6824f5a469069 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIMbVSMboXncAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIIPFI8C1fv/bMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQP3x1Dx7VILdzr/kC1KL5JsVo0xULn
-syUNOLs4mi5rmrz5dtufQYx17c9pnDuHh5mfSAArAdzsWtB5Htx60pSvo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUcLuEVPQItmaR
-xGXKqUTpnbGBw4cwHwYDVR0jBBgwFoAUi/2TGAFILKPn9HM8wrKN6kW57kUwCgYI
-KoZIzj0EAwIDSAAwRQIgSBU2+ut78lVUDSlE1o9L5Pc9aO3AbYU34qKYuoMn5nkC
-IQDhnB6QSK8sMnhckTV9bkp7fuO0RSB6ivHLbVo/TxFIYA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQFXy+IVhiGEZml22l2THgRy/0DXb4c
+xpbgFL7BdBTpGCA+B2XtDSk6T7H94v+cWeMtgeUfSpzGfslBMETi+Deko2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUHt/4FI28ryzC
+W6Qvw8PLDj+/YSUwHwYDVR0jBBgwFoAUAUvAzcZl+ySGxmr1vkcoz2yQCmEwCgYI
+KoZIzj0EAwIDRwAwRAIgMBLuzmFen52vXV5/RaTAF8LURt7b4P2tcLG7wH77AlIC
+IBv8Ky28jFRDcD2tePcGL2ynpA+sUhCySXIQIi3fdKmU
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.der
index e4e77ad711151f..e00cc6f1d97131 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.pem
index bd05fb47fdb8ae..bb80cb12694615 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEhaDO3eM7QNJni9H3ve6ZEKhP29OHOG1oe/tjbwcw+soAoGCCqGSM49
-AwEHoUQDQgAED98dQ8e1SC3c6/5AtSi+SbFaNMVC57MlDTi7OJoua5q8+Xbbn0GM
-de3PaZw7h4eZn0gAKwHc7FrQeR7cetKUrw==
+MHcCAQEEIDLCU/5ykq1thXoNSIfxOF6j+W3scvwsVzI0TdR4eiewoAoGCCqGSM49
+AwEHoUQDQgAEBV8viFYYhhGZpdtpdkx4Ecv9A12+HMaW4BS+wXQU6RggPgdl7Q0p
+Ok+x/eL/nFnjLYHlH0qcxn7JQTBE4vg3pA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.der
index 903f20699e4c7c..62024b8ebf5c6b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.pem
index dce4328d720324..365b1cf86e53e5 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4jCCAYigAwIBAgIIWoFtVcSoPnkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB4TCCAYigAwIBAgIIYicfCrKPfwcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABP/9vIDATCtUjHG53A3h5bvr9aYue3JTkm8styENHEWjK267BKPYH8N5bASI
-5Zt/GYTdjbBEjlv6dxDZNLalKzmjgYkwgYYwEgYDVR0TAQH/BAgwBgEB/wIBADAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIv9kxgBSCyj5/RzPMKyjepFue5FMB8G
+A0IABL0iI9pNMGm2SIx81u5Z4Grw+6Tt1Wt9GB/zyDMSGzDUjQ8y25JZuYA3s1Js
+doTK/VE6FGop1Ne6rcV4L7R9x4WjgYkwgYYwEgYDVR0TAQH/BAgwBgEB/wIBADAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFAFLwM3GZfskhsZq9b5HKM9skAphMB8G
 A1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MCAGA1UdJQEB/wQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAKBggqhkjOPQQDAgNIADBFAiAn1jGiiSF0uXrMgdmU
-GjeLZeYBQuScvNA79GY2peKl+gIhAPeP/0kbKyj0Ku+Fxfmh7QWebvc+QDc6aD2P
-/cBueyev
+AQUFBwMCBggrBgEFBQcDATAKBggqhkjOPQQDAgNHADBEAiAEY2zktjK5izQx5XcV
+l56v/LE4yzq6xE/Sy+wPMMZP6QIgc4b1F3VSgnVEnwm0JZ6Clt2ChJe49Z5yAc7T
+IU7hJCc=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.der
index a18fae40a91f4e..836d44f5f560d9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.pem
index 7921a9db06903e..2ba5b2467f8ae4 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBSM2NxokMzXNud9AFI2gi8KcghiMdoJl20VaICExazCoAoGCCqGSM49
-AwEHoUQDQgAE//28gMBMK1SMcbncDeHlu+v1pi57clOSbyy3IQ0cRaMrbrsEo9gf
-w3lsBIjlm38ZhN2NsESOW/p3ENk0tqUrOQ==
+MHcCAQEEIC8+1fRxdlMnVctSePyI3oYq/XIS91D8jvGa8cN79hfvoAoGCCqGSM49
+AwEHoUQDQgAEvSIj2k0wabZIjHzW7lngavD7pO3Va30YH/PIMxIbMNSNDzLbklm5
+gDezUmx2hMr9UToUainU17qtxXgvtH3HhQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/test_case_vector.json
index 58d0480b98b097..be1806379c5af9 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_extended_key_usage_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate includes optional Extended Key Usage extension",
     "is_success_case": "true",
-    "dac_cert": "308201ce30820174a003020102020831b55231ba179dc0300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200040fdf1d43c7b5482ddcebfe40b528be49b15a34c542e7b3250d38bb389a2e6b9abcf976db9f418c75edcf699c3b8787999f48002b01dcec5ad0791edc7ad294afa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041470bb8454f408b66691c465caa944e99db181c387301f0603551d230418301680148bfd931801482ca3e7f4733cc2b28dea45b9ee45300a06082a8648ce3d04030203480030450220481536faeb7bf255540d2944d68f4be4f73d68edc06d8537e2a298ba8327e679022100e19c1e9048af2c32785c91357d6e4a7b7ee3b445207a8af1cb6d5a3f4f114860",
-    "pai_cert": "308201e230820188a00302010202085a816d55c4a83e79300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004fffdbc80c04c2b548c71b9dc0de1e5bbebf5a62e7b7253926f2cb7210d1c45a32b6ebb04a3d81fc3796c0488e59b7f1984dd8db0448e5bfa7710d934b6a52b39a3818930818630120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148bfd931801482ca3e7f4733cc2b28dea45b9ee45301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e30200603551d250101ff0416301406082b0601050507030206082b06010505070301300a06082a8648ce3d0403020348003045022027d631a2892174b97acc81d9941a378b65e60142e49cbcd03bf46636a5e2a5fa022100f78fff491b2b28f42aef85c5f9a1ed059e6ef73e40373a683d8ffdc06e7b27af",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210082b01366977ca3b9019828b79d85eb6e36bc99083458a047f8cc3b32adfaef1502210097606a7a45c9a1e730d5105b3f22f452298222bcc7ba9451fa0616df55d8b440",
-    "dac_private_key": "485a0cedde33b40d2678bd1f7bdee9910a84fdbd387386d687bfb636f0730fac",
-    "dac_public_key": "040fdf1d43c7b5482ddcebfe40b528be49b15a34c542e7b3250d38bb389a2e6b9abcf976db9f418c75edcf699c3b8787999f48002b01dcec5ad0791edc7ad294af"
+    "dac_cert": "308201cd30820174a00302010202083c523c0b57effdb3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004055f2f885618861199a5db69764c7811cbfd035dbe1cc696e014bec17414e918203e0765ed0d293a4fb1fde2ff9c59e32d81e51f4a9cc67ec9413044e2f837a4a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141edff8148dbcaf2cc25ba42fc3c3cb0e3fbf6125301f0603551d23041830168014014bc0cdc665fb2486c66af5be4728cf6c900a61300a06082a8648ce3d040302034700304402203012eece615e9f9daf5d5e7f45a4c017c2d446dedbe0fdad70b1bbc07efb025202201bfc2b2dbc8c5443703dad78f7062f6ca7a40fac5210b2497210222ddf74a994",
+    "pai_cert": "308201e130820188a003020102020862271f0ab28f7f07300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004bd2223da4d3069b6488c7cd6ee59e06af0fba4edd56b7d181ff3c833121b30d48d0f32db9259b98037b3526c7684cafd513a146a29d4d7baadc5782fb47dc785a3818930818630120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414014bc0cdc665fb2486c66af5be4728cf6c900a61301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e30200603551d250101ff0416301406082b0601050507030206082b06010505070301300a06082a8648ce3d0403020347003044022004636ce4b632b98b3431e57715979eaffcb138cb3abac44fd2cbec0f30c64fe902207386f51775528275449f09b4259e8296dd828497b8f59e7201ced3214ee12427",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c38a7f5dac777dfb5e8d557eb460d15ea2b681c1d167ae9ab96651e42f42f79f0220279eb7ba6f3dc379f37ac4b2f07cdfacf004c503a8a2c5d109f1cd239648ece4",
+    "dac_private_key": "32c253fe7292ad6d857a0d4887f1385ea3f96dec72fc2c5732344dd4787a27b0",
+    "dac_public_key": "04055f2f885618861199a5db69764c7811cbfd035dbe1cc696e014bec17414e918203e0765ed0d293a4fb1fde2ff9c59e32d81e51f4a9cc67ec9413044e2f837a4"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/cd.der
index e613ac8f41a798..58e4d88b46fa2c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.der
index 93418d01b37ae3..ed9a19724a23c3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.pem
index f3fc2c85818fd5..6ae2e6ca33012d 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIJRanq/81IK4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIIL/fdMdElafUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATF/A84wuV0s+uhDJrYFFt6rflC8uYS
-mHi7hW3mF5ZO7VTsnnEuFnn4JZAKB/oQ/eJWpZJ/dHw7uR+IGQsG0Gt8o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUgZcNFPr+Z8MQ
-0PyeqDtgN2KQN4UwHwYDVR0jBBgwFoAUVS7kAiwtI2cAjydYzc6DZ+18BmAwCgYI
-KoZIzj0EAwIDSAAwRQIgLczjuOk5W3+opVhv72nHhawxPAnTfx3x9wk49oe5rf0C
-IQCiY0bUEO+SjkwL8ED1ZkNCcBhNwYnXssHNSL+5Xho7JA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQFpTI6vNjttBrFpp/Gusq7g9wPdcW0
+O3RdU8e7+r6DngGdO8m+RNU2ApHNjoJs6WJgA8Mz/PyZzludSdq4f7eNo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUHJn9KQtXCXeK
+Fsw6aDUrHtxPhkQwHwYDVR0jBBgwFoAU5OdHp9D+UQWDHtB56CBZVnNGG9QwCgYI
+KoZIzj0EAwIDRwAwRAIgPh0H9sIBlpXG4etOOGVFYK0w+Cw49MjyMclb1pVT/NUC
+IFirqi56gjIrXYHxZ4bMkjez0QvdXWIaWyzn71/vLBKs
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.der
index f62f9d1d139b43..16418901b2dd16 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.pem
index 9e8391df915b7e..f4d57177ba7462 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIHn5AQP0brhHHGG8IIhpvq4xUTVsfjD+VDb5Rvis3lwoAoGCCqGSM49
-AwEHoUQDQgAExfwPOMLldLProQya2BRbeq35QvLmEph4u4Vt5heWTu1U7J5xLhZ5
-+CWQCgf6EP3iVqWSf3R8O7kfiBkLBtBrfA==
+MHcCAQEEIIQCyKfIN1T6LzZxm+VOUOW6c0xZ4C81ugbrMYp+1Sz9oAoGCCqGSM49
+AwEHoUQDQgAEBaUyOrzY7bQaxaafxrrKu4PcD3XFtDt0XVPHu/q+g54BnTvJvkTV
+NgKRzY6CbOliYAPDM/z8mc5bnUnauH+3jQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.der
index a97bcabe0f4ff7..e26b6b5d542123 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.pem
index 14730fbff610c2..2cc38358e0e0f9 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvDCCAWGgAwIBAgIIdpYE/j0z6eYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBujCCAWGgAwIBAgIIG/2voDsNggEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABBPs9YSyLgOJwZsp2kdE1def55ImSPp2oEZirXCezbFAvChkZQuRrAUNVVTP
-7ZQz4LrXKThBXKTXvDrnGpqUjSijYzBhMBIGA1UdEwEB/wQIMAYBAf8CAQAwCwYD
-VR0PBAQDAgEGMB0GA1UdDgQWBBRVLuQCLC0jZwCPJ1jNzoNn7XwGYDAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEAxz0q
-y34oXe/Q/e0k9J5QBHqeAx5CLIWxJQEKKeHTR6ICIQCW8H/thBChUWvsljkC6WKY
-nSCj0HarGkXPXdr6uJcBlQ==
+A0IABGReV8huzUNF+vRUjGGSpC7RhPvdWf83AKHdHdlxCaL+I4gGX8qjJ4/ZHPFp
+UcRbJtFmprN3tW4Jtdb/K61CHG2jYzBhMBIGA1UdEwEB/wQIMAYBAf8CAQAwCwYD
+VR0PBAQDAgEGMB0GA1UdDgQWBBTk50en0P5RBYMe0HnoIFlWc0Yb1DAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAfHKdw
+OK9Jbe252/yiS1SAnbD8uP4YQfi5AKNuYl0i4gIgV35vSIIUJno9O9uLP3bWk6Dh
+EQqpXrtMrXBHKKrbAi8=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.der
index 2705e6ca36b2e3..cf216f4355bec5 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.pem
index 01a0a60c558b90..999bc391db10ce 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFI0IvMeH2Gaf0N4Iz2wki2LPyJAwKGpL5H40JVmJ4/EoAoGCCqGSM49
-AwEHoUQDQgAEE+z1hLIuA4nBmynaR0TV15/nkiZI+nagRmKtcJ7NsUC8KGRlC5Gs
-BQ1VVM/tlDPgutcpOEFcpNe8OucampSNKA==
+MHcCAQEEIFiMBzxZiiny0sOORm4GewmwXB+fumbVcwy0DCBkn+oSoAoGCCqGSM49
+AwEHoUQDQgAEZF5XyG7NQ0X69FSMYZKkLtGE+91Z/zcAod0d2XEJov4jiAZfyqMn
+j9kc8WlRxFsm0Wams3e1bgm11v8rrUIcbQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/test_case_vector.json
index 782fd9125c3bed..26119dc176171a 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Key Usage extension critical field is missing",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202082516a7abff3520ae300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c5fc0f38c2e574b3eba10c9ad8145b7aadf942f2e6129878bb856de617964eed54ec9e712e1679f825900a07fa10fde256a5927f747c3bb91f88190b06d06b7ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041481970d14fafe67c310d0fc9ea83b603762903785301f0603551d23041830168014552ee4022c2d2367008f2758cdce8367ed7c0660300a06082a8648ce3d040302034800304502202dcce3b8e9395b7fa8a5586fef69c785ac313c09d37f1df1f70938f687b9adfd022100a26346d410ef928e4c0bf040f566434270184dc189d7b2c1cd48bfb95e1a3b24",
-    "pai_cert": "308201bc30820161a0030201020208769604fe3d33e9e6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000413ecf584b22e0389c19b29da4744d5d79fe7922648fa76a04662ad709ecdb140bc2864650b91ac050d5554cfed9433e0bad72938415ca4d7bc3ae71a9a948d28a363306130120603551d130101ff040830060101ff020100300b0603551d0f040403020106301d0603551d0e04160414552ee4022c2d2367008f2758cdce8367ed7c0660301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c73d2acb7e285defd0fded24f49e50047a9e031e422c85b125010a29e1d347a202210096f07fed8410a1516bec963902e962989d20a3d076ab1a45cf5ddafab8970195",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022061a20875d0800395dc9db0d170ab76698e81442b9759cb0096d43c87a2245c6702207c92c7e4dd0613e7322e9fb93a30e122a7c0e661387c27b22a9dfa348b1184eb",
-    "dac_private_key": "81e7e4040fd1bae11c7186f08221a6fab8c544d5b1f8c3f950dbe51be2b37970",
-    "dac_public_key": "04c5fc0f38c2e574b3eba10c9ad8145b7aadf942f2e6129878bb856de617964eed54ec9e712e1679f825900a07fa10fde256a5927f747c3bb91f88190b06d06b7c"
+    "dac_cert": "308201cd30820174a00302010202082ff7dd31d12569f5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000405a5323abcd8edb41ac5a69fc6bacabb83dc0f75c5b43b745d53c7bbfabe839e019d3bc9be44d5360291cd8e826ce9626003c333fcfc99ce5b9d49dab87fb78da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141c99fd290b5709778a16cc3a68352b1edc4f8644301f0603551d23041830168014e4e747a7d0fe5105831ed079e820595673461bd4300a06082a8648ce3d040302034700304402203e1d07f6c2019695c6e1eb4e38654560ad30f82c38f4c8f231c95bd69553fcd5022058abaa2e7a82322b5d81f16786cc9237b3d10bdd5d621a5b2ce7ef5fef2c12ac",
+    "pai_cert": "308201ba30820161a00302010202081bfdafa03b0d8201300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004645e57c86ecd4345faf4548c6192a42ed184fbdd59ff3700a1dd1dd97109a2fe2388065fcaa3278fd91cf16951c45b26d166a6b377b56e09b5d6ff2bad421c6da363306130120603551d130101ff040830060101ff020100300b0603551d0f040403020106301d0603551d0e04160414e4e747a7d0fe5105831ed079e820595673461bd4301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402201f1ca77038af496dedb9dbfca24b54809db0fcb8fe1841f8b900a36e625d22e20220577e6f488214267a3d3bdb8b3f76d693a0e1110aa95ebb4cad704728aadb022f",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c18d4416e5ce172103bd33a4282438c8fdcd40e965ee4c2d0602249c18f72f4a022100c705a866c0bfb10fe9cf89e0846b752f4b8447a110186ec311538258cb1d36b2",
+    "dac_private_key": "8402c8a7c83754fa2f36719be54e50e5ba734c59e02f35ba06eb318a7ed52cfd",
+    "dac_public_key": "0405a5323abcd8edb41ac5a69fc6bacabb83dc0f75c5b43b745d53c7bbfabe839e019d3bc9be44d5360291cd8e826ce9626003c333fcfc99ce5b9d49dab87fb78d"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/cd.der
index 60f17930e8fb9a..9c0b1fd515137a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.der
index 4405bc6d16e291..3e8e2c2373a72d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.pem
index effe30eade0034..1878da67106477 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIQodxwIjU78swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIOQ8YME6R8zkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS5UDxho3GJ39TboJnlDOu4eK14lXjg
-HTE7FdVJVwAHYFA7xOO3w/Sh4rutevPQKh4v1eQ+hSHO+bEzoxmH3BEYo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUR7GFM7PuSW1o
-dc8dlXSOcczqt4swHwYDVR0jBBgwFoAU0TmfUOrl4XT1k2zzxbukISubAygwCgYI
-KoZIzj0EAwIDSAAwRQIgAv+muzRN+UBm6TBaXgyW5YiDkIfxeL9L7lmidh8JZg8C
-IQDWXNLvNonl8kw5w89XkOwMnhSXPHro+AxulAl7aM98JQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARWpEM69GtR06kQnmtaHFm90T4ZtaPT
+EEeyXrO/XZY5IVKtoT8wAHGXcbfvmv/YXCZcfZAcEKrIiK9ye8JBJXVMo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUemB50XIAHb7M
+2xySCvAKzXbC1x4wHwYDVR0jBBgwFoAUADtrJejLCJj/AMrvh6Wm8PzG7g4wCgYI
+KoZIzj0EAwIDSAAwRQIgKXQt9r1jyU879JueuQfTZjS3mOq22gVFyZt64G3IA5AC
+IQCP0uSSWt5Wm1lDZc75cX0At/yNvvMvCRUAKZqA7cIfSg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.der
index 8260334bef68a8..4daa385d1b2dca 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.pem
index bde1daa8b4e010..546a550b3b4281 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICn0c5U0ttBu2buMJlPmAU2VcW12rDzvHLsxqOF/yBE/oAoGCCqGSM49
-AwEHoUQDQgAEuVA8YaNxid/U26CZ5QzruHiteJV44B0xOxXVSVcAB2BQO8Tjt8P0
-oeK7rXrz0CoeL9XkPoUhzvmxM6MZh9wRGA==
+MHcCAQEEIFka9TSvOUt9sp3FUlT4+QArR1xxSm/EzKFUk27thQKIoAoGCCqGSM49
+AwEHoUQDQgAEVqRDOvRrUdOpEJ5rWhxZvdE+GbWj0xBHsl6zv12WOSFSraE/MABx
+l3G375r/2FwmXH2QHBCqyIivcnvCQSV1TA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.der
index ba48cb838bb2af..aa1840afe31edc 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.pem
index da65b6c83d7c01..e9a3808cbf4635 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuzCCAWGgAwIBAgIIag4yIElCgWowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvDCCAWGgAwIBAgIIeRDiQA6rhyswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABEdJKK+5WgO9btr0ArJeu/aFyrz9hJQ1VH9XqIs3AxaYN/C8di2/yPAhXwOI
-HKapDMGDOIYe1kY74PRIyTx7XnKjYzBhMBIGA1UdEwEB/wQIMAYBAf8CAQAwCwYD
-VR0PBAQDAgEGMB0GA1UdDgQWBBTROZ9Q6uXhdPWTbPPFu6QhK5sDKDAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBGPZnX
-L4LBHiGf1VUEWFOCuycl/CoWGQjPoEhLOFojeQIhAIaSkeyLbbT2i4KwHsEoxIT9
-WBPRUKLkfqVpnl+WhUvG
+A0IABBfOAGmJeNNvOM2eNZbHZAsYqh/UxugGmGWlhOjx2hPnxQR8gx/8UX1Beoz4
+yAh6gniR6eloBlmsVqhU7jAPhCejYzBhMBIGA1UdEwEB/wQIMAYBAf8CAQAwCwYD
+VR0PBAQDAgEGMB0GA1UdDgQWBBQAO2sl6MsImP8Ayu+Hpabw/MbuDjAfBgNVHSME
+GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEAiVTo
+odXKVoi/ckur3BWmyaycVwxTwaHr/oqYPYsrKuICIQD/eCL5KzoUPwjC8nkSqEn8
+04eFT1iRrlqVMEbnrFveug==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.der
index bf66c327096a10..cdd7301b7a467c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.pem
index 4e38fe8e4626e8..1a9d411de52e6e 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJsGMcLP6x8CM/KCwo7iDvFxnr24i0fvS93CnJ1yTjkHoAoGCCqGSM49
-AwEHoUQDQgAER0kor7laA71u2vQCsl679oXKvP2ElDVUf1eoizcDFpg38Lx2Lb/I
-8CFfA4gcpqkMwYM4hh7WRjvg9EjJPHtecg==
+MHcCAQEEIFLYJtonM3Gdh3Ecgxg0NcSOF2sbrJHoMOwO+xwdEpwfoAoGCCqGSM49
+AwEHoUQDQgAEF84AaYl40284zZ41lsdkCxiqH9TG6AaYZaWE6PHaE+fFBHyDH/xR
+fUF6jPjICHqCeJHp6WgGWaxWqFTuMA+EJw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/test_case_vector.json
index f60c4a851d1a99..89ae327284be82 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate Key Usage extension critical field is set as 'non-critical'",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208428771c088d4efcb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004b9503c61a37189dfd4dba099e50cebb878ad789578e01d313b15d54957000760503bc4e3b7c3f4a1e2bbad7af3d02a1e2fd5e43e8521cef9b133a31987dc1118a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041447b18533b3ee496d6875cf1d95748e71cceab78b301f0603551d23041830168014d1399f50eae5e174f5936cf3c5bba4212b9b0328300a06082a8648ce3d0403020348003045022002ffa6bb344df94066e9305a5e0c96e588839087f178bf4bee59a2761f09660f022100d65cd2ef3689e5f24c39c3cf5790ec0c9e14973c7ae8f80c6e94097b68cf7c25",
-    "pai_cert": "308201bb30820161a00302010202086a0e32204942816a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004474928afb95a03bd6edaf402b25ebbf685cabcfd849435547f57a88b3703169837f0bc762dbfc8f0215f03881ca6a90cc18338861ed6463be0f448c93c7b5e72a363306130120603551d130101ff040830060101ff020100300b0603551d0f040403020106301d0603551d0e04160414d1399f50eae5e174f5936cf3c5bba4212b9b0328301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220463d99d72f82c11e219fd55504585382bb2725fc2a161908cfa0484b385a2379022100869291ec8b6db4f68b82b01ec128c484fd5813d150a2e47ea5699e5f96854bc6",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c60bfacb7c97ba58798e9411c3a1d88042a1d928bfb8472fdedbae32d426bd5a02206fe135521bdf12ae42e5d4b30d8612dfd4f418a90cbc7893c57dfb978e2d4726",
-    "dac_private_key": "29f4739534b6d06ed9bb8c2653e6014d95716d76ac3cef1cbb31a8e17fc8113f",
-    "dac_public_key": "04b9503c61a37189dfd4dba099e50cebb878ad789578e01d313b15d54957000760503bc4e3b7c3f4a1e2bbad7af3d02a1e2fd5e43e8521cef9b133a31987dc1118"
+    "dac_cert": "308201ce30820174a0030201020208390f18304e91f339300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000456a4433af46b51d3a9109e6b5a1c59bdd13e19b5a3d31047b25eb3bf5d96392152ada13f3000719771b7ef9affd85c265c7d901c10aac888af727bc24125754ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147a6079d172001dbeccdb1c920af00acd76c2d71e301f0603551d23041830168014003b6b25e8cb0898ff00caef87a5a6f0fcc6ee0e300a06082a8648ce3d0403020348003045022029742df6bd63c94f3bf49b9eb907d36634b798eab6da0545c99b7ae06dc803900221008fd2e4925ade569b594365cef9717d00b7fc8dbef32f091500299a80edc21f4a",
+    "pai_cert": "308201bc30820161a00302010202087910e2400eab872b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000417ce00698978d36f38cd9e3596c7640b18aa1fd4c6e8069865a584e8f1da13e7c5047c831ffc517d417a8cf8c8087a827891e9e9680659ac56a854ee300f8427a363306130120603551d130101ff040830060101ff020100300b0603551d0f040403020106301d0603551d0e04160414003b6b25e8cb0898ff00caef87a5a6f0fcc6ee0e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008954e8a1d5ca5688bf724babdc15a6c9ac9c570c53c1a1ebfe8a983d8b2b2ae2022100ff7822f92b3a143f08c2f27912a849fcd387854f5891ae5a953046e7ac5bdeba",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221008470dea64aae7eee67a213db62e7eab7a53af1fe0b1f8aa7ac137f102487cd0d02203e24b8cfd5abeacb19055071e01fc28b9de43567bcb300b070dc562ba0e77cd5",
+    "dac_private_key": "591af534af394b7db29dc55254f8f9002b475c714a6fc4cca154936eed850288",
+    "dac_public_key": "0456a4433af46b51d3a9109e6b5a1c59bdd13e19b5a3d31047b25eb3bf5d96392152ada13f3000719771b7ef9affd85c265c7d901c10aac888af727bc24125754c"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/cd.der
index f9c98dd9bcb54e..46f679c123ac92 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.der
index 134a348de77d6d..e389983bb50b39 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.pem
index 3fb0c233885eb8..e53aec980b9917 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIILsfAHcT0zdUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIAh8F2SCbXu0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQZIIc8ug4Vd+tCsxoJihH38bi6fqd7
-kyvH3R5EuMRYgK1QjZeuGSx/XOvU4HQIeIb2CWvW0uWXg2U/1fFULJmTo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUzGO9UvAveANs
-o7U5mvoylXnOlZwwHwYDVR0jBBgwFoAUpXlRiR3+Wgz+A45ciA3DStc87hUwCgYI
-KoZIzj0EAwIDSAAwRQIgSoljclNvGbJ39U8swL096Vl6zMrXaZmhtsq3dhLN6cMC
-IQC8t1JaOC+jYfFTF3OTiQdtZUS2noX1TsKYtzuQoV6DIw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATVTUR+gJbtxjGGeThXa0zefO2Io6IB
+p7VkW3Bv4UJwcb5Piiv+PlPiriW3VA0I1JGwXgxT7O9zE/0yeCiCt9Ico2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUmdJ+VbXMkg/q
+ogYvvFsEWs/ofjIwHwYDVR0jBBgwFoAU3ohMFMbyv7iRESDxlRMNEYH032swCgYI
+KoZIzj0EAwIDSAAwRQIhAMmoZQnJQw7ELppHg0URhPKDxIXX668IKYZfRzyl3rmV
+AiB83l8lkbgPCtCyfS8byw4nsbTlWp1QNP9goriR4rgLog==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.der
index b39b355cc1d320..4d1c972db140d7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.pem
index 82de311f3d1a34..99a48aa71703fc 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEII09H28212MbWS0k+8Bkkq2eNX4V7JKqGiotnLLauuTqoAoGCCqGSM49
-AwEHoUQDQgAEGSCHPLoOFXfrQrMaCYoR9/G4un6ne5Mrx90eRLjEWICtUI2Xrhks
-f1zr1OB0CHiG9glr1tLll4NlP9XxVCyZkw==
+MHcCAQEEIEOIjSQoYpyMLRBpEtLecy6PVX2AmFkBD2Dm+UP0MmVPoAoGCCqGSM49
+AwEHoUQDQgAE1U1EfoCW7cYxhnk4V2tM3nztiKOiAae1ZFtwb+FCcHG+T4or/j5T
+4q4lt1QNCNSRsF4MU+zvcxP9MngogrfSHA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.der
index 71b63f83e3a11b..f81d6937111d5f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.pem
index 3606d3fac3d72f..6b61bb54506ac1 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIfzLYjYezNC4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIV8OVnnfHHjcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABIVC97+b0l02fdXHSSZDr9hyHMNVrEvPtgeSmR9AsNh0kvjy4W0USm3SUraA
-G0Rs6u3qz9B+wObtKB8/Mm9vSnyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgIEMB0GA1UdDgQWBBSleVGJHf5aDP4DjlyIDcNK1zzuFTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBN
-6Px3AgxeEopG3hD7SnsxhO2jwEK5upBCBzB3DBPAswIgH9J0RXFpW8bD7NScPr3c
-2zRz8KaPlGRV53+JuZAD6j4=
+A0IABMewoqIbXLiosEx/B05Eqw0YO1BiO8xKfVjH2cMKTmvdS34D5Pa43WZMmRiU
+xvgF18tiHmpJ0MGkWVUMxTD8GkijZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgIEMB0GA1UdDgQWBBTeiEwUxvK/uJERIPGVEw0RgfTfazAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+nZ4oLwVCDVxOub0X1T4d/7xIXmId9mi5b56lc2khug8CID1ooUExJofv8CtY/tVM
+r5bmEXSBdE/UpyVPp6y9D2bC
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.der
index 9228a7fe4144c4..00dae5fd335c03 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.pem
index 9dce1f7eb18091..0c08d9c94655c8 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPSNsUL+pnUKVhxFqapC1xnfQuCD5bRCuyxOQR92kGRKoAoGCCqGSM49
-AwEHoUQDQgAEhUL3v5vSXTZ91cdJJkOv2HIcw1WsS8+2B5KZH0Cw2HSS+PLhbRRK
-bdJStoAbRGzq7erP0H7A5u0oHz8yb29KfA==
+MHcCAQEEIE+5YNCDh9j0/XsLyVs3uPM5mBA3i75Y7rg08uiVp9+LoAoGCCqGSM49
+AwEHoUQDQgAEx7CiohtcuKiwTH8HTkSrDRg7UGI7zEp9WMfZwwpOa91LfgPk9rjd
+ZkyZGJTG+AXXy2IeaknQwaRZVQzFMPwaSA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/test_case_vector.json
index 30eabc2678df81..b54cfde97e335a 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
-    "description": "PAI Test Vector: Certificate Key Usage extension cRLSign field is wrong (present for DAC and not present for PAI",
+    "description": "PAI Test Vector: Certificate Key Usage extension cRLSign field is wrong (present for DAC and not present for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202082ec7c01dc4f4cdd5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200041920873cba0e1577eb42b31a098a11f7f1b8ba7ea77b932bc7dd1e44b8c45880ad508d97ae192c7f5cebd4e074087886f6096bd6d2e59783653fd5f1542c9993a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cc63bd52f02f78036ca3b5399afa329579ce959c301f0603551d23041830168014a57951891dfe5a0cfe038e5c880dc34ad73cee15300a06082a8648ce3d040302034800304502204a896372536f19b277f54f2cc0bd3de9597acccad76999a1b6cab77612cde9c3022100bcb7525a382fa361f15317739389076d6544b69e85f54ec298b73b90a15e8323",
-    "pai_cert": "308201bd30820164a00302010202087f32d88d87b3342e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200048542f7bf9bd25d367dd5c7492643afd8721cc355ac4bcfb60792991f40b0d87492f8f2e16d144a6dd252b6801b446ceaedeacfd07ec0e6ed281f3f326f6f4a7ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020204301d0603551d0e04160414a57951891dfe5a0cfe038e5c880dc34ad73cee15301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402204de8fc77020c5e128a46de10fb4a7b3184eda3c042b9ba90420730770c13c0b302201fd2744571695bc6c3ecd49c3ebddcdb3473f0a68f946455e77f89b99003ea3e",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100b984babf7270c09fd8d23545e2fdf68b5382603c8c83384b8a19c00a3d9602d50220398268186ec2d37d710fe2cbc5494129824eba95cb42660cbac3c43cd61ff249",
-    "dac_private_key": "8d3d1f6f36d7631b592d24fbc06492ad9e357e15ec92aa1a2a2d9cb2dabae4ea",
-    "dac_public_key": "041920873cba0e1577eb42b31a098a11f7f1b8ba7ea77b932bc7dd1e44b8c45880ad508d97ae192c7f5cebd4e074087886f6096bd6d2e59783653fd5f1542c9993"
+    "dac_cert": "308201ce30820174a0030201020208021f05d9209b5eed300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d54d447e8096edc631867938576b4cde7ced88a3a201a7b5645b706fe1427071be4f8a2bfe3e53e2ae25b7540d08d491b05e0c53ecef7313fd32782882b7d21ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041499d27e55b5cc920feaa2062fbc5b045acfe87e32301f0603551d23041830168014de884c14c6f2bfb8911120f195130d1181f4df6b300a06082a8648ce3d0403020348003045022100c9a86509c9430ec42e9a4783451184f283c485d7ebaf0829865f473ca5deb99502207cde5f2591b80f0ad0b27d2f1bcb0e27b1b4e55a9d5034ff60a2b891e2b80ba2",
+    "pai_cert": "308201be30820164a003020102020857c3959e77c71e37300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004c7b0a2a21b5cb8a8b04c7f074e44ab0d183b50623bcc4a7d58c7d9c30a4e6bdd4b7e03e4f6b8dd664c991894c6f805d7cb621e6a49d0c1a459550cc530fc1a48a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020204301d0603551d0e04160414de884c14c6f2bfb8911120f195130d1181f4df6b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009d9e282f05420d5c4eb9bd17d53e1dffbc485e621df668b96f9ea5736921ba0f02203d68a141312687eff02b58fed54caf96e6117481744fd4a7254fa7acbd0f66c2",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402203a79f41c3abfc33d4a7341fd9613a1485015b659ebbb75dfc6ee9faafa8b3eb7022066cd96103af8fe1e9fb14471997ecef5aabae69e44eb0714a0417b29d7198e10",
+    "dac_private_key": "43888d2428629c8c2d106912d2de732e8f557d809859010f60e6f943f432654f",
+    "dac_public_key": "04d54d447e8096edc631867938576b4cde7ced88a3a201a7b5645b706fe1427071be4f8a2bfe3e53e2ae25b7540d08d491b05e0c53ecef7313fd32782882b7d21c"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/cd.der
index bdb7693ef88637..98819fde642be2 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.der
index e136af68e92afb..02d44056ca4b6a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.pem
index d2d50938607c1f..8dca33f891f120 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIIcxRM4XT7h+swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIVoKIy0sxnuIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASLaySlE82rpCe6x0WfCzKzk9hqX+JB
-WN9mMpVjXioOc13S4AS6rQQPZUjl7u3PiOdFnMRd5HT8O9q8OjU7yzpvo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUF48CUt8XX+Ro
-b9ySnutvIZtqygAwHwYDVR0jBBgwFoAUJUK9Et6QaSQiSGFeyAFXVhNVpUkwCgYI
-KoZIzj0EAwIDSQAwRgIhAL9jBmhOkJocROwq/sjZ+KyhSpDqUbFUmy2PPsTeo49b
-AiEAt9BaILFCtMNPS9bwF+t7kARs34dKp6+U/UGEMuoCJgI=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASR1seIjPiP6TBJNAmlnpv/y32m3+ii
+T+9DZjaBccQH1KssrcKk067fePhgNLUQZEeV6NYFA/M5MCQQLvG7NEXWo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUzkkWo/t8yjAO
+2bJ7z6bFKzKs4O4wHwYDVR0jBBgwFoAUZQHV+bdgdGxCH/oD9A7hIz2HutMwCgYI
+KoZIzj0EAwIDSAAwRQIgJzZJv7G3THSlg/GLQ9wOmYyBh7CGLU2Lfs1KONdtsakC
+IQCfjyYxLvIfFSWrOxhywmAay3NUO5ero5URHEYEs4jRpA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.der
index 3b1042d6d9ec54..bbbcc8eec9efd4 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.pem
index 3a139e3a906e4b..6719a218c37803 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJr05hcHfbCjpAwLnJWgg5d04AC2jEz/c2/uoQld7h8RoAoGCCqGSM49
-AwEHoUQDQgAEi2skpRPNq6QnusdFnwsys5PYal/iQVjfZjKVY14qDnNd0uAEuq0E
-D2VI5e7tz4jnRZzEXeR0/DvavDo1O8s6bw==
+MHcCAQEEIAlRdANdJ0WPnww3JlFmIoW/1cs3Nbb5JMw9+ngCHdU7oAoGCCqGSM49
+AwEHoUQDQgAEkdbHiIz4j+kwSTQJpZ6b/8t9pt/ook/vQ2Y2gXHEB9SrLK3CpNOu
+33j4YDS1EGRHlejWBQPzOTAkEC7xuzRF1g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.der
index 4e17a61f4eb79a..7704a3ab673bdf 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.pem
index 66e4add5539d8e..890bde7684f3f9 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIPuy5Qg96KyswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWSgAwIBAgIIUGcDL5xgEdwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABE9s5W13BR4Jh2MAfQAvlj29pK6btfNbH/90sJMyypMJLt9pv72Q3SMmPE9i
-En22krmBZZUO6YgH/eworRn3NxyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgGGMB0GA1UdDgQWBBQlQr0S3pBpJCJIYV7IAVdWE1WlSTAfBgNV
+A0IABAfgNQhYZf8owDk0RU6qItwcTzbAhE8dfH/6rqz7oOd376Y1R/WaQ4REiEFH
+bZlV+UM3L0OqfUmMEo2sCzrFs2KjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgGGMB0GA1UdDgQWBBRlAdX5t2B0bEIf+gP0DuEjPYe60zAfBgNV
 HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-1jQTLJnT87QF90meAcRyuts5N5BdHKmwxos3dDzaULACIQD6ii3j+olbfKnfsOG2
-wQE0KsnHh9d4zV2Sm/VlFP5Jag==
+xMwHu3xF1wVAb/bTt+6FjOw0gi2X3teFkzh71wig8hkCIQC1oBDStWldzuLOT08/
+5/sHZWcbTCmlVvx3NXUALFxCNQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.der
index e962c261d6869a..08486cd873a497 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.pem
index bb12bcf2899dbf..d33d6bb49292ab 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIAjHj0gBLMfaXun745thNpmdpVBFk+hC3iuZfm6EVC66oAoGCCqGSM49
-AwEHoUQDQgAET2zlbXcFHgmHYwB9AC+WPb2krpu181sf/3SwkzLKkwku32m/vZDd
-IyY8T2ISfbaSuYFllQ7piAf97CitGfc3HA==
+MHcCAQEEID/OxeHLygFHFJcH66HinH0+VHlhPk2/mn930898YUm7oAoGCCqGSM49
+AwEHoUQDQgAEB+A1CFhl/yjAOTRFTqoi3BxPNsCETx18f/qurPug53fvpjVH9ZpD
+hESIQUdtmVX5QzcvQ6p9SYwSjawLOsWzYg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json
index 9fbcf3d68bd6ff..e922c6bdd8adb3 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
-    "description": "PAI Test Vector: Certificate Key Usage extension diginalSignature field is wrong (not present for DAC and present for PAI",
-    "is_success_case": "false",
-    "dac_cert": "308201cf30820174a003020102020873144ce174fb87eb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048b6b24a513cdaba427bac7459f0b32b393d86a5fe24158df663295635e2a0e735dd2e004baad040f6548e5eeedcf88e7459cc45de474fc3bdabc3a353bcb3a6fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414178f0252df175fe4686fdc929eeb6f219b6aca00301f0603551d230418301680142542bd12de9069242248615ec80157561355a549300a06082a8648ce3d0403020349003046022100bf6306684e909a1c44ec2afec8d9f8aca14a90ea51b1549b2d8f3ec4dea38f5b022100b7d05a20b142b4c34f4bd6f017eb7b90046cdf874aa7af94fd418432ea022602",
-    "pai_cert": "308201bf30820164a00302010202083eecb9420f7a2b2b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044f6ce56d77051e098763007d002f963dbda4ae9bb5f35b1fff74b09332ca93092edf69bfbd90dd23263c4f62127db692b98165950ee98807fdec28ad19f7371ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020186301d0603551d0e041604142542bd12de9069242248615ec80157561355a549301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100d634132c99d3f3b405f7499e01c472badb3937905d1ca9b0c68b37743cda50b0022100fa8a2de3fa895b7ca9dfb0e1b6c101342ac9c787d778cd5d929bf56514fe496a",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201e4b40da42e15f1d09444591062655fbfc5cfdc6a6a7194ccf186adfde694139022100d541425c3055fc945dc854c0bbd0a8a5f35658388061e6ebccfb85c2caad9d77",
-    "dac_private_key": "9af4e617077db0a3a40c0b9c95a0839774e000b68c4cff736feea1095dee1f11",
-    "dac_public_key": "048b6b24a513cdaba427bac7459f0b32b393d86a5fe24158df663295635e2a0e735dd2e004baad040f6548e5eeedcf88e7459cc45de474fc3bdabc3a353bcb3a6f"
+    "description": "PAI Test Vector: Certificate Key Usage extension diginalSignature field is wrong (not present for DAC and present for PAI, which is OK as optional)",
+    "is_success_case": "true",
+    "dac_cert": "308201ce30820174a0030201020208568288cb4b319ee2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000491d6c7888cf88fe930493409a59e9bffcb7da6dfe8a24fef4366368171c407d4ab2cadc2a4d3aedf78f86034b510644795e8d60503f3393024102ef1bb3445d6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ce4916a3fb7cca300ed9b27bcfa6c52b32ace0ee301f0603551d230418301680146501d5f9b760746c421ffa03f40ee1233d87bad3300a06082a8648ce3d04030203480030450220273649bfb1b74c74a583f18b43dc0e998c8187b0862d4d8b7ecd4a38d76db1a90221009f8f26312ef21f1525ab3b1872c2601acb73543b97aba395111c4604b388d1a4",
+    "pai_cert": "308201bf30820164a00302010202085067032f9c6011dc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000407e035085865ff28c03934454eaa22dc1c4f36c0844f1d7c7ffaaeacfba0e777efa63547f59a4384448841476d9955f943372f43aa7d498c128dac0b3ac5b362a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020186301d0603551d0e041604146501d5f9b760746c421ffa03f40ee1233d87bad3301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c4cc07bb7c45d705406ff6d3b7ee858cec34822d97ded78593387bd708a0f219022100b5a010d2b5695dcee2ce4f4f3fe7fb0765671b4c29a556fc773575002c5c4235",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402203b8a87ccaf348a4a13a6ce23504c741ec4a8a56c63c5c02601e7aff8b7adc86602201f3848c9ee0a4141091184dd7bbe75fd44264447d7d75c69bc80432850778dc1",
+    "dac_private_key": "095174035d27458f9f0c372651662285bfd5cb3735b6f924cc3dfa78021dd53b",
+    "dac_public_key": "0491d6c7888cf88fe930493409a59e9bffcb7da6dfe8a24fef4366368171c407d4ab2cadc2a4d3aedf78f86034b510644795e8d60503f3393024102ef1bb3445d6"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/cd.der
index 2d95d4cbcd21f1..fee076bdc758d0 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.der
index fcf4d03e5839dd..bd7de67929869b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
index ee171d12923d95..d6f00d1e45d125 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzzCCAXSgAwIBAgIIesO/rvsuOL8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIeSSISjj0pfkwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARhoRCaH4tGBbFsg54tJ6EkgrWb+HHi
-Wdyq0TEsGCB1IiZJpIMevBQjovWiINJMfrSlutw7AKdT9bcTnSMm+jaUo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUT0oJ2LLw1ocQ
-fFjq0lFt7EBMHJkwHwYDVR0jBBgwFoAU20xQ51WsGDQUxULB/YuA9PqzeOwwCgYI
-KoZIzj0EAwIDSQAwRgIhAKW1walDyJ1IJybX4OmP/GxjuR75VicilaKjucK+aqa/
-AiEA0oPdmVqHYsLtKFIEuoWAWWdv1EuQGdyCNapsx1C3CZg=
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ/9a8yFXWEgs0+d+7GjHYxFJOqabyR
+Nd/7FCyn9P6UP1pUmM4TXH/yYK+b706VqD/CC3J2yQM5mfOqLPdE/8eUo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUXS5gg38YJk+1
+U+WMITKJaXI8VvYwHwYDVR0jBBgwFoAUNKOjoSzg6qrKiEpOAitK3FFHUQwwCgYI
+KoZIzj0EAwIDSAAwRQIgIN3vsMRFgydqNox01hsgYfbAXvu5boNwDBXgOv42Yv0C
+IQDv2Wq3lywIcjC7K26/naaeKr5pvW3a9otKnWTehHFj7g==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.der
index a238ec0bd4977d..dc911b36babbfe 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
index ca6bd802a9cd7c..ee02485554a4ed 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIytWdF2N7GteQbNBJSIqFt120VdSjmcPJc1ebwupQjCoAoGCCqGSM49
-AwEHoUQDQgAEYaEQmh+LRgWxbIOeLSehJIK1m/hx4lncqtExLBggdSImSaSDHrwU
-I6L1oiDSTH60pbrcOwCnU/W3E50jJvo2lA==
+MHcCAQEEIK5AxWWeKJhjVVJwWyI0pTwX/JuvO41uRzgEoHVDS1iEoAoGCCqGSM49
+AwEHoUQDQgAEP/WvMhV1hILNPnfuxox2MRSTqmm8kTXf+xQsp/T+lD9aVJjOE1x/
+8mCvm+9Olag/wgtydskDOZnzqiz3RP/HlA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.der
index 1e7913677ad007..12231bb3d869bb 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
index 66aae1e847dba0..6d7521082e08fc 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIDO7Z4KdOQxowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvTCCAWSgAwIBAgIIRbtg7LtY/wAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCvont5u9hJT+iAF9TQ2Lz+XOmr33kp9ILkH/jTajxABUzutK8xD/e9Hbbgn
-1qhZXNwR8mHJyq55l57imQ8xb9ujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgECMB0GA1UdDgQWBBTbTFDnVawYNBTFQsH9i4D0+rN47DAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiB3
-D7sLR0uSAXYU9nJRCWFKGPomejhdJgp4dE/Z3Sy/tQIhAIFmbQ425BOGV63gICr9
-ywoYC8z9hs+LkM0l0b2/FXCO
+A0IABKkxUdqnhWIPawQEVDiQAwOmmH5sKmfMEhb8N92ExiucbkKQhNbF8kR4uReB
+PL2SCHwyEM6xb9H8GriM8DsqC82jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgECMB0GA1UdDgQWBBQ0o6OhLODqqsqISk4CK0rcUUdRDDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiA9
+LQoHivzbLPST2eeIsNXuyBhn9yeLT29KZnpKwxVaXAIgRS6dheoOa+FZiWYqt90A
+zEnoxyUGSPt0tMhB8/3vUss=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.der
index d0d3fe126b8d6e..c149504d8e0aa8 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
index 5985b2076fc88c..aee63a4802deb8 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIN2I6PZtl9CC0hiFBaGY31Nu8Ds1UO5fnQL9BGlZMn7BoAoGCCqGSM49
-AwEHoUQDQgAEK+ie3m72ElP6IAX1NDYvP5c6avfeSn0guQf+NNqPEAFTO60rzEP9
-70dtuCfWqFlc3BHyYcnKrnmXnuKZDzFv2w==
+MHcCAQEEIB/Unk1mzB237B3OS1iVrLDa05aCnFJgkGbwoorulk2RoAoGCCqGSM49
+AwEHoUQDQgAEqTFR2qeFYg9rBARUOJADA6aYfmwqZ8wSFvw33YTGK5xuQpCE1sXy
+RHi5F4E8vZIIfDIQzrFv0fwauIzwOyoLzQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
index 3b3b18d1dc95a0..84edfb431b15cf 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/test_case_vector.json
@@ -1,9 +1,9 @@
 {
-    "description": "PAI Test Vector: Certificate Key Usage extension keyCertSign field is wrong (present for DAC and not present for PAI",
+    "description": "PAI Test Vector: Certificate Key Usage extension keyCertSign field is wrong (present for DAC and not present for PAI)",
     "is_success_case": "false",
-    "dac_cert": "308201cf30820174a00302010202087ac3bfaefb2e38bf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000461a1109a1f8b4605b16c839e2d27a12482b59bf871e259dcaad1312c182075222649a4831ebc1423a2f5a220d24c7eb4a5badc3b00a753f5b7139d2326fa3694a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144f4a09d8b2f0d687107c58ead2516dec404c1c99301f0603551d23041830168014db4c50e755ac183414c542c1fd8b80f4fab378ec300a06082a8648ce3d0403020349003046022100a5b5c1a943c89d482726d7e0e98ffc6c63b91ef956272295a2a3b9c2be6aa6bf022100d283dd995a8762c2ed285204ba858059676fd44b9019dc8235aa6cc750b70998",
-    "pai_cert": "308201be30820164a00302010202080ceed9e0a74e431a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200042be89ede6ef61253fa2005f534362f3f973a6af7de4a7d20b907fe34da8f1001533bad2bcc43fdef476db827d6a8595cdc11f261c9caae79979ee2990f316fdba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020102301d0603551d0e04160414db4c50e755ac183414c542c1fd8b80f4fab378ec301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220770fbb0b474b92017614f6725109614a18fa267a385d260a78744fd9dd2cbfb502210081666d0e36e4138657ade0202afdcb0a180bccfd86cf8b90cd25d1bdbf15708e",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203ac695f6e79c03428b7006d9991a98c63741e7891f49793d4c614003716726d50221009588c8e361ccad48b0b7e109c9ae098b7ab0ed78f2c154276251471d5ced4ec9",
-    "dac_private_key": "8cad59d17637b1ad7906cd049488a85b75db455d4a399c3c973579bc2ea508c2",
-    "dac_public_key": "0461a1109a1f8b4605b16c839e2d27a12482b59bf871e259dcaad1312c182075222649a4831ebc1423a2f5a220d24c7eb4a5badc3b00a753f5b7139d2326fa3694"
+    "dac_cert": "308201ce30820174a00302010202087924884a38f4a5f9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200043ff5af3215758482cd3e77eec68c76311493aa69bc9135dffb142ca7f4fe943f5a5498ce135c7ff260af9bef4e95a83fc20b7276c9033999f3aa2cf744ffc794a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604145d2e60837f18264fb553e58c21328969723c56f6301f0603551d2304183016801434a3a3a12ce0eaaaca884a4e022b4adc5147510c300a06082a8648ce3d0403020348003045022020ddefb0c44583276a368c74d61b2061f6c05efbb96e83700c15e03afe3662fd022100efd96ab7972c087230bb2b6ebf9da69e2abe69bd6ddaf68b4a9d64de847163ee",
+    "pai_cert": "308201bd30820164a003020102020845bb60ecbb58ff00300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004a93151daa785620f6b04045438900303a6987e6c2a67cc1216fc37dd84c62b9c6e429084d6c5f24478b917813cbd92087c3210ceb16fd1fc1ab88cf03b2a0bcda366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020102301d0603551d0e0416041434a3a3a12ce0eaaaca884a4e022b4adc5147510c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402203d2d0a078afcdb2cf493d9e788b0d5eec81867f7278b4f6f4a667a4ac3155a5c0220452e9d85ea0e6be15989662ab7dd00cc49e8c7250648fb74b4c841f3fdef52cb",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100cf4f0659d5ce494fc94022fae7a010790cc4967f81385d05f3eaf1d73f9576bd022100d7d876e9b7f58cdc63413b5d8c9882f837baec2e0766d6c6359ddc5c582c823f",
+    "dac_private_key": "ae40c5659e2898635552705b2234a53c17fc9baf3b8d6e473804a075434b5884",
+    "dac_public_key": "043ff5af3215758482cd3e77eec68c76311493aa69bc9135dffb142ca7f4fe943f5a5498ce135c7ff260af9bef4e95a83fc20b7276c9033999f3aa2cf744ffc794"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/cd.der
index 1ede1f869d05dd..65d16d66af913d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.der
index df0a9ffcb19f53..2a0a64b572c27f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.pem
index 936d507341eab4..5c7e89d75d8f59 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIVNXeJ1oJQnMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzTCCAXSgAwIBAgIIfQV/g0/pTrowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASKSV0IoEwQtx95n9uY5nWSJ7okthvC
-ejphsLXTRr/kruqNsCrbMUE+zhx877AIwvc5BxrIIouJl8qYag8I5Pnoo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUKchxsloZaUm1
-FvkZNnQbyS0jlKgwHwYDVR0jBBgwFoAUpi2icRcYZVnyWOD0+HR9ooINktIwCgYI
-KoZIzj0EAwIDSAAwRQIgYsoYQJ1XpcCITmc0sfulr8bfqYYkth4LbV9ofbkhd34C
-IQDJJXblGLVU9xwErwIBydLk0neUflpp0QsyFNY/D6MNZQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASrTOeTZNtyMcN7R/zI90hCVXdQV1rW
+Adnw7BM/WCLwvkYFicC61f+KZGMr8vHOwvt/+P98VAq/QSrwKatQFEhpo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUFwb2m+8+hefy
+xATbkDs7FZN6PpwwHwYDVR0jBBgwFoAUmsNjHuim6k221m9u+LSGU0Fd7aYwCgYI
+KoZIzj0EAwIDRwAwRAIgYSSe9HnR2uFGyfrVallu20h/f5B/Usg4MXB7As3+ojUC
+IFgZJ5/ovEG7lesnhPHjGzJhp9VDBncglN6Xt6hCJceG
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.der
index 4ae0a6045101a4..d77b356ef44067 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.pem
index ac34d834656025..7ba6bca64112f0 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBxX5qf0+s6KoLeHWeqRQaM6G/xMS40UEfxbSPutNgBzoAoGCCqGSM49
-AwEHoUQDQgAEikldCKBMELcfeZ/bmOZ1kie6JLYbwno6YbC100a/5K7qjbAq2zFB
-Ps4cfO+wCML3OQcayCKLiZfKmGoPCOT56A==
+MHcCAQEEIOvVJSKAZLC7LweDhJE549SuAZAzQGbaLyw6VFjHUYbCoAoGCCqGSM49
+AwEHoUQDQgAEq0znk2TbcjHDe0f8yPdIQlV3UFda1gHZ8OwTP1gi8L5GBYnAutX/
+imRjK/LxzsL7f/j/fFQKv0Eq8CmrUBRIaQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.der
index cfb40c092122dd..9bb85b06e8ee6c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.pem
index 36bed85a774f29..815b3381cad00e 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBrTCCAVSgAwIBAgIIBcj1ZjgeCG8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBrjCCAVSgAwIBAgIIOd7YDBKBJOEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABIflRitRj30XX7YwIBU8+WFguPQx6TPygf+288erRtyRSg/yp/DVlBAn3Fuz
-hUYhchxkwH/DBVkNThAkci9u7y2jVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYD
-VR0OBBYEFKYtonEXGGVZ8ljg9Ph0faKCDZLSMB8GA1UdIwQYMBaAFGr9IncfUR/s
-vxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0cAMEQCIBzI6r8dv8cXs5rjfcPjwcto
-eX1wTm8GNsMlSt2cEZH8AiBJbZTFphZ/Gy2H6iH+IIbtDLO5Kw/hgVz1LXYMBQpY
-mA==
+A0IABGTlnOaVnQp+8TaQUtQPOnof85iWtvK5PEH34J+CB69GrxLplsRg2MbjEIJW
+hNXZJRad8jNQjNUR2Ym/pU84iaijVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYD
+VR0OBBYEFJrDYx7opupNttZvbvi0hlNBXe2mMB8GA1UdIwQYMBaAFGr9IncfUR/s
+vxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0gAMEUCIEPQFTFm9LjEuta/6pVvW+7y
+/pb+uyaE7JKiyZgot6QCAiEA43sQ44LkOsRNdZEh0/r3iCWY5GszN+9f3NPt7jg7
+8k0=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.der
index 43ac08ba69f90b..974e73d397b182 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.pem
index 3df1a4952de9bb..514533d84be010 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBb6tM2MZvk2PM8pvwE2HYM53oKQ/va/aIdlZJ3B6BkhoAoGCCqGSM49
-AwEHoUQDQgAEh+VGK1GPfRdftjAgFTz5YWC49DHpM/KB/7bzx6tG3JFKD/Kn8NWU
-ECfcW7OFRiFyHGTAf8MFWQ1OECRyL27vLQ==
+MHcCAQEEIDvoW/BsDSCwCbGs3+AhJ6WSdvga2AfefQxb6Pr0FxW2oAoGCCqGSM49
+AwEHoUQDQgAEZOWc5pWdCn7xNpBS1A86eh/zmJa28rk8Qffgn4IHr0avEumWxGDY
+xuMQglaE1dklFp3yM1CM1RHZib+lTziJqA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/test_case_vector.json
index 8a420d12209a51..07192fd11176ab 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate doesn't include Key Usage extension",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020854d5de275a094273300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048a495d08a04c10b71f799fdb98e6759227ba24b61bc27a3a61b0b5d346bfe4aeea8db02adb31413ece1c7cefb008c2f739071ac8228b8997ca986a0f08e4f9e8a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041429c871b25a196949b516f91936741bc92d2394a8301f0603551d23041830168014a62da27117186559f258e0f4f8747da2820d92d2300a06082a8648ce3d0403020348003045022062ca18409d57a5c0884e6734b1fba5afc6dfa98624b61e0b6d5f687db921777e022100c92576e518b554f71c04af0201c9d2e4d277947e5a69d10b3214d63f0fa30d65",
-    "pai_cert": "308201ad30820154a003020102020805c8f566381e086f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000487e5462b518f7d175fb63020153cf96160b8f431e933f281ffb6f3c7ab46dc914a0ff2a7f0d5941027dc5bb3854621721c64c07fc305590d4e1024722f6eef2da356305430120603551d130101ff040830060101ff020100301d0603551d0e04160414a62da27117186559f258e0f4f8747da2820d92d2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402201cc8eabf1dbfc717b39ae37dc3e3c1cb68797d704e6f0636c3254add9c1191fc0220496d94c5a6167f1b2d87ea21fe2086ed0cb3b92b0fe1815cf52d760c050a5898",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022034e1e755ddff74b05c99451842d30c26e9b61b362f615de1d9a130d6f01b1f86022015963234a7768203edced2cc154ccce4303d9d67165352359df164d7e6c647dc",
-    "dac_private_key": "1c57e6a7f4face8aa0b78759ea9141a33a1bfc4c4b8d1411fc5b48fbad360073",
-    "dac_public_key": "048a495d08a04c10b71f799fdb98e6759227ba24b61bc27a3a61b0b5d346bfe4aeea8db02adb31413ece1c7cefb008c2f739071ac8228b8997ca986a0f08e4f9e8"
+    "dac_cert": "308201cd30820174a00302010202087d057f834fe94eba300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ab4ce79364db7231c37b47fcc8f74842557750575ad601d9f0ec133f5822f0be460589c0bad5ff8a64632bf2f1cec2fb7ff8ff7c540abf412af029ab50144869a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141706f69bef3e85e7f2c404db903b3b15937a3e9c301f0603551d230418301680149ac3631ee8a6ea4db6d66f6ef8b48653415deda6300a06082a8648ce3d0403020347003044022061249ef479d1dae146c9fad56a596edb487f7f907f52c83831707b02cdfea23502205819279fe8bc41bb95eb2784f1e31b3261a7d54306772094de97b7a84225c786",
+    "pai_cert": "308201ae30820154a003020102020839ded80c128124e1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000464e59ce6959d0a7ef1369052d40f3a7a1ff39896b6f2b93c41f7e09f8207af46af12e996c460d8c6e310825684d5d925169df233508cd511d989bfa54f3889a8a356305430120603551d130101ff040830060101ff020100301d0603551d0e041604149ac3631ee8a6ea4db6d66f6ef8b48653415deda6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022043d0153166f4b8c4bad6bfea956f5beef2fe96febb2684ec92a2c99828b7a402022100e37b10e382e43ac44d759121d3faf7882598e46b3337ef5fdcd3edee383bf24d",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502201648c9173efde4f9d472307d760fba1dc8450db3b519a47b6e087d27eb5c5b07022100acf41d1e385382b6cbce70dbcef4735bbae8c57e8f69115d41fba11a807cb0ba",
+    "dac_private_key": "ebd525228064b0bb2f0783849139e3d4ae0190334066da2f2c3a5458c75186c2",
+    "dac_public_key": "04ab4ce79364db7231c37b47fcc8f74842557750575ad601d9f0ec133f5822f0be460589c0bad5ff8a64632bf2f1cec2fb7ff8ff7c540abf412af029ab50144869"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/cd.der
index 862c8072354413..942b90a0ba6b84 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.der
index 5caa622ca8c6d8..6a15efd2300c4c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.pem
index 8f8319f5e14d57..cdfb8efb9911b6 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBrTCCAVOgAwIBAgIIemK9hapxDvswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBrTCCAVOgAwIBAgIIbi7Ukrxw1x0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3gy+6YVGOeTMAkQQ55jwav664rKon
-m8/Nq0FK91QSj3Isqow29NflltfEl8hPW1VTeUyIAfD2Dl8T8v3XXQiwoz8wPTAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU9qi5ttuhQa44
-slMQlj6JYKcPNvwwCgYIKoZIzj0EAwIDSAAwRQIhAIAYlQ0mGWCfPjQTkbOVr9v7
-vsOJXajC9fwQgznEMv4tAiAzdFUHPbYyKv0TQqPQ8Vypp3FHOiQBE8ZaMLogsZBo
-NQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQgcocfpvxUoYhcSG8B+PmEEqrwxRuV
+ZdqbtTEifw0OKzri3aw1yPleG0C55Jw6+E/p/shkoqF8/332KZNJ4qSRoz8wPTAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUy20zglUTrTyp
+XmZuRrQCJG/9G4EwCgYIKoZIzj0EAwIDSAAwRQIgagBnMHI/myk12qXnOiF7Sd5g
+GVsB+SQtU9Me2QGllnECIQCicg9cEsVC4eVZv8OEmUSXILqoY85wQjP9IRQr+uD6
+og==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.der
index 33c8e6a7f873f2..c5346ff184dbba 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.pem
index eb6a39849cb55e..ea08d0306883b6 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBh7DtjDRHTS2BojeqHta+l0Fkg2BJfww9tDWHr3FZAXoAoGCCqGSM49
-AwEHoUQDQgAEd4MvumFRjnkzAJEEOeY8Gr+uuKyqJ5vPzatBSvdUEo9yLKqMNvTX
-5ZbXxJfIT1tVU3lMiAHw9g5fE/L9110IsA==
+MHcCAQEEIFK0Bd30kYx4OVUhTGNk37yE4T5supdcTm35eodkMxg/oAoGCCqGSM49
+AwEHoUQDQgAEIHKHH6b8VKGIXEhvAfj5hBKq8MUblWXam7UxIn8NDis64t2sNcj5
+XhtAueScOvhP6f7IZKKhfP999imTSeKkkQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.der
index 059e944deb660f..7c8ca5cc81c8db 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.pem
index 7c00f01766daab..d2501eeb3b0571 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Cert.pem
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBnjCCAUWgAwIBAgIIdyNZPBFgYvwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBnzCCAUWgAwIBAgIILU76F2i9nfYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABJg9LckAIrF09o1vJn1aMvy8wakXlCsVbEyUqeMvZb/ARtaH8YlO0mYlq37u
-sfWkXXPD/QxO5PzcXiIp3v7hqXqjRzBFMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+A0IABOjDLxJauFgoq9AWiwji4XY37hqQvdwqZiG0WhYUNXEcrzzf39flyZS24qAz
+2q7jyC2go46cmFjtdCansLyzkJSjRzBFMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
 VR0PAQH/BAQDAgEGMB8GA1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoG
-CCqGSM49BAMCA0cAMEQCIDokg0BR+yBWK8fG/86cQEm4dCnxDHq0OL/XmFtYSHHv
-AiAW/XLJ2ytze3+20SFcnmbv1RBHkNYY8wY9UQAmPXijhw==
+CCqGSM49BAMCA0gAMEUCIQCbXl0Gk2irTGhDaNoQsdrN1IYaDEQh0D3Ee4znSZab
+hAIgZWkJs6JbTTmWUHj0UwIuwsAZLD5i80QicUSwi5cMRkA=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.der
index d4ae1d7f7ea56b..84fb821b8220a8 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.pem
index 8faca9833080b6..30b3dd35f74148 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGmPk0w5eBDvAXN68xB/XQvay0hutmxXg06mW8ISyi5roAoGCCqGSM49
-AwEHoUQDQgAEmD0tyQAisXT2jW8mfVoy/LzBqReUKxVsTJSp4y9lv8BG1ofxiU7S
-ZiWrfu6x9aRdc8P9DE7k/NxeIine/uGpeg==
+MHcCAQEEIIBi0j99zA5DKO9z8f9yj5mrB/nFP/g1plIYIjlvQu/xoAoGCCqGSM49
+AwEHoUQDQgAE6MMvElq4WCir0BaLCOLhdjfuGpC93CpmIbRaFhQ1cRyvPN/f1+XJ
+lLbioDParuPILaCjjpyYWO10JqewvLOQlA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/test_case_vector.json
index afe003c2878f44..42d8d45bfe2692 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate doesn't include Subject Key ID (SKID) extension",
     "is_success_case": "false",
-    "dac_cert": "308201ad30820153a00302010202087a62bd85aa710efb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000477832fba61518e793300910439e63c1abfaeb8acaa279bcfcdab414af754128f722caa8c36f4d7e596d7c497c84f5b5553794c8801f0f60e5f13f2fdd75d08b0a33f303d300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f6a8b9b6dba141ae38b25310963e8960a70f36fc300a06082a8648ce3d04030203480030450221008018950d2619609f3e341391b395afdbfbbec3895da8c2f5fc108339c432fe2d0220337455073db6322afd1342a3d0f15ca9a771473a240113c65a30ba20b1906835",
-    "pai_cert": "3082019e30820145a00302010202087723593c116062fc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004983d2dc90022b174f68d6f267d5a32fcbcc1a917942b156c4c94a9e32f65bfc046d687f1894ed26625ab7eeeb1f5a45d73c3fd0c4ee4fcdc5e2229defee1a97aa347304530120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402203a24834051fb20562bc7c6ffce9c4049b87429f10c7ab438bfd7985b584871ef022016fd72c9db2b737b7fb6d1215c9e66efd5104790d618f3063d5100263d78a387",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100e71d7a8b9b1a5de233fe53c7b9bb5237688d1a32ab63aff7feb729365e4afb2d02206253b7ba7201eae286ffa3f22916ca30dafc49cef543d8d8c3076c63b0800345",
-    "dac_private_key": "187b0ed8c34474d2d81a237aa1ed6be9741648360497f0c3db43587af7159017",
-    "dac_public_key": "0477832fba61518e793300910439e63c1abfaeb8acaa279bcfcdab414af754128f722caa8c36f4d7e596d7c497c84f5b5553794c8801f0f60e5f13f2fdd75d08b0"
+    "dac_cert": "308201ad30820153a00302010202086e2ed492bc70d71d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042072871fa6fc54a1885c486f01f8f98412aaf0c51b9565da9bb531227f0d0e2b3ae2ddac35c8f95e1b40b9e49c3af84fe9fec864a2a17cff7df6299349e2a491a33f303d300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cb6d33825513ad3ca95e666e46b402246ffd1b81300a06082a8648ce3d040302034800304502206a006730723f9b2935daa5e73a217b49de60195b01f9242d53d31ed901a59671022100a2720f5c12c542e1e559bfc38499449720baa863ce704233fd21142bfae0faa2",
+    "pai_cert": "3082019f30820145a00302010202082d4efa1768bd9df6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004e8c32f125ab85828abd0168b08e2e17637ee1a90bddc2a6621b45a161435711caf3cdfdfd7e5c994b6e2a033daaee3c82da0a38e9c9858ed7426a7b0bcb39094a347304530120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009b5e5d069368ab4c684368da10b1dacdd4861a0c4421d03dc47b8ce749969b840220656909b3a25b4d39965078f453022ec2c0192c3e62f344227144b08b970c4640",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220577d16c1b4e48f5d8aa4a2f89ab44684ea2b8c23eaf76ed4d62e0e4924c7df070220711ea523f0311b2aba70568b0e0dd3023b10a5887ee487f1a4db479d8f1ea7a8",
+    "dac_private_key": "52b405ddf4918c783955214c6364dfbc84e13e6cba975c4e6df97a876433183f",
+    "dac_public_key": "042072871fa6fc54a1885c486f01f8f98412aaf0c51b9565da9bb531227f0d0e2b3ae2ddac35c8f95e1b40b9e49c3af84fe9fec864a2a17cff7df6299349e2a491"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/cd.der b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/cd.der
index 52b40214bf5672..bcb0452cf9f171 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/cd.der and b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.der
index e72a26cd87e807..3790a605c552f3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.pem
index a696efe07c942c..9522ba59c74c98 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIYtLJT6Q+sVYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIds09qp93tzYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATAsr9oJ9tnPabv5S72iGUcZQNpZJij
-YbylnABzeDBhqYfpIpxqmeZr43cTQf0m6+ypypTF7zn44X/dS1lsPaado2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUeRD0jzss8F6j
-FSHMJOaO/uzEa9gwHwYDVR0jBBgwFoAUSqLL5qz3qlujuE7LhqqtQT+kw7gwCgYI
-KoZIzj0EAwIDSAAwRQIhAKHojqc1mRb2zKqOyF/Q+ZLAM/DvCaefbF7sHFyOZKEX
-AiAHSxkQnXs+XO4j/Qs2aE4hgKopAQ6Gt93pTv+EdtyYMg==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASAu1f7XCkHHBbHLdnKkj8KMIOV0VmF
+id6QpnrWfvoLvOibnyTKVxEr4hvQeCs1IMUyiaOlVSgTSzo9qApZI0Wdo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUKzmZDH2WOVa1
+INvUdi7b3J0iEL0wHwYDVR0jBBgwFoAUdBp7Y2cqahtShQ0sX8YQ/htwvDcwCgYI
+KoZIzj0EAwIDSAAwRQIhAIXQ05fJMq5MYUy0olA4SUMz3qgsIWIn2dvKaWr2hOoF
+AiBvnYRL839EhHmNCJ+k/UQsnXTTrxuuJG3InWTWoOWDRw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.der
index e8465b1f7af54c..347442bf997240 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.pem
index 4a7525cd26e6e6..372f2ad6fec78e 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIN3aMYc9isrXogXysgnD/hzUikMKzmYPdt2r70tnKGZwoAoGCCqGSM49
-AwEHoUQDQgAEwLK/aCfbZz2m7+Uu9ohlHGUDaWSYo2G8pZwAc3gwYamH6SKcapnm
-a+N3E0H9JuvsqcqUxe85+OF/3UtZbD2mnQ==
+MHcCAQEEIPpufn3t/FAD1RL8U3d0UaFFwyXulMRxmPSegyxHYYZMoAoGCCqGSM49
+AwEHoUQDQgAEgLtX+1wpBxwWxy3ZypI/CjCDldFZhYnekKZ61n76C7zom58kylcR
+K+Ib0HgrNSDFMomjpVUoE0s6PagKWSNFnQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.der
index 0a052a81754f06..06b89a5ea0c2dc 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.pem
index 9f83a8e8a02ef0..2fd73da0902ec2 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB0jCCAXmgAwIBAgIIVkA6ibDt19MwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB0zCCAXmgAwIBAgIIR+hwihWiPIQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABDQyduF8jDElSpscWK9szQE/6lsQTIaRmA3J6ZWogMcC1dkS64MuThNW9xyj
-CDPQDDoj8Q4Xb5HArjgbjaCQFp+jezB5MBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRKosvmrPeqW6O4TsuGqq1BP6TDuDAfBgNV
+A0IABKwP6V2su972apv31l+hbzlpZXCFWPlirWVEELMMQ1g3VC6Ux8a/rCulpfXo
+Y4CnqQhLXOFPrG6vz4PKPq6QSU6jezB5MBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR0GntjZypqG1KFDSxfxhD+G3C8NzAfBgNV
 HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjATBgNVHREEDDAKggh0ZXN0LmNv
-bTAKBggqhkjOPQQDAgNHADBEAiAI+SIE93zvH2IDH8srA83Y3ftGw4w5S8jtKvjx
-QZIUnwIgXGQXAI3EuswlJT76alqlnIGqlJzsppEr4Wa6sm9UJGc=
+bTAKBggqhkjOPQQDAgNIADBFAiB2A3UJjnsT+2fNNE6s2tbcyCuv0Wni0awxDGvy
+2HUiBQIhAPS+nvALcIggGSQbKmt2NUMTcRli3vc8PRbLZLKtghKp
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.der
index c92fa73b18272a..702b25af3163be 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.pem
index b7ede90d22bd5a..8948a831c5b18e 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICQqmZnfZrA2Ef88yCP+0soBfn0PIL7HpcxDZ8T3tEjmoAoGCCqGSM49
-AwEHoUQDQgAENDJ24XyMMSVKmxxYr2zNAT/qWxBMhpGYDcnplaiAxwLV2RLrgy5O
-E1b3HKMIM9AMOiPxDhdvkcCuOBuNoJAWnw==
+MHcCAQEEIF05NGbR85t8ngcdpYaFyKovcpy08mZAtlTN95aU4rn2oAoGCCqGSM49
+AwEHoUQDQgAErA/pXay73vZqm/fWX6FvOWllcIVY+WKtZUQQswxDWDdULpTHxr+s
+K6Wl9ehjgKepCEtc4U+sbq/Pg8o+rpBJTg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/test_case_vector.json
index 8ab17ba30ea3d6..9b3805eb26e501 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_subject_alt_name_present/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate includes optional Subject Alternative Name extension",
     "is_success_case": "true",
-    "dac_cert": "308201ce30820174a003020102020862d2c94fa43eb156300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004c0b2bf6827db673da6efe52ef688651c6503696498a361bca59c0073783061a987e9229c6a99e66be3771341fd26ebeca9ca94c5ef39f8e17fdd4b596c3da69da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147910f48f3b2cf05ea31521cc24e68efeecc46bd8301f0603551d230418301680144aa2cbe6acf7aa5ba3b84ecb86aaad413fa4c3b8300a06082a8648ce3d0403020348003045022100a1e88ea7359916f6ccaa8ec85fd0f992c033f0ef09a79f6c5eec1c5c8e64a1170220074b19109d7b3e5cee23fd0b36684e2180aa29010e86b7dde94eff8476dc9832",
-    "pai_cert": "308201d230820179a003020102020856403a89b0edd7d3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004343276e17c8c31254a9b1c58af6ccd013fea5b104c8691980dc9e995a880c702d5d912eb832e4e1356f71ca30833d00c3a23f10e176f91c0ae381b8da090169fa37b307930120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144aa2cbe6acf7aa5ba3b84ecb86aaad413fa4c3b8301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e30130603551d11040c300a8208746573742e636f6d300a06082a8648ce3d0403020347003044022008f92204f77cef1f62031fcb2b03cdd8ddfb46c38c394bc8ed2af8f14192149f02205c6417008dc4bacc25253efa6a5aa59c81aa949ceca6912be166bab26f542467",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221009c8535617a42f7b9d6fa3a6d6900a8f54c6e4b2cff3210c2b83ca9442c923a2a022025aec84ea1a17cb7e26eaaaef0eeed22c91219101fd82c87e5fbef816a9537d0",
-    "dac_private_key": "ddda31873d8acad7a205f2b209c3fe1cd48a430ace660f76ddabef4b67286670",
-    "dac_public_key": "04c0b2bf6827db673da6efe52ef688651c6503696498a361bca59c0073783061a987e9229c6a99e66be3771341fd26ebeca9ca94c5ef39f8e17fdd4b596c3da69d"
+    "dac_cert": "308201ce30820174a003020102020876cd3daa9f77b736300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000480bb57fb5c29071c16c72dd9ca923f0a308395d1598589de90a67ad67efa0bbce89b9f24ca57112be21bd0782b3520c53289a3a55528134b3a3da80a5923459da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604142b39990c7d963956b520dbd4762edbdc9d2210bd301f0603551d23041830168014741a7b63672a6a1b52850d2c5fc610fe1b70bc37300a06082a8648ce3d040302034800304502210085d0d397c932ae4c614cb4a25038494333dea82c216227d9dbca696af684ea0502206f9d844bf37f4484798d089fa4fd442c9d74d3af1bae246dc89d64d6a0e58347",
+    "pai_cert": "308201d330820179a003020102020847e8708a15a23c84300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ac0fe95dacbbdef66a9bf7d65fa16f396965708558f962ad654410b30c435837542e94c7c6bfac2ba5a5f5e86380a7a9084b5ce14fac6eafcf83ca3eae90494ea37b307930120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414741a7b63672a6a1b52850d2c5fc610fe1b70bc37301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e30130603551d11040c300a8208746573742e636f6d300a06082a8648ce3d04030203480030450220760375098e7b13fb67cd344eacdad6dcc82bafd169e2d1ac310c6bf2d8752205022100f4be9ef00b70882019241b2a6b76354313711962def73c3d16cb64b2ad8212a9",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502210090124c1624a6ec5f6ed299ba83ad2d2d640fa92290982a15f6e33fb3b06676dd022051ebaeaaea7e24f58c96540fc075dcdc0bc437c439c547b5d878e271157e9f6f",
+    "dac_private_key": "fa6e7e7dedfc5003d512fc53777451a145c325ee94c47198f49e832c4761864c",
+    "dac_public_key": "0480bb57fb5c29071c16c72dd9ca923f0a308395d1598589de90a67ad67efa0bbce89b9f24ca57112be21bd0782b3520c53289a3a55528134b3a3da80a5923459d"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/cd.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/cd.der
index 54eeef1f0f461f..87d407b562df6e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/cd.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.der
index 81e73225f0ab34..0df86d915fb1eb 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.pem
index 707c964245fd75..13895895f09b85 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIFrUXDTIXeoowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzzCCAXSgAwIBAgIITJLBbOdcSLswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATnJnm9mq6e77XNs5PCYSp7CID7nt1g
-UpOZNbIRNulaE8gQjspO1xjAxUg58B5c6teu+pibLeH27spx9galkc0Ro2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUu1hNuRQS4YF2
-Xi71fC9u2hYLXQ8wHwYDVR0jBBgwFoAUEvuhpoab8mPgGModZUwvjCm2G2gwCgYI
-KoZIzj0EAwIDSAAwRQIgUWqyDgRr6uet+0p+MYj6BYp+kK72H6u1AdccEPUcS2MC
-IQD8Ut4M33+F0axom7J7yhS5BYk4a046f3iAgZd7h2p+NQ==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS9F06RCajnzabEhupW4vCxlPh0oUop
+vSumP5qU6O7473M7IS/iMHJe5CR5KrQf1aPrxTJuQdCphGtl6XpaiwSeo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUsaB68wFvIvxx
+oy3x74iEHGkiraYwHwYDVR0jBBgwFoAU/7cXzrgdjRJ+nLyFiKLqq+YEGdkwCgYI
+KoZIzj0EAwIDSQAwRgIhALVbnMxXNFVOi9DjkCQkylWDcALsMH3gQVHFvXLwlyun
+AiEAnl5iCZPHpgNBp5byHws66h6EO6jA1MlwQbl4LK2onPQ=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.der
index 99e74d8c2cd2bd..4f10a48802a4d7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.pem
index 62c3af6fef9e78..9abe9439f165c5 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKDIoXd3ERD1HnDt+RpBOsWTApOHoLqcAilwqKlkltfpoAoGCCqGSM49
-AwEHoUQDQgAE5yZ5vZqunu+1zbOTwmEqewiA+57dYFKTmTWyETbpWhPIEI7KTtcY
-wMVIOfAeXOrXrvqYmy3h9u7KcfYGpZHNEQ==
+MHcCAQEEIJgMITguwArgUEDMJ6DE/YFnSulANBE+8ET6PdDqhNPdoAoGCCqGSM49
+AwEHoUQDQgAEvRdOkQmo582mxIbqVuLwsZT4dKFKKb0rpj+alOju+O9zOyEv4jBy
+XuQkeSq0H9Wj68UybkHQqYRrZel6WosEng==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.der
index 5a6f473f8600c0..92031c507ff066 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.pem
index e4fd995e3ec3cf..c8f87a8d4046c1 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvDCCAWOgAwIBAgIIBEzFO7MsMz8wCQYHKoZIzj0EATAwMRgwFgYDVQQDDA9N
-YXR0ZXIgVGVzdCBQQUExFDASBgorBgEEAYKifAIBDARGRkYxMCAXDTIyMDUyNzAw
+MIIBvDCCAWOgAwIBAgIIOUvY73wl+lIwCQYHKoZIzj0EATAwMRgwFgYDVQQDDA9N
+YXR0ZXIgVGVzdCBQQUExFDASBgorBgEEAYKifAIBDARGRkYxMCAXDTIyMDkyMzAw
 MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjAwMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBQ
 QUkxFDASBgorBgEEAYKifAIBDARGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEqK/4VQ9ONGr8m1F406+gmvN+3gBXODASW8QS/0Y9nhf8R14OvCqnlZI80jMV
-v/xyDkmER9YB/4b4fmPwvpwqnqNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBL7oaaGm/Jj4BjKHWVML4wpthtoMB8GA1Ud
-IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAkGByqGSM49BAEDSAAwRQIgZn8x
-rGZB/p8S4ZY/JSgNvc+23qnM0U4dcb4zE9OjHFgCIQDN0kITc5FAQuFg3KLHiSE5
-YW2qRPjZq3d5UIm4ONQ//A==
+QgAElhStvbUuu5zTllf0MxDey3vncjy1LfhmDqhtSaKUvqLr2SwBiKcsIoHFI9aw
+gvV1/PGpNsAECEFGehTXoxsj/qNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP+3F864HY0Sfpy8hYii6qvmBBnZMB8GA1Ud
+IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAkGByqGSM49BAEDSAAwRQIgUFOe
+Dza84Qgl6/SHb1TQTn3m96pA/2IypES/w0U1IlUCIQDS4FBI4kmrK6Qi0OCaIzrv
+W6Rxmm98tPg+m0PKgTTb6g==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.der
index 3d26fdb09293a3..cc15bc67c2c54d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.pem
index 27b11fb0277b63..8a15e233873c5b 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIelzojq1QhnnRqcrvpNxu6A+aMSG9sVkk3TyGlcma+yoAoGCCqGSM49
-AwEHoUQDQgAEqK/4VQ9ONGr8m1F406+gmvN+3gBXODASW8QS/0Y9nhf8R14OvCqn
-lZI80jMVv/xyDkmER9YB/4b4fmPwvpwqng==
+MHcCAQEEILsT2d22w+PzK4Oek7S28pliSKQelGnowVSjWgeT/H9NoAoGCCqGSM49
+AwEHoUQDQgAElhStvbUuu5zTllf0MxDey3vncjy1LfhmDqhtSaKUvqLr2SwBiKcs
+IoHFI9awgvV1/PGpNsAECEFGehTXoxsj/g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/test_case_vector.json
index b7b24d3dedf832..4d0b865bcf34c6 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Invalid certificate signature algorithm ECDSA_WITH_SHA1",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020816b5170d32177a8a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e72679bd9aae9eefb5cdb393c2612a7b0880fb9edd6052939935b21136e95a13c8108eca4ed718c0c54839f01e5cead7aefa989b2de1f6eeca71f606a591cd11a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bb584db91412e181765e2ef57c2f6eda160b5d0f301f0603551d2304183016801412fba1a6869bf263e018ca1d654c2f8c29b61b68300a06082a8648ce3d04030203480030450220516ab20e046beae7adfb4a7e3188fa058a7e90aef61fabb501d71c10f51c4b63022100fc52de0cdf7f85d1ac689bb27bca14b90589386b4e3a7f788081977b876a7e35",
-    "pai_cert": "308201bc30820163a0030201020208044cc53bb32c333f300906072a8648ce3d040130303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004a8aff8550f4e346afc9b5178d3afa09af37ede00573830125bc412ff463d9e17fc475e0ebc2aa795923cd23315bffc720e498447d601ff86f87e63f0be9c2a9ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041412fba1a6869bf263e018ca1d654c2f8c29b61b68301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300906072a8648ce3d040103480030450220667f31ac6641fe9f12e1963f25280dbdcfb6dea9ccd14e1d71be3313d3a31c58022100cdd2421373914042e160dca2c7892139616daa44f8d9ab77795089b838d43ffc",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022064bcaa37c863d891771a394f65707de931e82b74035c56299a3c706384bcfa4b022100caa722a322f7a0ce0edfd9f9dc8e50a9b9caf6e60ed5fc05ad9260dda01d55b6",
-    "dac_private_key": "a0c8a177771110f51e70edf91a413ac593029387a0ba9c022970a8a96496d7e9",
-    "dac_public_key": "04e72679bd9aae9eefb5cdb393c2612a7b0880fb9edd6052939935b21136e95a13c8108eca4ed718c0c54839f01e5cead7aefa989b2de1f6eeca71f606a591cd11"
+    "dac_cert": "308201cf30820174a00302010202084c92c16ce75c48bb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004bd174e9109a8e7cda6c486ea56e2f0b194f874a14a29bd2ba63f9a94e8eef8ef733b212fe230725ee424792ab41fd5a3ebc5326e41d0a9846b65e97a5a8b049ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b1a07af3016f22fc71a32df1ef88841c6922ada6301f0603551d23041830168014ffb717ceb81d8d127e9cbc8588a2eaabe60419d9300a06082a8648ce3d0403020349003046022100b55b9ccc5734554e8bd0e3902424ca55837002ec307de04151c5bd72f0972ba70221009e5e620993c7a60341a796f21f0b3aea1e843ba8c0d4c97041b9782cada89cf4",
+    "pai_cert": "308201bc30820163a0030201020208394bd8ef7c25fa52300906072a8648ce3d040130303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200049614adbdb52ebb9cd39657f43310decb7be7723cb52df8660ea86d49a294bea2ebd92c0188a72c2281c523d6b082f575fcf1a936c0040841467a14d7a31b23fea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ffb717ceb81d8d127e9cbc8588a2eaabe60419d9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300906072a8648ce3d04010348003045022050539e0f36bce10825ebf4876f54d04e7de6f7aa40ff6232a444bfc345352255022100d2e05048e249ab2ba422d0e09a233aef5ba4719a6f7cb4f83e9b43ca8134dbea",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022062ace16c24819f25cef24ef481df62fbcb8ff6ab86f3225421adeddebcfecfd502210085cfd967564cd84698de4f4b1ff1a8032363d1b4f3a5ae4e463c75e0d4e2fb57",
+    "dac_private_key": "980c21382ec00ae05040cc27a0c4fd81674ae94034113ef044fa3dd0ea84d3dd",
+    "dac_public_key": "04bd174e9109a8e7cda6c486ea56e2f0b194f874a14a29bd2ba63f9a94e8eef8ef733b212fe230725ee424792ab41fd5a3ebc5326e41d0a9846b65e97a5a8b049e"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/cd.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/cd.der
index a3c072626ac636..0e668d283b927c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/cd.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.der
index 626b27bc25cf91..d6314d52e89f58 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.pem
index b99592118baf24..0f4205a4b159cc 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIIFR+fp68E8kwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzzCCAXSgAwIBAgIICm0g7FQal4gwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATk67sQiOzcg5GiALLS77qXGigO+rSx
-bbKVi3L/HiAvGWNuYFkjDNwC9UHBSs5Z1m8wi7G+hkhP7F+mS2JhvNBRo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUwDWKmLbCscXF
-8CMybhPTeBPr6LQwHwYDVR0jBBgwFoAUyPech3T5SKsR4iQbsGcjALj/QM4wCgYI
-KoZIzj0EAwIDRwAwRAIgREtTmVzodj3Hexcf4psjM+V8fUd2Vy3rEMsWgUtFBjIC
-ICwAPfXyyEpigqmQt+/HjqYQHI4+MF4VJ7ZuQ4whTISi
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT+8WjtB2gQ5ExNk/bpt91jVi9Ijdil
+Yv3BS0FQ1wHV+oZLsLA/Pmgcdao7kqR9tEWIixbDY+HpMZA9im9cmUyNo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUaE+vv+MAGwdb
+QSM6v7jC6fon4oAwHwYDVR0jBBgwFoAUln2YWbCSASIqSPLToG33+9DA1gUwCgYI
+KoZIzj0EAwIDSQAwRgIhAJG0S/1U6UUQtnybMlofANnLRnvVwS0zaWGsxaOjcyTZ
+AiEA5RAUk0/UA8ern09AiykQmOdEhh/tZrs+DFdU5xQKAZ0=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.der
index fc5f3e2399748d..0b4428344c02db 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.pem
index aa4b8545b36a73..97dab84a4d860d 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILjI0eX7lDi6/7cWyZdexhNS3TBgVfbQ4tlnw3htTCOMoAoGCCqGSM49
-AwEHoUQDQgAE5Ou7EIjs3IORogCy0u+6lxooDvq0sW2ylYty/x4gLxljbmBZIwzc
-AvVBwUrOWdZvMIuxvoZIT+xfpktiYbzQUQ==
+MHcCAQEEIM3SSOaf5WoGzStfYcwKjSpPZh5wCu15o7Y7aAgJPzlaoAoGCCqGSM49
+AwEHoUQDQgAE/vFo7QdoEORMTZP26bfdY1YvSI3YpWL9wUtBUNcB1fqGS7CwPz5o
+HHWqO5KkfbRFiIsWw2Ph6TGQPYpvXJlMjQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.der
index e14c1cab97d85f..f02b1b598a896c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.pem
index a0598b892eec8b..e988de048e75e6 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWSgAwIBAgIIdg0wW1tTQkQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvzCCAWSgAwIBAgIIfHbYxrBRPmowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABDTiP+O3k97ocvUjvfuOdCO8eULpwEFy0HSGUZo33Xfbzrr0aRHhqPDOpO0L
-Ny9/uvGPtc/R/36srMysL7FE4+GjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTI95yHdPlIqxHiJBuwZyMAuP9AzjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
-3dr8a7kDi+VF0W8d7qBmwBewZfOOMQiQYYGo1H+qaOwCIFy7+6hhMSUqGWmuRpNq
-MK/amQO7xm+N9HvoY192zmsg
+A0IABEoDRevFClAL4tsEQzD4C7fmT92iUe5TI9W5bFauPRjyX9948b/cjUqxN6oP
+yY+66016rlZc4mn+Abv0Dy098WijZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSWfZhZsJIBIipI8tOgbff70MDWBTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+tKae2K40ueabpZRRVNZrWa55x2hdZEsx2tUGGHXRzoYCIQCuaCmUpRepakVBeKeN
+ni5/fn8ANtUYhSSF1yg7P7Ny1Q==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.der
index ab02c6ee1848c7..918b092ee0f825 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.pem
index 193b1fd1842ec2..97c044347f2c0e 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJiv6+GEkTuUbMc7jQVbQSO9M9L9BZ+CEkoNrXEwr1aGoAoGCCqGSM49
-AwEHoUQDQgAENOI/47eT3uhy9SO9+450I7x5QunAQXLQdIZRmjfdd9vOuvRpEeGo
-8M6k7Qs3L3+68Y+1z9H/fqyszKwvsUTj4Q==
+MHcCAQEEIFwMflxjzeiWFb61Wrx4N03TRYvJajVf3ib8Vtb6OKsAoAoGCCqGSM49
+AwEHoUQDQgAESgNF68UKUAvi2wRDMPgLt+ZP3aJR7lMj1blsVq49GPJf33jxv9yN
+SrE3qg/Jj7rrTXquVlziaf4Bu/QPLT3xaA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/test_case_vector.json
index 3b48f71977ba74..ae15b5319c4c8d 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha256/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Valid certificate signature algorithm ECDSA_WITH_SHA256",
     "is_success_case": "true",
-    "dac_cert": "308201cd30820174a003020102020820547e7e9ebc13c9300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004e4ebbb1088ecdc8391a200b2d2efba971a280efab4b16db2958b72ff1e202f19636e6059230cdc02f541c14ace59d66f308bb1be86484fec5fa64b6261bcd051a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c0358a98b6c2b1c5c5f023326e13d37813ebe8b4301f0603551d23041830168014c8f79c8774f948ab11e2241bb0672300b8ff40ce300a06082a8648ce3d04030203470030440220444b53995ce8763dc77b171fe29b2333e57c7d4776572deb10cb16814b45063202202c003df5f2c84a6282a990b7efc78ea6101c8e3e305e1527b66e438c214c84a2",
-    "pai_cert": "308201be30820164a0030201020208760d305b5b534244300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000434e23fe3b793dee872f523bdfb8e7423bc7942e9c04172d07486519a37dd77dbcebaf46911e1a8f0cea4ed0b372f7fbaf18fb5cfd1ff7eacacccac2fb144e3e1a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414c8f79c8774f948ab11e2241bb0672300b8ff40ce301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100dddafc6bb9038be545d16f1deea066c017b065f38e3108906181a8d47faa68ec02205cbbfba86131252a1969ae46936a30afda9903bbc66f8df47be8635f76ce6b20",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b5d72a81c7b64ff66a5f5c66fe5a88a54936340ef2bf60ef0a862bac645fe58d022100a2c20dcf768d23603bf51e615b3cd695f3137ce3755161b24ed3ff17d27cacb9",
-    "dac_private_key": "b8c8d1e5fb9438baffb716c9975ec61352dd306055f6d0e2d967c3786d4c238c",
-    "dac_public_key": "04e4ebbb1088ecdc8391a200b2d2efba971a280efab4b16db2958b72ff1e202f19636e6059230cdc02f541c14ace59d66f308bb1be86484fec5fa64b6261bcd051"
+    "dac_cert": "308201cf30820174a00302010202080a6d20ec541a9788300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004fef168ed076810e44c4d93f6e9b7dd63562f488dd8a562fdc14b4150d701d5fa864bb0b03f3e681c75aa3b92a47db445888b16c363e1e931903d8a6f5c994c8da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414684fafbfe3001b075b41233abfb8c2e9fa27e280301f0603551d23041830168014967d9859b09201222a48f2d3a06df7fbd0c0d605300a06082a8648ce3d040302034900304602210091b44bfd54e94510b67c9b325a1f00d9cb467bd5c12d336961acc5a3a37324d9022100e51014934fd403c7ab9f4f408b291098e744861fed66bb3e0c5754e7140a019d",
+    "pai_cert": "308201bf30820164a00302010202087c76d8c6b0513e6a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200044a0345ebc50a500be2db044330f80bb7e64fdda251ee5323d5b96c56ae3d18f25fdf78f1bfdc8d4ab137aa0fc98fbaeb4d7aae565ce269fe01bbf40f2d3df168a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414967d9859b09201222a48f2d3a06df7fbd0c0d605301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100b4a69ed8ae34b9e69ba5945154d66b59ae79c7685d644b31dad5061875d1ce86022100ae682994a517a96a454178a78d9e2e7f7e7f0036d518852485d7283b3fb372d5",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100ac0b49310f9c603472ef27b77b7adacb934bd62c225474f70d39eea62cd53a5a02210099a89f2297dd55e8f98992c3928c3d834b1ab27b287116f1a94eeabe4d68331e",
+    "dac_private_key": "cdd248e69fe56a06cd2b5f61cc0a8d2a4f661e700aed79a3b63b6808093f395a",
+    "dac_public_key": "04fef168ed076810e44c4d93f6e9b7dd63562f488dd8a562fdc14b4150d701d5fa864bb0b03f3e681c75aa3b92a47db445888b16c363e1e931903d8a6f5c994c8d"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/cd.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/cd.der
index 2437e6c1be1945..395adeb94d7a23 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/cd.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.der
index f13caf64964d01..8027b159ee3994 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.pem
index b1eb3a56299a2f..5120f544b2fbe5 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIJe0jhZLYIqEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIA0w89+8wf4MwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARBZiRuLBiIB+k2AiehS+W/OO8fgux2
-DfcUmSRx4BzUW0aPlEVoo4k2pOZckZKN6uGTD7gfV+YXbsIZJa3K8S9uo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUOifcZmv6HcmT
-s6lDEEiPlolSJ6gwHwYDVR0jBBgwFoAU1G3q3KyWExehVpvtobDBm+Wec4wwCgYI
-KoZIzj0EAwIDRwAwRAIgXGO48tVqNKwvHeyAwv5c8BD0z5sdFNW+VTokowQFvrgC
-ID1SOhARDq5n/88rZ70GgPKZTqedyqVSXEp/UkhUFSPw
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASY9rj4wJjQGjyTvUzyE69HWPSJeKGB
+cv4OWyuwvz+gr2ZruUXkWrTipYJtLqSufNHsOE2dlwIrP+urdFVyiCCMo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUs1C98arU+z10
+6qA8Kr2ydk1s1TUwHwYDVR0jBBgwFoAU2npnpfIhhmZhRx6AimUj3VWFaDQwCgYI
+KoZIzj0EAwIDSAAwRQIhANaShGvhs5wVTND17wU2x/zA4hxcsk7x13lOEiCfGE/h
+AiAXMb6/OMUazTkTt2EskvafWj2MQvpakhwOYoZdwGpwnQ==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.der
index 96236e0faab515..ff45d44acbb087 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.pem
index 6bb2e895fa69a4..b9e7f0cb1a82a9 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICXl56yNKrutVJYMpgiZo/rcl5PJ1LEZAKRAVW8RoowjoAoGCCqGSM49
-AwEHoUQDQgAEQWYkbiwYiAfpNgInoUvlvzjvH4Lsdg33FJkkceAc1FtGj5RFaKOJ
-NqTmXJGSjerhkw+4H1fmF27CGSWtyvEvbg==
+MHcCAQEEIPZvzmbhfmEXkl1HyALMGuaqGKS47Hm+7IqqgriWL1wMoAoGCCqGSM49
+AwEHoUQDQgAEmPa4+MCY0Bo8k71M8hOvR1j0iXihgXL+DlsrsL8/oK9ma7lF5Fq0
+4qWCbS6krnzR7DhNnZcCKz/rq3RVcoggjA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.der
index dd09459b95318a..563e726a332fa7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.pem
index e279a51ef351c4..2931a27db6fdcf 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIXoqbrYxCfoQwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIBlzAUh2wzhAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABAm/W/vQmOTGOpYqOqLBnPz+Jcmak3qXMg2Q6Tm7szbt/r7Rgqifje/PDoyu
-i/p0Bzug0HuhVzdawux0KazrvTujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUbercrJYTF6FWm+2hsMGb5Z5zjDAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-w71ShXgEnF/aVsymB9RCFbx63+qb2Aqekcjz1qr1ME8CIQCtk3+6/xOnMAGkCi2i
-PCoUdwMPLYNQ4FdTFJDX6qqPkA==
+A0IABPDZG4+R5nIhEvL4gCH/PgRzHWrxXtxO0DaMfp1AmLRC1De373WM5/7KjrEA
+yBkWwmzkm4sNOuHWxLjZbdeCO2qjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTaemel8iGGZmFHHoCKZSPdVYVoNDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+ipBGV/Q8jH5D8AKoEmOaORhwv6UbSCSB/0xQ6Py4jisCIEfvNzDZfSkZjPDFXoS3
+eNJnoW7xehDenGuTebN8On0g
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.der
index 4ab406e80d4b3a..739df128350941 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.pem
index 8f90d2a7ac2e41..0f510813fe78f4 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPFB/K9XgPgVxRUoLl8BdYCBP8d/VhzNtI8jqXEe6lq4oAoGCCqGSM49
-AwEHoUQDQgAECb9b+9CY5MY6lio6osGc/P4lyZqTepcyDZDpObuzNu3+vtGCqJ+N
-788OjK6L+nQHO6DQe6FXN1rC7HQprOu9Ow==
+MHcCAQEEIMxA4QzIjPihinesHCzkMtnxEMV3CvqJ9vdF/L1AAdm3oAoGCCqGSM49
+AwEHoUQDQgAE8Nkbj5HmciES8viAIf8+BHMdavFe3E7QNox+nUCYtELUN7fvdYzn
+/sqOsQDIGRbCbOSbiw064dbEuNlt14I7ag==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/test_case_vector.json
index c76a4a88331a4e..64a3e70734ecf2 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_prime256v1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Valid certificate public key curve prime256v1",
     "is_success_case": "true",
-    "dac_cert": "308201cd30820174a003020102020825ed238592d822a1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200044166246e2c188807e9360227a14be5bf38ef1f82ec760df714992471e01cd45b468f944568a38936a4e65c91928deae1930fb81f57e6176ec21925adcaf12f6ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143a27dc666bfa1dc993b3a94310488f96895227a8301f0603551d23041830168014d46deadcac961317a1569beda1b0c19be59e738c300a06082a8648ce3d040302034700304402205c63b8f2d56a34ac2f1dec80c2fe5cf010f4cf9b1d14d5be553a24a30405beb802203d523a10110eae67ffcf2b67bd0680f2994ea79dcaa5525c4a7f5248541523f0",
-    "pai_cert": "308201bf30820164a00302010202085e8a9bad8c427e84300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000409bf5bfbd098e4c63a962a3aa2c19cfcfe25c99a937a97320d90e939bbb336edfebed182a89f8defcf0e8cae8bfa74073ba0d07ba157375ac2ec7429acebbd3ba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d46deadcac961317a1569beda1b0c19be59e738c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c3bd528578049c5fda56cca607d44215bc7adfea9bd80a9e91c8f3d6aaf5304f022100ad937fbaff13a73001a40a2da23c2a1477030f2d8350e057531490d7eaaa8f90",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100d854c8b6a4c14cab504a6d038a4e1854e1f264fd6184a006ee3580d80225ff3e022100fcd80a6d4b462faf0f56f2048dbaf0c726f31bf21eeb6d4e7ad8b8a81afb3941",
-    "dac_private_key": "25e5e7ac8d2abbad54960ca60899a3fadc9793c9d4b11900a440556f11a28c23",
-    "dac_public_key": "044166246e2c188807e9360227a14be5bf38ef1f82ec760df714992471e01cd45b468f944568a38936a4e65c91928deae1930fb81f57e6176ec21925adcaf12f6e"
+    "dac_cert": "308201ce30820174a0030201020208034c3cf7ef307f83300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000498f6b8f8c098d01a3c93bd4cf213af4758f48978a18172fe0e5b2bb0bf3fa0af666bb945e45ab4e2a5826d2ea4ae7cd1ec384d9d97022b3febab74557288208ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b350bdf1aad4fb3d74eaa03c2abdb2764d6cd535301f0603551d23041830168014da7a67a5f221866661471e808a6523dd55856834300a06082a8648ce3d0403020348003045022100d692846be1b39c154cd0f5ef0536c7fcc0e21c5cb24ef1d7794e12209f184fe102201731bebf38c51acd3913b7612c92f69f5a3d8c42fa5a921c0e62865dc06a709d",
+    "pai_cert": "308201be30820164a0030201020208065cc0521db0ce10300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004f0d91b8f91e6722112f2f88021ff3e04731d6af15edc4ed0368c7e9d4098b442d437b7ef758ce7feca8eb100c81916c26ce49b8b0d3ae1d6c4b8d96dd7823b6aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414da7a67a5f221866661471e808a6523dd55856834301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221008a904657f43c8c7e43f002a812639a391870bfa51b482481ff4c50e8fcb88e2b022047ef3730d97d29198cf0c55e84b778d267a16ef17a10de9c6b9379b37c3a7d20",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210083107ee77d879acd4fc612dbb4d96f4ad5d40ccd7350b509f88f432f626f8ec7022100bfa421c220aa548d2fe939e4bdb4adb4e90194c89d9d93b79aa7c257de9bc8c0",
+    "dac_private_key": "f66fce66e17e6117925d47c802cc1ae6aa18a4b8ec79beec8aaa82b8962f5c0c",
+    "dac_public_key": "0498f6b8f8c098d01a3c93bd4cf213af4758f48978a18172fe0e5b2bb0bf3fa0af666bb945e45ab4e2a5826d2ea4ae7cd1ec384d9d97022b3febab74557288208c"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/cd.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/cd.der
index b4be37aef572ce..0f35986fce4795 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/cd.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.der
index f4b3f5219f3024..4ddc9edfaebe73 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.pem
index e8ff456c5961b1..25ea258b05650e 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIIx3qxdEWprowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIFZ8tuAyGiLYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARSzN6e2noEa+z5UbjFJNvCSKSyTNx/
-B0aC+2wbKLc9e9bFz4V6RFd0B+2K9CpZp4o7OEsZS60nj46TDdZaWx3po2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUPSD8QLwGwFQi
-USDSs0oh60v9nLIwHwYDVR0jBBgwFoAUkD7pKnucef2zVEHTSw4PsrjsRLIwCgYI
-KoZIzj0EAwIDSAAwRQIhAO2StFhjFCddYNUQvzhMiHsJypYiYUBKO8h7wyODh8KL
-AiAdahk+OKXVxOTXkd1reZc4CK2v2RXH+tI8xNDlmeCMQA==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATWi/R+R5siBgXjpKMauWGGCZUcvFo5
+Sn1c59j6bJd/Paw+MhNfhjr0ETPUJYnmckb5RHUI7xmsjCHuRZw4nMNQo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU0syvvMDpkPOn
+9J1fV61za6QBtIMwHwYDVR0jBBgwFoAUhTLE+vpOL4lhB+XpsVQOIIWXktgwCgYI
+KoZIzj0EAwIDSAAwRQIgYwCyWQe9H+HiqIubhXRoaBWkkxTbjRUfnt8LvzQuOyUC
+IQDJk7TG7BBv+H/HSPqXaZQgCwax0XbkTWWKtFsxUvfO5w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.der
index a2da7d21f7ab28..c7d11b100e5d83 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.pem
index 803b4f3391c525..2a5dc6a6af5237 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIB0W1S8T5fjhpkkAaIKnG3vFdwxMcqYBa6mOHwBBrLn8oAoGCCqGSM49
-AwEHoUQDQgAEUszentp6BGvs+VG4xSTbwkikskzcfwdGgvtsGyi3PXvWxc+FekRX
-dAftivQqWaeKOzhLGUutJ4+Okw3WWlsd6Q==
+MHcCAQEEIOkesvnVBybtsyZ9KSNpCB5aoarXJnWD8OYr8zdcaGeSoAoGCCqGSM49
+AwEHoUQDQgAE1ov0fkebIgYF46SjGrlhhgmVHLxaOUp9XOfY+myXfz2sPjITX4Y6
+9BEz1CWJ5nJG+UR1CO8ZrIwh7kWcOJzDUA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.der
index df4d907b851ccd..f9a40ed9eb459e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.pem
index 109d79355af5ff..84d2f2dbfe331c 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuzCCAWGgAwIBAgIIfAJDX8UChuwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
-MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
-UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBWMBAGByqGSM49AgEGBSuBBAAKA0IA
-BI5DQBVJOS27cySx3Y6AEAkScuMtT6JX431PpsWEiF4x8v3uf2F36r36XOwAk6FP
-M54hJ1s4Dvsnp7kvHc5fOPujZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBSQPukqe5x5/bNUQdNLDg+yuOxEsjAfBgNVHSME
-GDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA7Em3
-CtprvA68ajeJGVYWOYSsTCsgnIkIKAdO3kmxhYICIGet+Nh8wr1RFzm/12PhqrF/
-1mjg8d341KnYlLPNA3qw
+MIIBujCCAWCgAwIBAgIHbaNWtKchtjAKBggqhkjOPQQDAjAwMRgwFgYDVQQDDA9N
+YXR0ZXIgVGVzdCBQQUExFDASBgorBgEEAYKifAIBDARGRkYxMCAXDTIyMDkyMzAw
+MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjAwMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBQ
+QUkxFDASBgorBgEEAYKifAIBDARGRkYxMFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE
+U3aTQMIialfWc+n5mKP5A/oBfpvOkfSaO/XwZNlGTHp6lhhkpJMsW9z5++GepNol
+/vymC7xYtMTck7uoKtw3E6NmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8B
+Af8EBAMCAQYwHQYDVR0OBBYEFIUyxPr6Ti+JYQfl6bFUDiCFl5LYMB8GA1UdIwQY
+MBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0gAMEUCICKFQ1dN
+vUPaI/CE34hsYWGah2dJ4qZiJqtnxdVBVlzMAiEAl2pp1tB4XedtmFLBcsMrutv7
+JZoxTvE0sH/J68iA6dg=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.der
index b394fec4a1e21d..c9d3a5e5d24ad2 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.pem
index 0483e9ee367d17..72181dcfb0ceb0 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHQCAQEEIKW+Fw3wJ8iBr6l7cJiq042uPH3hhDD5nyqk8/6eFlKkoAcGBSuBBAAK
-oUQDQgAEjkNAFUk5LbtzJLHdjoAQCRJy4y1PolfjfU+mxYSIXjHy/e5/YXfqvfpc
-7ACToU8zniEnWzgO+yenuS8dzl84+w==
+MHQCAQEEIFi/L04c86dSOV+8QIidHmevJKdWWxs4sZkKHHStbJtgoAcGBSuBBAAK
+oUQDQgAEU3aTQMIialfWc+n5mKP5A/oBfpvOkfSaO/XwZNlGTHp6lhhkpJMsW9z5
+++GepNol/vymC7xYtMTck7uoKtw3Ew==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/test_case_vector.json
index 0d4c197d3eab33..3bb8980e1f7c19 100644
--- a/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Invalid certificate public key curve secp256k1",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a0030201020208231deac5d116a6ba300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000452ccde9eda7a046becf951b8c524dbc248a4b24cdc7f074682fb6c1b28b73d7bd6c5cf857a44577407ed8af42a59a78a3b384b194bad278f8e930dd65a5b1de9a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604143d20fc40bc06c054225120d2b34a21eb4bfd9cb2301f0603551d23041830168014903ee92a7b9c79fdb35441d34b0e0fb2b8ec44b2300a06082a8648ce3d0403020348003045022100ed92b4586314275d60d510bf384c887b09ca962261404a3bc87bc3238387c28b02201d6a193e38a5d5c4e4d791dd6b79973808adafd915c7fad23cc4d0e599e08c40",
-    "pai_cert": "308201bb30820161a00302010202087c02435fc50286ec300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313056301006072a8648ce3d020106052b8104000a034200048e43401549392dbb7324b1dd8e8010091272e32d4fa257e37d4fa6c584885e31f2fdee7f6177eabdfa5cec0093a14f339e21275b380efb27a7b92f1dce5f38fba366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414903ee92a7b9c79fdb35441d34b0e0fb2b8ec44b2301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ec49b70ada6bbc0ebc6a37891956163984ac4c2b209c890828074ede49b18582022067adf8d87cc2bd511739bfd763e1aab17fd668e0f1ddf8d4a9d894b3cd037ab0",
-    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100997d93cafbe9dc75bbd437842e91b433ce8d8b1d7018b6d2999beb50286d28240221009962b260124f74263e49ed4bdf240947d1796c089987b5079e3a8dbf763c0196",
-    "dac_private_key": "1d16d52f13e5f8e1a649006882a71b7bc5770c4c72a6016ba98e1f0041acb9fc",
-    "dac_public_key": "0452ccde9eda7a046becf951b8c524dbc248a4b24cdc7f074682fb6c1b28b73d7bd6c5cf857a44577407ed8af42a59a78a3b384b194bad278f8e930dd65a5b1de9"
+    "dac_cert": "308201ce30820174a0030201020208159f2db80c8688b6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004d68bf47e479b220605e3a4a31ab9618609951cbc5a394a7d5ce7d8fa6c977f3dac3e32135f863af41133d42589e67246f9447508ef19ac8c21ee459c389cc350a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d2ccafbcc0e990f3a7f49d5f57ad736ba401b483301f0603551d230418301680148532c4fafa4e2f896107e5e9b1540e20859792d8300a06082a8648ce3d040302034800304502206300b25907bd1fe1e2a88b9b8574686815a49314db8d151f9edf0bbf342e3b25022100c993b4c6ec106ff87fc748fa976994200b06b1d176e44d658ab45b3152f7cee7",
+    "pai_cert": "308201ba30820160a00302010202076da356b4a721b6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313056301006072a8648ce3d020106052b8104000a0342000453769340c2226a57d673e9f998a3f903fa017e9bce91f49a3bf5f064d9464c7a7a961864a4932c5bdcf9fbe19ea4da25fefca60bbc58b4c4dc93bba82adc3713a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148532c4fafa4e2f896107e5e9b1540e20859792d8301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450220228543574dbd43da23f084df886c61619a876749e2a66226ab67c5d541565ccc022100976a69d6d0785de76d9852c172c32bbadbfb259a314ef134b07fc9ebc880e9d8",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220420e4db19950c3e205c427e9678bb78f701a93c2caaaf5bf54f2a3506e0a6a0302201493ac9216695935d70aad5b06e835efa1b49da6b7de9ed83224fa1c707170b7",
+    "dac_private_key": "e91eb2f9d50726edb3267d292369081e5aa1aad7267583f0e62bf3375c686792",
+    "dac_public_key": "04d68bf47e479b220605e3a4a31ab9618609951cbc5a394a7d5ce7d8fa6c977f3dac3e32135f863af41133d42589e67246f9447508ef19ac8c21ee459c389cc350"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/cd.der
index 89385ffa520882..6cde4b3750f2e8 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.der
index a0b9a35183bb05..d545c439d482d5 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.pem
index c94fa70d240504..ca5f78e3027db8 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIZb0oEtn+N7swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIPBFiJdHGNwUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDEw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQaFYdy6J+BtDnhaimTC3g61er4e+cm
-QLkotGKhwyf5J8SGhTjhwl45WrJlRfdmbmis4bm8wPkYMQUG57OeMDPFo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUlS18tFJZrRMg
-6tN69fZN+OLI8y4wHwYDVR0jBBgwFoAU2jtauoMmpbKAU9He6sosyRmlXNYwCgYI
-KoZIzj0EAwIDSAAwRQIhALYDFofaHZisfDM3ZLo8+UIOOCnEYW4rLNOgLARYreN9
-AiAA07OZrILAzhZgShH2R24Zun1PKC72v9YcUIip+g048A==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQObTux9vBs5dsbauskWHM5+6rY+0C2
+E3VBGeLYx7ZUgBzR7MB8NJ7oi5pTSHzCAfk0fz4FZL5/YKTW6mHOF+o6o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU3w7xdc7OzEn4
+TitVg7nq3zSXqT8wHwYDVR0jBBgwFoAUq3aEUSZqIGSX0wTFWput37iv2TQwCgYI
+KoZIzj0EAwIDSAAwRQIhAIkk6kqVgf2GTNl2f1owyVtSboCP7e64H+5g5snj3ekD
+AiAG+MY3zuO0yvNCB7n8yMh4FkYHQP1zNYBRYUw8Q9V28A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.der
index 349c67721973cd..db19dd5fa43e31 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.pem
index 52b7da2faed178..72fec346ccd725 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJgufXgcb3fs3BpKAut0juCxVgskCI5TCdjmHyBY+4TWoAoGCCqGSM49
-AwEHoUQDQgAEGhWHcuifgbQ54Wopkwt4OtXq+HvnJkC5KLRiocMn+SfEhoU44cJe
-OVqyZUX3Zm5orOG5vMD5GDEFBueznjAzxQ==
+MHcCAQEEIPdslDSI5zEn+raOsF4NAaCQP7/P4rcOLuiQy4EcA87XoAoGCCqGSM49
+AwEHoUQDQgAEDm07sfbwbOXbG2rrJFhzOfuq2PtAthN1QRni2Me2VIAc0ezAfDSe
+6IuaU0h8wgH5NH8+BWS+f2Ck1uphzhfqOg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.der
index 59716bc684dc9f..459cee438d515b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.pem
index 06cb8eaa0bacb3..f977d7da4f6062 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIJINcet8PS9swCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIbE4C1PfuUawwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABOpb9gzWlLidNhrGmuxHZRfhK5w+B/7u6jSU7spauSwnu/3vXBSYPYAPBldW
-KdKnQvkfw8S2zJ0R0vzkpsOtAjyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTaO1q6gyalsoBT0d7qyizJGaVc1jAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-41N2IBiehgZDv3M1/h6tw4gk22srGrsIIW6vlYrle28CIQCcTkRF43QvZ0vEVXeJ
-KR6DKPuho9oP8pJfgh5cEJAy0A==
+A0IABCT4omaY98haaTWfu3JKBUhbfK+WR5aqpPAlE+eQoonzLVrdk+eP3CggqFXA
+JAecPXW/wkKyeaEzLsUW8wl/zHSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSrdoRRJmogZJfTBMVam63fuK/ZNDAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+wxx45epKgl78v8x1i52+lAHrM0df/ALo6cAb3voijksCIFwHY4fC15bjUJ4Kaprk
+mT7lbD0AsvBYzr/3totsWwl3
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.der
index cb9c0b42fc0f01..adcdf85353845e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.pem
index 2654608da86662..ab55c51cdf9008 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIChHNbFjpDcHssfz+zaQVGuVJ5qoGvHYJTsKsl/JYXQeoAoGCCqGSM49
-AwEHoUQDQgAE6lv2DNaUuJ02Gsaa7EdlF+ErnD4H/u7qNJTuylq5LCe7/e9cFJg9
-gA8GV1Yp0qdC+R/DxLbMnRHS/OSmw60CPA==
+MHcCAQEEIAQpAzzvJZ9/I+lZNkOT0HhcUlF4nYEHdvrlD68paStjoAoGCCqGSM49
+AwEHoUQDQgAEJPiiZpj3yFppNZ+7ckoFSFt8r5ZHlqqk8CUT55CiifMtWt2T54/c
+KCCoVcAkB5w9db/CQrJ5oTMuxRbzCX/MdA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/test_case_vector.json
index 37dea3454a72b5..d96f25dde02781 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: PID in Subject field doesn't match PID in Issuer field",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a003020102020865bd2812d9fe37bb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030313059301306072a8648ce3d020106082a8648ce3d030107034200041a158772e89f81b439e16a29930b783ad5eaf87be72640b928b462a1c327f927c4868538e1c25e395ab26545f7666e68ace1b9bcc0f918310506e7b39e3033c5a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414952d7cb45259ad1320ead37af5f64df8e2c8f32e301f0603551d23041830168014da3b5aba8326a5b28053d1deeaca2cc919a55cd6300a06082a8648ce3d0403020348003045022100b6031687da1d98ac7c333764ba3cf9420e3829c4616e2b2cd3a02c0458ade37d022000d3b399ac82c0ce16604a11f6476e19ba7d4f282ef6bfd61c5088a9fa0d38f0",
-    "pai_cert": "308201bf30820164a003020102020824835c7adf0f4bdb300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004ea5bf60cd694b89d361ac69aec476517e12b9c3e07feeeea3494eeca5ab92c27bbfdef5c14983d800f06575629d2a742f91fc3c4b6cc9d11d2fce4a6c3ad023ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414da3b5aba8326a5b28053d1deeaca2cc919a55cd6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100e3537620189e860643bf7335fe1eadc38824db6b2b1abb08216eaf958ae57b6f0221009c4e4445e3742f674bc4557789291e8328fba1a3da0ff2925f821e5c109032d0",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205018018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022064e084a8343b1917a7cad97e381a530e76fc9718d4733ddc6bec5dc5ae3f0e17022100ae5865c585fda20d61ce979ccf913daa0eae335ecdd1ceffbcd2a213a95efde5",
-    "dac_private_key": "982e7d781c6f77ecdc1a4a02eb748ee0b1560b24088e5309d8e61f2058fb84d6",
-    "dac_public_key": "041a158772e89f81b439e16a29930b783ad5eaf87be72640b928b462a1c327f927c4868538e1c25e395ab26545f7666e68ace1b9bcc0f918310506e7b39e3033c5"
+    "dac_cert": "308201ce30820174a00302010202083c116225d1c63705300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030313059301306072a8648ce3d020106082a8648ce3d030107034200040e6d3bb1f6f06ce5db1b6aeb24587339fbaad8fb40b613754119e2d8c7b654801cd1ecc07c349ee88b9a53487cc201f9347f3e0564be7f60a4d6ea61ce17ea3aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414df0ef175cececc49f84e2b5583b9eadf3497a93f301f0603551d23041830168014ab768451266a206497d304c55a9baddfb8afd934300a06082a8648ce3d04030203480030450221008924ea4a9581fd864cd9767f5a30c95b526e808fedeeb81fee60e6c9e3dde903022006f8c637cee3b4caf34207b9fcc8c87816460740fd73358051614c3c43d576f0",
+    "pai_cert": "308201be30820164a00302010202086c4e02d4f7ee51ac300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000424f8a26698f7c85a69359fbb724a05485b7caf964796aaa4f02513e790a289f32d5add93e78fdc2820a855c024079c3d75bfc242b279a1332ec516f3097fcc74a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ab768451266a206497d304c55a9baddfb8afd934301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100c31c78e5ea4a825efcbfcc758b9dbe9401eb33475ffc02e8e9c01bdefa228e4b02205c076387c2d796e3509e0a6a9ae4993ee56c3d00b2f058cebff7b68b6c5b0977",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205018018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c843fccfdd89f6d5cc457f1f58f5184c975b19fd1178312328563a606fb93f8702206ed82aa8d3824d3ea9434813a49ad731702ed69650cf9be09151272294945a96",
+    "dac_private_key": "f76c943488e73127fab68eb05e0d01a0903fbfcfe2b70e2ee890cb811c03ced7",
+    "dac_public_key": "040e6d3bb1f6f06ce5db1b6aeb24587339fbaad8fb40b613754119e2d8c7b654801cd1ecc07c349ee88b9a53487cc201f9347f3e0564be7f60a4d6ea61ce17ea3a"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/cd.der b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/cd.der
index 1a35916f0e1e15..179fe308148ab0 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/cd.der and b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.der
index d17f881e239827..68f049e3bbac89 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.pem
index 5d2ffab81c57ed..afd495c95363d2 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIIf8ziuI8CBNwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjAgFw0yMjA1Mjcw
+MIIBzjCCAXSgAwIBAgIIZ8FC+X9Sk4MwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 REFDMRQwEgYKKwYBBAGConwCAQwERkZGMjEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASL6mZHIyJkidTMs+tm6AgVQru+1vjx
-cc7lFCeVW7k2Xd/bjqjZfzmIQGIyr63yXNTKZNKPN33UPh6QB9rCh/L8o2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU7z/3NGrixu5J
-AUnKzGYqDl8DbHswHwYDVR0jBBgwFoAUmdXLe5AREtNwFOsnMmB1mnkOn2UwCgYI
-KoZIzj0EAwIDSAAwRQIgP4rJXdNl2UJQnAvDm+kgWIlO9UcWBnCaKugqPRyYjmoC
-IQCpZRtuB87eQkQlapxJMFoj4BIvq5u/Xcf4vc/y04lGrw==
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR+jSmtvSeQGv0rqI7oEnq0iQq7WIOi
+gGmgmzr1OzB90eD1MLo2oKFk/MPqwjAyZimlnrMwtr0djPNPkqVOGH5so2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU1aFixTDuCWlc
+Z1E5IRPk9chZqYowHwYDVR0jBBgwFoAUQbRbQImRiGrKx1r+t4CEXJPO6g8wCgYI
+KoZIzj0EAwIDSAAwRQIhAIzkrty9sJSI+YIFu9AT+YbwI9QC//zi4HlQWyWhRCJ9
+AiAd5T013P768IY+IYfpCoSxds8/Xx5NkVxw7cNFrgghuA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.der
index 9cee875e7774b9..137a3331065b80 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.pem
index e2a9ed8351a063..0df0b462424818 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPXTFWjFqpEgb2l4hK8eDt/evQ/2laHrlSKVVSRhkQdgoAoGCCqGSM49
-AwEHoUQDQgAEi+pmRyMiZInUzLPrZugIFUK7vtb48XHO5RQnlVu5Nl3f246o2X85
-iEBiMq+t8lzUymTSjzd91D4ekAfawofy/A==
+MHcCAQEEID7ZQDk7VFpqA1X0CnnMlOlTbGbUmaPb3gZX4ePmWBbSoAoGCCqGSM49
+AwEHoUQDQgAEfo0prb0nkBr9K6iO6BJ6tIkKu1iDooBpoJs69TswfdHg9TC6NqCh
+ZPzD6sIwMmYppZ6zMLa9HYzzT5KlThh+bA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.der
index 14ebb5c3d2252d..b382287d549489 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.pem
index e6f59453b0a18e..e41966147f98e4 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIGEjQ/SahnjswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWSgAwIBAgIIF47hS7x2kz4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
 UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMjBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABBq6lN5/b1eL2Q2rY1SYaC8W4nbFb7lVJ2vbQBIwt+S0rSfuopJIPispHaJ8
-6qXzAhc1FY7UVRs9/A6FJGu7QZ2jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSZ1ct7kBES03AU6ycyYHWaeQ6fZTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-jdfDjCnlGWwtKgD4GgeyS4/UmgFsVGzog4BPycTnNZICIQDTa7n22auhlg1IPknV
-toniOEOKQ/PtqXwURXpP8mHf/g==
+A0IABHdzHr4k0PeImQKEPHs3w6oF9l88Un086+4IOKnt2o7E2x7K5K1nG4rN8RVl
+TQMpdahXgmALk3iWqdad4aUPXAyjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRBtFtAiZGIasrHWv63gIRck87qDzAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+/WlmAX34RwHnPBBchi+95zDgIQH4bEo/Te1pozriJfECIBzeDk2vtm9CbUpe9W/i
+F2+IUrUfie7da1FlYEO/QASN
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.der
index 2592543e33a6ce..8dbdffb7448300 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.pem
index 9a9504d3904509..4e7a251b842321 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGn3yFbaUA+mZol8df2PoY7/Ah7zIFvbnm8yiOpMBvgwoAoGCCqGSM49
-AwEHoUQDQgAEGrqU3n9vV4vZDatjVJhoLxbidsVvuVUna9tAEjC35LStJ+6ikkg+
-KykdonzqpfMCFzUVjtRVGz38DoUka7tBnQ==
+MHcCAQEEIERazRUotPO62gVa+cDLyDhc7wXLTnOBgUAUs982+69DoAoGCCqGSM49
+AwEHoUQDQgAEd3MeviTQ94iZAoQ8ezfDqgX2XzxSfTzr7gg4qe3ajsTbHsrkrWcb
+is3xFWVNAyl1qFeCYAuTeJap1p3hpQ9cDA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/test_case_vector.json
index 8f044d5626642a..c274c22d7538c9 100644
--- a/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: VID in Subject field doesn't match VID in Issuer field",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202087fcce2b88f0204dc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646323020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048bea664723226489d4ccb3eb66e8081542bbbed6f8f171cee51427955bb9365ddfdb8ea8d97f3988406232afadf25cd4ca64d28f377dd43e1e9007dac287f2fca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ef3ff7346ae2c6ee490149cacc662a0e5f036c7b301f0603551d2304183016801499d5cb7b901112d37014eb273260759a790e9f65300a06082a8648ce3d040302034800304502203f8ac95dd365d942509c0bc39be92058894ef5471606709a2ae82a3d1c988e6a022100a9651b6e07cede4244256a9c49305a23e0122fab9bbf5dc7f8bdcff2d38946af",
-    "pai_cert": "308201bf30820164a00302010202081848d0fd26a19e3b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646323059301306072a8648ce3d020106082a8648ce3d030107034200041aba94de7f6f578bd90dab635498682f16e276c56fb955276bdb401230b7e4b4ad27eea292483e2b291da27ceaa5f3021735158ed4551b3dfc0e85246bbb419da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041499d5cb7b901112d37014eb273260759a790e9f65301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221008dd7c38c29e5196c2d2a00f81a07b24b8fd49a016c546ce883804fc9c4e73592022100d36bb9f6d9aba1960d483e49d5b689e238438a43f3eda97c14457a4ff261dffe",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f2ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044630440220308494c2d41f21fa850b137ae8d3b18c818e3f77cd46552799808ad7e7d791ab022024315c8f6f78530b380fab3f432f77e2723239046a03e6ac4dadbf86ceea8924",
-    "dac_private_key": "f5d31568c5aa91206f697884af1e0edfdebd0ff695a1eb952295552461910760",
-    "dac_public_key": "048bea664723226489d4ccb3eb66e8081542bbbed6f8f171cee51427955bb9365ddfdb8ea8d97f3988406232afadf25cd4ca64d28f377dd43e1e9007dac287f2fc"
+    "dac_cert": "308201ce30820174a003020102020867c142f97f529383300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646323020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200047e8d29adbd27901afd2ba88ee8127ab4890abb5883a28069a09b3af53b307dd1e0f530ba36a0a164fcc3eac230326629a59eb330b6bd1d8cf34f92a54e187e6ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d5a162c530ee09695c6751392113e4f5c859a98a301f0603551d2304183016801441b45b408991886acac75afeb780845c93ceea0f300a06082a8648ce3d04030203480030450221008ce4aedcbdb09488f98205bbd013f986f023d402fffce2e079505b25a144227d02201de53d35dcfefaf0863e2187e90a84b176cf3f5f1e4d915c70edc345ae0821b8",
+    "pai_cert": "308201be30820164a0030201020208178ee14bbc76933e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646323059301306072a8648ce3d020106082a8648ce3d0301070342000477731ebe24d0f7889902843c7b37c3aa05f65f3c527d3cebee0838a9edda8ec4db1ecae4ad671b8acdf115654d032975a85782600b937896a9d69de1a50f5c0ca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041441b45b408991886acac75afeb780845c93ceea0f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100fd6966017df84701e73c105c862fbde730e02101f86c4a3f4ded69a33ae225f102201cde0e4dafb66f426d4a5ef56fe2176f8852b51f89eedd6b51656043bf40048d",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f2ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022016558fc85fa9ddc2b6a8fd315465288e10df64a4fa5c7df97a4d4ad5d718624b0220369af39142dd44abc12fc1b9f9acd8896bede8f4325ba5aad422133adaea0be5",
+    "dac_private_key": "3ed940393b545a6a0355f40a79cc94e9536c66d499a3dbde0657e1e3e65816d2",
+    "dac_public_key": "047e8d29adbd27901afd2ba88ee8127ab4890abb5883a28069a09b3af53b307dd1e0f530ba36a0a164fcc3eac230326629a59eb330b6bd1d8cf34f92a54e187e6c"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/cd.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/cd.der
index f6e033a3c9c8ea..b6af7bacf9baf9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_valid_in_future/cd.der and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.der
index daae9bc57d9c28..3d6d8e707c7bbf 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.pem
index 5374feea9d99aa..016ce5437fd573 100644
--- a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzjCCAXSgAwIBAgIINUXeObnulDYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw
-MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
-REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARC2bKsgzrrD4NfrMC/cy1NR64fLDkn
-AbGgAZ04c3j8kTM5JpNzJizLCoIfQEsrvzT/cKM05WrCUD1tpvSRT2Gjo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUBXTgpJcmW04c
-ADb7T2869dJ0BogwHwYDVR0jBBgwFoAUVgxxvkgr/bx4gspWRGmZNkP/PJUwCgYI
-KoZIzj0EAwIDSAAwRQIgG8SmsG70/+AmfLac3pJCeWTj9HOQKi2HzAmACQK6JyoC
-IQCnCKT688LV0mmSpZLid0KYl192il4v74IW89HL7qLZ9Q==
+MIIBzDCCAXKgAwIBAgIIRUptyemil0owCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAeFw0yMjA5Mjgx
+NDIzNDNaFw0yNDA5MjcxNDIzNDJaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IERB
+QzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQ4MDAwMFkw
+EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAELedYpw6tWI2wqmeecheP4ykbXmqFD3mU
+vJxKevb8/9L/EURhspuG72v8ASCLg3QNvPEf3qTRoZb5iJa7QovYO6NgMF4wDAYD
+VR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFMg+yRwqSity8CPL
+pXq4rr0UUNKrMB8GA1UdIwQYMBaAFBtSg1sK6hsMpkHirDB6QjWe/Dc/MAoGCCqG
+SM49BAMCA0gAMEUCIQCrgD2yLzl/1yA80ZbkenG+QEcZpYJCm+Izj8QxS7QXFwIg
+TIR4NcPu9X+Ny24t02Hfi1dk19aCoKOT0FaDTwxvtu4=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.der
index ea4dcf248ed022..0cdf1152a1b256 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.pem
index 103036b3452d36..ab1edd7c3de11b 100644
--- a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEID3cVEubgyJnOckFJtVwy9jdAMjrzK59SeK8Z5QW0n6voAoGCCqGSM49
-AwEHoUQDQgAEQtmyrIM66w+DX6zAv3MtTUeuHyw5JwGxoAGdOHN4/JEzOSaTcyYs
-ywqCH0BLK780/3CjNOVqwlA9bab0kU9how==
+MHcCAQEEILocAMLktgm6KstXyPz02/brDMTzR07bzBlPqiwLTcw6oAoGCCqGSM49
+AwEHoUQDQgAELedYpw6tWI2wqmeecheP4ykbXmqFD3mUvJxKevb8/9L/EURhspuG
+72v8ASCLg3QNvPEf3qTRoZb5iJa7QovYOw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.der
index b0a95223737df6..a86ea66983faae 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.pem
index 8a9d68b91280ab..5a7df576affb86 100644
--- a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWSgAwIBAgIIIAWHpDSRw+wwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0zMTA2Mjgx
-NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
-UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABCblK8SbyesXS0P8r+hJyv7+8wLEDQUFn919zJaKZLtN3wMPJhvfoK/ixGjx
-hYxs+KXP1y9342aJV6ZsZYaFh9WjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRWDHG+SCv9vHiCylZEaZk2Q/88lTAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
-kqG/Pfim+54OYW7ODwhPSs5xlnlPFXV1xtruaq8qkMMCIQDR0tRNp4I/+ohgyok0
-mKqVzIu87Wo8AwXgoHki1LR9Cg==
+MIIBvDCCAWKgAwIBAgIIbyMTKWTFAvowCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAeFw0zMTA2Mjgx
+NDIzNDNaFw0zMzA2MjcxNDIzNDJaMDAxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBB
+STEUMBIGCisGAQQBgqJ8AgEMBEZGRjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
+AAR45VZ6p8+lN1mqZF4ojoq1DMNVcj6YprkYn++u2HBIkXwpSxBuxHig8mSvwFpd
+fx77V9Y+vDq+7MC0hFSlxdOAo2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUG1KDWwrqGwymQeKsMHpCNZ78Nz8wHwYDVR0j
+BBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZIzj0EAwIDSAAwRQIhAJyt
+YosrgDYfqwJdJgfKm0QmLt6W7Sbs7ULTuluCdrT6AiAinLT6OfnjnnRiPOhmEqMF
+Vbnwpuz+Lvhbdf6XvhSN2w==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.der
index 63ff4e13760dcc..87fbc3b686b737 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.pem
index a96a6024cd14a7..194d15e69bbf33 100644
--- a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIH7wht0SaCGVV+tkUGcCoTWe79NzAYQIK1NVUase0QG2oAoGCCqGSM49
-AwEHoUQDQgAEJuUrxJvJ6xdLQ/yv6EnK/v7zAsQNBQWf3X3Mlopku03fAw8mG9+g
-r+LEaPGFjGz4pc/XL3fjZolXpmxlhoWH1Q==
+MHcCAQEEIHM4vH60E6B6ZlL/33fdEBwaKAiNfXMkSDjMYWOVPOSGoAoGCCqGSM49
+AwEHoUQDQgAEeOVWeqfPpTdZqmReKI6KtQzDVXI+mKa5GJ/vrthwSJF8KUsQbsR4
+oPJkr8BaXX8e+1fWPrw6vuzAtIRUpcXTgA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_valid_in_future/test_case_vector.json
index 5115b95a9ff111..36ad3a635b65e1 100644
--- a/credentials/development/commissioner_dut/struct_pai_valid_in_future/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate validity period starts in the future",
     "is_success_case": "false",
-    "dac_cert": "308201ce30820174a00302010202083545de39b9ee9436300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000442d9b2ac833aeb0f835facc0bf732d4d47ae1f2c392701b1a0019d387378fc913339269373262ccb0a821f404b2bbf34ff70a334e56ac2503d6da6f4914f61a3a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140574e0a497265b4e1c0036fb4f6f3af5d2740688301f0603551d23041830168014560c71be482bfdbc7882ca564469993643ff3c95300a06082a8648ce3d040302034800304502201bc4a6b06ef4ffe0267cb69cde92427964e3f473902a2d87cc09800902ba272a022100a708a4faf3c2d5d26992a592e2774298975f768a5e2fef8216f3d1cbeea2d9f5",
-    "pai_cert": "308201bf30820164a0030201020208200587a43491c3ec300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3331303632383134323334335a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000426e52bc49bc9eb174b43fcafe849cafefef302c40d05059fdd7dcc968a64bb4ddf030f261bdfa0afe2c468f1858c6cf8a5cfd72f77e3668957a66c65868587d5a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414560c71be482bfdbc7882ca564469993643ff3c95301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210092a1bf3df8a6fb9e0e616ece0f084f4ace7196794f157575c6daee6aaf2a90c3022100d1d2d44da7823ffa8860ca893498aa95cc8bbced6a3c0305e0a07922d4b47d0a",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022040c1ccd18748a33c8a1a4085c1860f5578c91a926f3ff6f7fddf7d9c8d7226d1022051cedb3515d9130927802192e75a1fa212b960401674b443ee9e9bab4bbe6a87",
-    "dac_private_key": "3ddc544b9b83226739c90526d570cbd8dd00c8ebccae7d49e2bc679416d27eaf",
-    "dac_public_key": "0442d9b2ac833aeb0f835facc0bf732d4d47ae1f2c392701b1a0019d387378fc913339269373262ccb0a821f404b2bbf34ff70a334e56ac2503d6da6f4914f61a3"
+    "dac_cert": "308201cc30820172a0030201020208454a6dc9e9a2974a300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c0446464631301e170d3232303932383134323334335a170d3234303932373134323334325a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200042de758a70ead588db0aa679e72178fe3291b5e6a850f7994bc9c4a7af6fcffd2ff114461b29b86ef6bfc01208b83740dbcf11fdea4d1a196f98896bb428bd83ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c83ec91c2a4a2b72f023cba57ab8aebd1450d2ab301f0603551d230418301680141b52835b0aea1b0ca641e2ac307a42359efc373f300a06082a8648ce3d0403020348003045022100ab803db22f397fd7203cd196e47a71be404719a582429be2338fc4314bb4171702204c847835c3eef57f8dcb6e2dd361df8b5764d7d682a0a393d056834f0c6fb6ee",
+    "pai_cert": "308201bc30820162a00302010202086f23132964c502fa300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c0446464631301e170d3331303632383134323334335a170d3333303632373134323334325a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000478e5567aa7cfa53759aa645e288e8ab50cc355723e98a6b9189fefaed87048917c294b106ec478a0f264afc05a5d7f1efb57d63ebc3abeecc0b48454a5c5d380a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604141b52835b0aea1b0ca641e2ac307a42359efc373f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203480030450221009cad628b2b80361fab025d2607ca9b44262ede96ed26eced42d3ba5b8276b4fa0220229cb4fa39f9e39e74623ce86612a30555b9f0a6ecfe2ef85b75fe97be148ddb",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220119f54818c1ab5e24f23be069a8e552a96aa2627bb5b431ec3769216822c96e7022100a8bfc1afcc6e3dcbd93faf9c93ac93e690fbe2558fdf22716a0c0933e03a1687",
+    "dac_private_key": "ba1c00c2e4b609ba2acb57c8fcf4dbf6eb0cc4f3474edbcc194faa2c0b4dcc3a",
+    "dac_public_key": "042de758a70ead588db0aa679e72178fe3291b5e6a850f7994bc9c4a7af6fcffd2ff114461b29b86ef6bfc01208b83740dbcf11fdea4d1a196f98896bb428bd83b"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/cd.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/cd.der
index cb6555be037cc5..45d3ba534f1914 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_valid_in_past/cd.der and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.der
index c178c6aee01b92..fcd2a8c2ab9fa8 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.pem
index 9861fbe051d653..deb78ee37bbf19 100644
--- a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXSgAwIBAgIIAzh3GKRPeSIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw
-MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
-REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASGNhiEzu1Nm2NPYt0qHFiDitHMuQXM
-NW8Tqb4BSqBefVoSdB7pMMPKsFiltjkkst0GPOVYfnVCDc8T1rHLYhjRo2AwXjAM
-BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU5j2AINpYLELe
-iWoKio8yNPwar/QwHwYDVR0jBBgwFoAUnlDkAxmNkJ5WoKbiieGY5914qrYwCgYI
-KoZIzj0EAwIDRwAwRAIgDqpLJJdwnIWrj/7GeYsovkrrkd1J1nDrscBp7nGsnKgC
-IDbq6Z0hqWMkXPGfvLq4yB/3ImWNOytbsDOF9+YoUT9y
+MIIBzDCCAXKgAwIBAgIIBKE3fQCm2WIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAeFw0yMjA5Mjgx
+NDIzNDNaFw0yNDA5MjcxNDIzNDJaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IERB
+QzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQ4MDAwMFkw
+EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEi4+rWSFo9E5HtuXbMluY976YiTWIuuSj
+fQ4UxsTDayj5A95V64sgc4z5Qc3F0ctmR5iRbCwScq2QJAtQQcXoQqNgMF4wDAYD
+VR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFKCIc7wi99OxLAQT
+sfxLyQeglgXxMB8GA1UdIwQYMBaAFM6vsoAMVC5ceiXBkn9n/MniTcMXMAoGCCqG
+SM49BAMCA0gAMEUCIFtZ7zD7UBEmr9EfswmCLEWgMof+wMcJ7TK7uXf0e/DZAiEA
+yYZHteM6apHkytr7ZvtJdKbU3bKgRPjuzmVYUuWOKOM=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.der
index 384108f7d00186..4054931c5e8710 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.pem
index cb0dddc49c22fc..d43988ec6178f9 100644
--- a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOkpVGVymlFSxwTrHLW9jPJEdNDVRCk7OeI7OgHMsaC4oAoGCCqGSM49
-AwEHoUQDQgAEhjYYhM7tTZtjT2LdKhxYg4rRzLkFzDVvE6m+AUqgXn1aEnQe6TDD
-yrBYpbY5JLLdBjzlWH51Qg3PE9axy2IY0Q==
+MHcCAQEEIB1EOWlkuyRxpVDEheCRx2rJmfLKLsazrdNBGohLy0XcoAoGCCqGSM49
+AwEHoUQDQgAEi4+rWSFo9E5HtuXbMluY976YiTWIuuSjfQ4UxsTDayj5A95V64sg
+c4z5Qc3F0ctmR5iRbCwScq2QJAtQQcXoQg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.der
index 5b9d48a00c0798..f95b14c9794e6f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.pem
index 89a646b39013c3..d3a8ccc065950d 100644
--- a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWSgAwIBAgIIWxl2V64Pys8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMTA2Mjgx
-NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
-UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABLE8m7IlP/47B8ve/nBbLuI89Q8Sh54oENkAN+J+4hOkZ/Aq50Uh8/aOK6Zu
-WF8PMrd5z474vPlsT0cXVTgUpK6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSeUOQDGY2QnlagpuKJ4Zjn3XiqtjAfBgNV
-HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAY
-S1vVbraCM62P6PczOuGdZVgKdv4IOP6RfU+T7lpcCgIgfRuTnP2JVuD/JQApmy2p
-F7ZAgXXl/jv4hWjTO59L/Tg=
+MIIBvDCCAWKgAwIBAgIISYJx9pDRQtEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAeFw0yMDA2Mjgx
+NDIzNDNaFw0yMjA2MjgxNDIzNDJaMDAxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBB
+STEUMBIGCisGAQQBgqJ8AgEMBEZGRjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
+AARfZd869BROTSqN/2hiABGlok8ACBRkKBUipHgjuEvDjmR9Dr8g0XL6amwPgQv6
+8CrWBG5xsfm/tw84L7pGlLmwo2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUzq+ygAxULlx6JcGSf2f8yeJNwxcwHwYDVR0j
+BBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZIzj0EAwIDSAAwRQIhAN1I
+nUNygDCbOduwGnbDvm4YxVx2kT30Vduf1LmT5wI3AiAC4MLTMft6vgaE70ZxWb7e
+elf6ajIS+G2SXJC+HTP97A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.der
index b08d04fe680fb7..b66b99b5622de2 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.pem
index 3505a1d3b7471c..15b7c9163450f2 100644
--- a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEII6tJ++vRDrh8n6WL7RJysPA8x/kugv8UpHU7swwmU9joAoGCCqGSM49
-AwEHoUQDQgAEsTybsiU//jsHy97+cFsu4jz1DxKHnigQ2QA34n7iE6Rn8CrnRSHz
-9o4rpm5YXw8yt3nPjvi8+WxPRxdVOBSkrg==
+MHcCAQEEIJVy7dAL5TAPL2Ll5ZiPGqUWA5A3YS343lCn27sKdmYvoAoGCCqGSM49
+AwEHoUQDQgAEX2XfOvQUTk0qjf9oYgARpaJPAAgUZCgVIqR4I7hLw45kfQ6/INFy
++mpsD4EL+vAq1gRucbH5v7cPOC+6RpS5sA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_valid_in_past/test_case_vector.json
index 4d6edf368d6c88..0f1e2e64544159 100644
--- a/credentials/development/commissioner_dut/struct_pai_valid_in_past/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Certificate validity period starts in the past",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820174a003020102020803387718a44f7922300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000486361884ceed4d9b634f62dd2a1c58838ad1ccb905cc356f13a9be014aa05e7d5a12741ee930c3cab058a5b63924b2dd063ce5587e75420dcf13d6b1cb6218d1a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e63d8020da582c42de896a0a8a8f3234fc1aaff4301f0603551d230418301680149e50e403198d909e56a0a6e289e198e7dd78aab6300a06082a8648ce3d040302034700304402200eaa4b2497709c85ab8ffec6798b28be4aeb91dd49d670ebb1c069ee71ac9ca8022036eae99d21a963245cf19fbcbab8c81ff722658d3b2b5bb03385f7e628513f72",
-    "pai_cert": "308201bd30820164a00302010202085b197657ae0fcacf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3231303632383134323334335a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004b13c9bb2253ffe3b07cbdefe705b2ee23cf50f12879e2810d90037e27ee213a467f02ae74521f3f68e2ba66e585f0f32b779cf8ef8bcf96c4f4717553814a4aea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604149e50e403198d909e56a0a6e289e198e7dd78aab6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220184b5bd56eb68233ad8fe8f7333ae19d65580a76fe0838fe917d4f93ee5a5c0a02207d1b939cfd8956e0ff2500299b2da917b6408175e5fe3bf88568d33b9f4bfd38",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022065588a5c17483f8509ab39305d5aea5f23b626a756d6e70a7d484e18aef8f2a5022100b2cad7017e7b3d4df69746347ec04b16e0adadbe38eaaa0f849b74cbd53074f6",
-    "dac_private_key": "e9295465729a5152c704eb1cb5bd8cf24474d0d544293b39e23b3a01ccb1a0b8",
-    "dac_public_key": "0486361884ceed4d9b634f62dd2a1c58838ad1ccb905cc356f13a9be014aa05e7d5a12741ee930c3cab058a5b63924b2dd063ce5587e75420dcf13d6b1cb6218d1"
+    "dac_cert": "308201cc30820172a003020102020804a1377d00a6d962300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c0446464631301e170d3232303932383134323334335a170d3234303932373134323334325a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d030107034200048b8fab592168f44e47b6e5db325b98f7be98893588bae4a37d0e14c6c4c36b28f903de55eb8b20738cf941cdc5d1cb664798916c2c1272ad90240b5041c5e842a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a08873bc22f7d3b12c0413b1fc4bc907a09605f1301f0603551d23041830168014ceafb2800c542e5c7a25c1927f67fcc9e24dc317300a06082a8648ce3d040302034800304502205b59ef30fb501126afd11fb309822c45a03287fec0c709ed32bbb977f47bf0d9022100c98647b5e33a6a91e4cadafb66fb4974a6d4ddb2a044f8eece655852e58e28e3",
+    "pai_cert": "308201bc30820162a0030201020208498271f690d142d1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c0446464631301e170d3230303632383134323334335a170d3232303632383134323334325a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200045f65df3af4144e4d2a8dff68620011a5a24f00081464281522a47823b84bc38e647d0ebf20d172fa6a6c0f810bfaf02ad6046e71b1f9bfb70f382fba4694b9b0a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414ceafb2800c542e5c7a25c1927f67fcc9e24dc317301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100dd489d437280309b39dbb01a76c3be6e18c55c76913df455db9fd4b993e70237022002e0c2d331fb7abe0684ef467159bede7a57fa6a3212f86d925c90be1d33fdec",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402205dc619e5096ea45ea834b77bd680e9d766ea79bf537f77def6048eeead88696802202f6ed57530098471cb085fd2d10e32088abf227e066178fda7dc78a77ca0f244",
+    "dac_private_key": "1d44396964bb2471a550c485e091c76ac999f2ca2ec6b3add3411a884bcb45dc",
+    "dac_public_key": "048b8fab592168f44e47b6e5db325b98f7be98893588bae4a37d0e14c6c4c36b28f903de55eb8b20738cf941cdc5d1cb664798916c2c1272ad90240b5041c5e842"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/cd.der
index ba3dbf3bf442ca..99f49738784d33 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.der
index 256cafb67e1afa..82ea9a9a038e10 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.pem
index 4318e84fe9665b..64f174b0c38ea6 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAYGgAwIBAgIIJQ8BuhJNXv0wCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
+MIIB2jCCAYGgAwIBAgIIB1uS5Oa4ToIwCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOjAw
-QjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
+QjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
 D01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEE
-AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4waCV1BAhAWt
-78SKb433Iy/dOgW1N9cbxW+9CWwH40aec9UhWOwurYe66HEtQHGWbrZrd4KGsuz0
-LvG9XVlJnKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFBK9OL690jRmiY8lfdFr7z7u/yZnMB8GA1UdIwQYMBaAFHGDWvcgqiLCZy1t
-wbrDqNbGK/N9MAoGCCqGSM49BAMCA0cAMEQCIEFIJriLRnf2vk1xFUAuzq0axPyV
-eEc+PGze+XNG9fmcAiAWfymI1uEVpcQcNHE3HFw4abrDkM64VIUeJcnOg09ODg==
+AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEwX/GUJrlpZQk
+88cIwGCPt6bAMV4R1LIiXRva+pCGw6FECNpJ2cILZ+/z1oLz0EyXC2xPY1og1BeD
+SBvy/0nuAaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFLuhDks44sDiRgUehHFeW69qE/1gMB8GA1UdIwQYMBaAFI37Yspqa8SKyS7B
+rGojcf5P4yZ+MAoGCCqGSM49BAMCA0cAMEQCIFews9B8qd/xA/Zm0yUCgEYgAWhF
+G1mfCRqPyuUEMO50AiBXVXtr6i1qiUWng7FbS5VpfYFbsfT8mfIXTOYjB+zWkg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.der
index 59caf986bb91a9..a53a4a613437a9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.pem
index e1ee5656eea04b..ee656edf55db63 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIhKu1RghFNS/kNj172YmDqGy3IicI14x4uL2gVhr0YkoAoGCCqGSM49
-AwEHoUQDQgAE4waCV1BAhAWt78SKb433Iy/dOgW1N9cbxW+9CWwH40aec9UhWOwu
-rYe66HEtQHGWbrZrd4KGsuz0LvG9XVlJnA==
+MHcCAQEEIKuErtot2Ufl/mtKvB0N5o85JhS95syeqSyuxvsXhtTwoAoGCCqGSM49
+AwEHoUQDQgAEwX/GUJrlpZQk88cIwGCPt6bAMV4R1LIiXRva+pCGw6FECNpJ2cIL
+Z+/z1oLz0EyXC2xPY1og1BeDSBvy/0nuAQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.der
index edbad1c3da59c3..5b8b4fe73f0bc2 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.pem
index bf2544a68ecde5..3102259dcb86da 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXGgAwIBAgIIBSo15jCWP34wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzDCCAXGgAwIBAgIIF5gCKzP789UwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPTE7MDkGA1UEAwwyQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOjAwQjEwWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAAQDBQDpz5rsUCpFh6DtSYS3XrcznmjheBhsVYJHa6W0
-KLDeK7US8kzhTJXybqrAtXVEsJevlaXkgdbk+LTdjYfso2YwZDASBgNVHRMBAf8E
-CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcYNa9yCqIsJnLW3B
-usOo1sYr830wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
-zj0EAwIDSQAwRgIhAJ2tpEnJkDNNHvOZvOITJBjqBxpJfXU8SbFiQFH9MchEAiEA
-pHjjzDDoPiwBkwfLYtibXAIP/cD2fhFrdPHLwnr+c+U=
+PQIBBggqhkjOPQMBBwNCAAS8NPp/yepJsnMeZcHXjhO+Ea8k52Mc02KSujp9a9tW
+k0cXYRFwucmJ9k1bdVcIH7OmUEs6RDdyUoz8XQvyaZ2So2YwZDASBgNVHRMBAf8E
+CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUjftiymprxIrJLsGs
+aiNx/k/jJn4wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
+zj0EAwIDSQAwRgIhAKAJD919vcUSghZsyzEOqfrB4JkjW91g1FQ2boidKHsXAiEA
+jYbSz2Pm41GgGFxTVxhv2G4HiJWBDjqKDhrxwcyL4Ko=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.der
index bcb5ec9f34fb4f..405885e9d9f357 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.pem
index ab2b9545360216..00308c48532bc4 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINCvNYfpxhh3c3YaxdcTr9yGJ0NeeM5hOXUlbBL6AgkfoAoGCCqGSM49
-AwEHoUQDQgAEAwUA6c+a7FAqRYeg7UmEt163M55o4XgYbFWCR2ultCiw3iu1EvJM
-4UyV8m6qwLV1RLCXr5Wl5IHW5Pi03Y2H7A==
+MHcCAQEEIAmyDPTImrGWDagDBv0PzsiGDUFN0rbqyYaPEtdv/yqtoAoGCCqGSM49
+AwEHoUQDQgAEvDT6f8nqSbJzHmXB144TvhGvJOdjHNNikro6fWvbVpNHF2ERcLnJ
+ifZNW3VXCB+zplBLOkQ3clKM/F0L8mmdkg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/test_case_vector.json
index 2f6f675516c753..18b22bc258ddfc 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_01/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: valid and recommended since easily human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201da30820181a0030201020208250f01ba124d5efd300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004e306825750408405adefc48a6f8df7232fdd3a05b537d71bc56fbd096c07e3469e73d52158ec2ead87bae8712d4071966eb66b778286b2ecf42ef1bd5d59499ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041412bd38bebdd23466898f257dd16bef3eeeff2667301f0603551d2304183016801471835af720aa22c2672d6dc1bac3a8d6c62bf37d300a06082a8648ce3d04030203470030440220414826b88b4677f6be4d7115402ecead1ac4fc9578473e3c6cdef97346f5f99c0220167f2988d6e115a5c41c3471371c5c3869bac390ceb854851e25c9ce834f4e0e",
-    "pai_cert": "308201cc30820171a0030201020208052a35e630963f7e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004030500e9cf9aec502a4587a0ed4984b75eb7339e68e178186c5582476ba5b428b0de2bb512f24ce14c95f26eaac0b57544b097af95a5e481d6e4f8b4dd8d87eca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041471835af720aa22c2672d6dc1bac3a8d6c62bf37d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203490030460221009dada449c990334d1ef399bce2132418ea071a497d753c49b1624051fd31c844022100a478e3cc30e83e2c019307cb62d89b5c020ffdc0f67e116b74f1cbc27afe73e5",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502203641ad984edbc0bdf36b2143c947598a8e3b820e7bf58bf929d3f5e28757bb2a02210097c0a454560f582feb510f583b2702abb03c549fb8ae3d8aefdf3d9b35f37628",
-    "dac_private_key": "884abb5460845352fe4363d7bd98983a86cb7222708d78c78b8bda0561af4624",
-    "dac_public_key": "04e306825750408405adefc48a6f8df7232fdd3a05b537d71bc56fbd096c07e3469e73d52158ec2ead87bae8712d4071966eb66b778286b2ecf42ef1bd5d59499c"
+    "dac_cert": "308201da30820181a0030201020208075b92e4e6b84e82300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a303042313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004c17fc6509ae5a59424f3c708c0608fb7a6c0315e11d4b2225d1bdafa9086c3a14408da49d9c20b67eff3d682f3d04c970b6c4f635a20d41783481bf2ff49ee01a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bba10e4b38e2c0e246051e84715e5baf6a13fd60301f0603551d230418301680148dfb62ca6a6bc48ac92ec1ac6a2371fe4fe3267e300a06082a8648ce3d0403020347003044022057b0b3d07ca9dff103f666d325028046200168451b599f091a8fcae50430ee74022057557b6bea2d6a8945a783b15b4b95697d815bb1f4fc99f2174ce62307ecd692",
+    "pai_cert": "308201cc30820171a00302010202081798022b33fbf3d5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004bc34fa7fc9ea49b2731e65c1d78e13be11af24e7631cd36292ba3a7d6bdb56934717611170b9c989f64d5b7557081fb3a6504b3a443772528cfc5d0bf2699d92a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148dfb62ca6a6bc48ac92ec1ac6a2371fe4fe3267e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a0090fdd7dbdc51282166ccb310ea9fac1e099235bdd60d454366e889d287b170221008d86d2cf63e6e351a0185c5357186fd86e078895810e3a8a0e1af1c1cc8be0aa",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b621544bb08ad4d9f4726bda7ee7d4401d8b371dbf55ecf23c5f77f9cfc99dec022100e3b4ea7d887641f74f88d53baab86c22b156c49a6f5d26c39133361100c52eef",
+    "dac_private_key": "ab84aeda2dd947e5fe6b4abc1d0de68f392614bde6cc9ea92caec6fb1786d4f0",
+    "dac_public_key": "04c17fc6509ae5a59424f3c708c0608fb7a6c0315e11d4b2225d1bdafa9086c3a14408da49d9c20b67eff3d682f3d04c970b6c4f635a20d41783481bf2ff49ee01"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/cd.der
index 3b3d2b30f0f64e..9e5c4e5b5ab5a2 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.der
index ef9a48dccc52aa..e139ae7d513b48 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.pem
index 7e500f9f72b0bb..d9228e6b45f0be 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB3DCCAYGgAwIBAgIIRSr32TMsfK4wCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
+MIIB2jCCAYGgAwIBAgIIJ7DMtPZQDRAwCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE1waWQ6MDBCMSBNdmlkOkZG
-RjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
+RjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
 D01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEE
-AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEjTyZCFWvDPDc
-iPHH2E9kUVUp0mv/OFnUqA/xtpOngOAQLUzszB8BGoD7zhvB0mIbgA6sL1fqz3y2
-H/cQRwQdLKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFIpaTyaLLTgVyg6MTN9PjilFsH9PMB8GA1UdIwQYMBaAFNIp6YRrCiX6XLQM
-/auOI7y02UAvMAoGCCqGSM49BAMCA0kAMEYCIQDVDtvd6eHSye6MYsfrvJwbusNs
-62b44pltj24nz/ZxaAIhAJEIL5AfbF8DnIqqXO6Z5EraBcLI9d+6qhzBuE0/4zjV
+AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEP5/QNVrh1+B3
+GM3RjvgzQkYwzfwXC8G8x1/qhzu3T7zbZu8KFGSIQzJSxppB4BwjPTqgVXEDCKE4
+XJ+oDFqUXaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFCZL4NG6zj7KexpAK5E+M6+Wy+fQMB8GA1UdIwQYMBaAFNaPRSo/Ixc7Twk1
+H7KLlFAKXNgVMAoGCCqGSM49BAMCA0cAMEQCIH7pvxarLY7Pfx2uF+E6J2raOCPa
+2nfZwkj/0xSQzjerAiBebHWnPAOnNrPRB7P2th61gprXpBcY4cTDqpVOoIw2Jw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.der
index 3a0e00a7731926..e9bfa0a88c9f9d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.pem
index 30574de7c23f88..7d956c1076a811 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFSg7brMRus0m10zqYtzel9jf5wcDcT0tzzYJ4GfP4LfoAoGCCqGSM49
-AwEHoUQDQgAEjTyZCFWvDPDciPHH2E9kUVUp0mv/OFnUqA/xtpOngOAQLUzszB8B
-GoD7zhvB0mIbgA6sL1fqz3y2H/cQRwQdLA==
+MHcCAQEEIIkaLLXhTH7IT7HKeZkY7DLe2Na+9qDZUOwxc5AgkBQDoAoGCCqGSM49
+AwEHoUQDQgAEP5/QNVrh1+B3GM3RjvgzQkYwzfwXC8G8x1/qhzu3T7zbZu8KFGSI
+QzJSxppB4BwjPTqgVXEDCKE4XJ+oDFqUXQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.der
index 875966b6e473ad..02e033eeae5fd0 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.pem
index 5b1172dc2ffcdd..70f33f4f062b44 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByjCCAXGgAwIBAgIIcRGsn3kMJNMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIByzCCAXGgAwIBAgIIPIIAjHyplk4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPTE7MDkGA1UEAwwyQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE1waWQ6MDBCMSBNdmlkOkZGRjEwWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAAQEW8fuxTDaFRIaGXuClhlDrJE7eekrRD6sxMoSWcOv
-vBCxG/7HWvJb9/J8jleBmOzaupkSddyKdmgATxlWfBOoo2YwZDASBgNVHRMBAf8E
-CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU0inphGsKJfpctAz9
-q44jvLTZQC8wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
-zj0EAwIDRwAwRAIgF2lB0p7YK9sDrCF4n82DaWVO5InosE7aN24c0ABhkkcCIAI3
-/i/w4TUDlsuxgpJajEKM0R1FmCdANUsgzSWALxL7
+PQIBBggqhkjOPQMBBwNCAARRWpAI96W+ppkIc7H5e0E8cBrwyS80X6/4ZojhtbkY
+3aV5L6CX0SGW6U/fBkMLWOaFUFRWEmk2+oligOrwEu0jo2YwZDASBgNVHRMBAf8E
+CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU1o9FKj8jFztPCTUf
+souUUApc2BUwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
+zj0EAwIDSAAwRQIgXmCIriLEdPOnTJzP+t1a9k8rRUzi+L4wcjEDhyHQiP4CIQC6
+kbplvHrmcHfkzTWdjoxicxl296/hALsWJulR/AhkyA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.der
index ef8797c003990f..5cfba4be463ab6 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.pem
index f3bc7e97a14829..714ce6a7e779c1 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOS2J5rx6Y6X27GgiuTcd5WVPgt/SIqLqHaEwPlYbyi0oAoGCCqGSM49
-AwEHoUQDQgAEBFvH7sUw2hUSGhl7gpYZQ6yRO3npK0Q+rMTKElnDr7wQsRv+x1ry
-W/fyfI5XgZjs2rqZEnXcinZoAE8ZVnwTqA==
+MHcCAQEEICeFNBvvYJBRP28RVlfNGdqDnhdLEBYpJzWi85ln715noAoGCCqGSM49
+AwEHoUQDQgAEUVqQCPelvqaZCHOx+XtBPHAa8MkvNF+v+GaI4bW5GN2leS+gl9Eh
+lulP3wZDC1jmhVBUVhJpNvqJYoDq8BLtIw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/test_case_vector.json
index ab5edb61f2e233..c45442381c8753 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: valid and recommended since easily human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201dc30820181a0030201020208452af7d9332c7cae300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7069643a30304231204d7669643a464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200048d3c990855af0cf0dc88f1c7d84f64515529d26bff3859d4a80ff1b693a780e0102d4ceccc1f011a80fbce1bc1d2621b800eac2f57eacf7cb61ff71047041d2ca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604148a5a4f268b2d3815ca0e8c4cdf4f8e2945b07f4f301f0603551d23041830168014d229e9846b0a25fa5cb40cfdab8e23bcb4d9402f300a06082a8648ce3d0403020349003046022100d50edbdde9e1d2c9ee8c62c7ebbc9c1bbac36ceb66f8e2996d8f6e27cff6716802210091082f901f6c5f039c8aaa5cee99e44ada05c2c8f5dfbaaa1cc1b84d3fe338d5",
-    "pai_cert": "308201ca30820171a00302010202087111ac9f790c24d3300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7069643a30304231204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004045bc7eec530da15121a197b82961943ac913b79e92b443eacc4ca1259c3afbc10b11bfec75af25bf7f27c8e578198ecdaba991275dc8a7668004f19567c13a8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d229e9846b0a25fa5cb40cfdab8e23bcb4d9402f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220176941d29ed82bdb03ac21789fcd8369654ee489e8b04eda376e1cd00061924702200237fe2ff0e1350396cbb182925a8c428cd11d45982740354b20cd25802f12fb",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502206b74df493b9ca0a065479875a6683fddbcdcd970a49993c077d86e382f01fafb022100e53d990f06e9e5346af91282e79127a66888fb917b008c5f356d753d2da514af",
-    "dac_private_key": "54a0edbacc46eb349b5d33a98b737a5f637f9c1c0dc4f4b73cd827819f3f82df",
-    "dac_public_key": "048d3c990855af0cf0dc88f1c7d84f64515529d26bff3859d4a80ff1b693a780e0102d4ceccc1f011a80fbce1bc1d2621b800eac2f57eacf7cb61ff71047041d2c"
+    "dac_cert": "308201da30820181a003020102020827b0ccb4f6500d10300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7069643a30304231204d7669643a464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200043f9fd0355ae1d7e07718cdd18ef833424630cdfc170bc1bcc75fea873bb74fbcdb66ef0a146488433252c69a41e01c233d3aa055710308a1385c9fa80c5a945da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414264be0d1bace3eca7b1a402b913e33af96cbe7d0301f0603551d23041830168014d68f452a3f23173b4f09351fb28b94500a5cd815300a06082a8648ce3d040302034700304402207ee9bf16ab2d8ecf7f1dae17e13a276ada3823dada77d9c248ffd31490ce37ab02205e6c75a73c03a736b3d107b3f6b61eb5829ad7a41718e1c4c3aa954ea08c3627",
+    "pai_cert": "308201cb30820171a00302010202083c82008c7ca9964e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7069643a30304231204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004515a9008f7a5bea6990873b1f97b413c701af0c92f345faff86688e1b5b918dda5792fa097d12196e94fdf06430b58e685505456126936fa896280eaf012ed23a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414d68f452a3f23173b4f09351fb28b94500a5cd815301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205e6088ae22c474f3a74c9ccffadd5af64f2b454ce2f8be307231038721d088fe022100ba91ba65bc7ae67077e4cd359d8e8c62731976f7afe100bb1626e951fc0864c8",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100c4d3874a8c4d4f346fde865cc123e2fabcdd12e5836ed35006673599df20d144022100e137b6a190860571970460a6926d8867d7bbed46c8ceaa0b9166ed85654c920b",
+    "dac_private_key": "891a2cb5e14c7ec84fb1ca799918ec32ded8d6bef6a0d950ec31739020901403",
+    "dac_public_key": "043f9fd0355ae1d7e07718cdd18ef833424630cdfc170bc1bcc75fea873bb74fbcdb66ef0a146488433252c69a41e01c233d3aa055710308a1385c9fa80c5a945d"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/cd.der
index a71e397cbfe623..63dde97f8f12f9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.der
index a9a061b9fb7dfa..d22caab6b530dc 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.pem
index fc8d197df5f048..a95b32d01b6fc7 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAYGgAwIBAgIIbDoRHJptM2owCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
+MIIB2zCCAYGgAwIBAgIIa+ZYigwhTlAwCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
 TXBpZDowMEIxLEFDTUUgTWF0dGVyIERldmVsIFBBSSA1Q0RBOTg5OSxNdmlkOkZG
-RjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
+RjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
 D01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEE
-AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE5kNRKFkgTVQm
-lUUEFFlT6h4qpmRpy5FlOMyuMLxZThDuXaWWj/E09ynFU+hFi7KUHdpG/UFWrSLP
-n/b/jvtJ/qNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFOuM5KrFBj5dJiV+CSpzNatWObLKMB8GA1UdIwQYMBaAFLX14b8OX7PZoJhn
-u1VQn9EATW9PMAoGCCqGSM49BAMCA0gAMEUCIQChMDDz6QHZpNj66XGAHmyRHv2M
-z63+FY0r8sX3xmr9IQIgfQexyUtDCUJsDe7hHyx8wtzU5Bdn8KMGzbc+f1s/fr4=
+AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAED+X1hxJlbZSs
+8SyonkLeZL2TkFyV8MIbFFDb28W9myxfbfvdM3mVKmG227RdswNCN3Ct5a3wN8kP
+z6XwibAEkKNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFKzF5y7GCjrCkWA0NABU3yDZDqb3MB8GA1UdIwQYMBaAFPt2RRhIOZiJiX71
+wc8j5EPBR8O7MAoGCCqGSM49BAMCA0gAMEUCIFyaVBF5MOGLfuOeXWlNH8LChB/x
+YaWftStXXrypsZy8AiEAnxpO1XZoDqbECd7txE2R9PyxYiS0m4Tb69eK6sytAds=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.der
index a2b5af1a133871..42e81a38521be4 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.pem
index e4c07e96784a9c..dc82c6050e6af1 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILoI1YGd8tA5tymjFpeE+8CF4jlV/M4cKbCDxxhfGUrnoAoGCCqGSM49
-AwEHoUQDQgAE5kNRKFkgTVQmlUUEFFlT6h4qpmRpy5FlOMyuMLxZThDuXaWWj/E0
-9ynFU+hFi7KUHdpG/UFWrSLPn/b/jvtJ/g==
+MHcCAQEEIPCy9eGxyhgD7QYZk7WrEs7RcWHLxtoYL+VAha9CmTgBoAoGCCqGSM49
+AwEHoUQDQgAED+X1hxJlbZSs8SyonkLeZL2TkFyV8MIbFFDb28W9myxfbfvdM3mV
+KmG227RdswNCN3Ct5a3wN8kPz6XwibAEkA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.der
index dbc422480bac19..8da6c6878a35ed 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.pem
index e5127c6c9a1fc2..cd1e8e786ffaa5 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXGgAwIBAgIIUrZHsnmd2zMwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBzDCCAXGgAwIBAgIIcCzoqTcrYnAwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPTE7MDkGA1UEAwwyTXBpZDowMEIxLEFD
 TUUgTWF0dGVyIERldmVsIFBBSSA1Q0RBOTg5OSxNdmlkOkZGRjEwWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAARkuAa9PJkZo620a8oOmVu1pansHve4FJCi3umwiHZG
-VA8zSsiq0N3hqkEL/v1BI6Dg4s4jGgQCnmeMZY7IKMgyo2YwZDASBgNVHRMBAf8E
-CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtfXhvw5fs9mgmGe7
-VVCf0QBNb08wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
-zj0EAwIDSQAwRgIhAJnk/HPwTyTuphvB5DN8i0uBtNLLDw8rQDAsEsYIuqvAAiEA
-7aNv6ZQmjGd1X7KknM1CrszJ9PgAG5vdpc1Vdl7cMac=
+PQIBBggqhkjOPQMBBwNCAASIoIyryaugtNzUr+iw1a95R7FKKCpbaN3mX+JD1VY2
+DqnMXznAGRUWi4Ou/r+INYq40fHhdGpoZauRQ55btK3Mo2YwZDASBgNVHRMBAf8E
+CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU+3ZFGEg5mImJfvXB
+zyPkQ8FHw7swHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
+zj0EAwIDSQAwRgIhAJE+PakFqLZSbusaAAYDZ2iPdhZRIVDApaqQL91gpYowAiEA
+1a9ZdFwXjK1ze1m4HDpb5buXxZ+xzHHQlvChth8syRw=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.der
index 58b48f76f0ed23..2a9c44f9dd873f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.pem
index dcca4efe6089b8..eba3f3f08ae13f 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILTt50iAKSuvk860mMsWk89YIDh6UtGbR8AXH121Cez6oAoGCCqGSM49
-AwEHoUQDQgAEZLgGvTyZGaOttGvKDplbtaWp7B73uBSQot7psIh2RlQPM0rIqtDd
-4apBC/79QSOg4OLOIxoEAp5njGWOyCjIMg==
+MHcCAQEEICTnLUA9oYhdHP/EzuPOeaaxkkwn4CR3nrVvrTv6zxjLoAoGCCqGSM49
+AwEHoUQDQgAEiKCMq8mroLTc1K/osNWveUexSigqW2jd5l/iQ9VWNg6pzF85wBkV
+FouDrv6/iDWKuNHx4XRqaGWrkUOeW7StzA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/test_case_vector.json
index 9ef2e60ee03f5b..ae8d9f2dc9953e 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_03/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: valid example showing that order or separators are not considered at all for the overall validity of the embedded fields",
     "is_success_case": "true",
-    "dac_cert": "308201db30820181a00302010202086c3a111c9a6d336a300a06082a8648ce3d040302303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c205041492035434441393839392c4d7669643a464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004e643512859204d5426954504145953ea1e2aa66469cb916538ccae30bc594e10ee5da5968ff134f729c553e8458bb2941dda46fd4156ad22cf9ff6ff8efb49fea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414eb8ce4aac5063e5d26257e092a7335ab5639b2ca301f0603551d23041830168014b5f5e1bf0e5fb3d9a09867bb55509fd1004d6f4f300a06082a8648ce3d0403020348003045022100a13030f3e901d9a4d8fae971801e6c911efd8ccfadfe158d2bf2c5f7c66afd2102207d07b1c94b4309426c0deee11f2c7cc2dcd4e41767f0a306cdb73e7f5b3f7ebe",
-    "pai_cert": "308201cc30820171a003020102020852b647b2799ddb33300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c205041492035434441393839392c4d7669643a464646313059301306072a8648ce3d020106082a8648ce3d0301070342000464b806bd3c9919a3adb46bca0e995bb5a5a9ec1ef7b81490a2dee9b0887646540f334ac8aad0dde1aa410bfefd4123a0e0e2ce231a04029e678c658ec828c832a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b5f5e1bf0e5fb3d9a09867bb55509fd1004d6f4f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210099e4fc73f04f24eea61bc1e4337c8b4b81b4d2cb0f0f2b40302c12c608baabc0022100eda36fe994268c67755fb2a49ccd42aeccc9f4f8001b9bdda5cd55765edc31a7",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502204d6e869077f79342614d874ef913fce673120a24f025318379d62a42910d8e1e022100ff315391ac8bd063c2c7ce0d998fd2e9d5a3aa25b88709e978a4620cbe7ca19e",
-    "dac_private_key": "ba08d5819df2d039b729a3169784fbc085e23955fcce1c29b083c7185f194ae7",
-    "dac_public_key": "04e643512859204d5426954504145953ea1e2aa66469cb916538ccae30bc594e10ee5da5968ff134f729c553e8458bb2941dda46fd4156ad22cf9ff6ff8efb49fe"
+    "dac_cert": "308201db30820181a00302010202086be6588a0c214e50300a06082a8648ce3d040302303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c205041492035434441393839392c4d7669643a464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200040fe5f58712656d94acf12ca89e42de64bd93905c95f0c21b1450dbdbc5bd9b2c5f6dfbdd3379952a61b6dbb45db303423770ade5adf037c90fcfa5f089b00490a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414acc5e72ec60a3ac2916034340054df20d90ea6f7301f0603551d23041830168014fb76451848399889897ef5c1cf23e443c147c3bb300a06082a8648ce3d040302034800304502205c9a54117930e18b7ee39e5d694d1fc2c2841ff161a59fb52b575ebca9b19cbc0221009f1a4ed576680ea6c409deedc44d91f4fcb16224b49b84dbebd78aeaccad01db",
+    "pai_cert": "308201cc30820171a0030201020208702ce8a9372b6270300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a303d313b303906035504030c324d7069643a303042312c41434d45204d617474657220446576656c205041492035434441393839392c4d7669643a464646313059301306072a8648ce3d020106082a8648ce3d0301070342000488a08cabc9aba0b4dcd4afe8b0d5af7947b14a282a5b68dde65fe243d556360ea9cc5f39c01915168b83aefebf88358ab8d1f1e1746a6865ab91439e5bb4adcca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414fb76451848399889897ef5c1cf23e443c147c3bb301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100913e3da905a8b6526eeb1a00060367688f7616512150c0a5aa902fdd60a58a30022100d5af59745c178cad737b59b81c3a5be5bb97c59fb1cc71d096f0a1b61f2cc91c",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100a446bdfd25f2f265c8e5af02a04e66b97cde7c110093ae69e1b30037936f060d022047ee346e38e0329c6376fd2412f946874aea76b4f8bc31380d71528020e02152",
+    "dac_private_key": "f0b2f5e1b1ca1803ed061993b5ab12ced17161cbc6da182fe54085af42993801",
+    "dac_public_key": "040fe5f58712656d94acf12ca89e42de64bd93905c95f0c21b1450dbdbc5bd9b2c5f6dfbdd3379952a61b6dbb45db303423770ade5adf037c90fcfa5f089b00490"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/cd.der
index 3cb845a2758347..c4f1dc37b78347 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.der
index 12639edaf79e2a..4f767576e244d3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.pem
index ce4ffc10dab7d7..a0bdab99f81d5e 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAYCgAwIBAgIIHTvu4E8T1MwwCgYIKoZIzj0EAwIwPDE6MDgGA1UEAwwx
+MIIB2jCCAYCgAwIBAgIINByEU17vKowwCgYIKoZIzj0EAwIwPDE6MDgGA1UEAwwx
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMU1waWQ6MDBC
-MTAgFw0yMjA1MjcwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwP
+MTAgFw0yMjA5MjMwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgREFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQC4PoBPFEAD61c
-FSCV7xdu8EFql3lY05+t+Ae/ZPPNIsy1A0SlboBFkqW1QKuTFSrkxvzeT3PZAzEl
-0udUDXCBo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
-FgQUoU/d6L2t24YSYJHk4dMqmF3vdocwHwYDVR0jBBgwFoAUbE46IDCwBpmp2bc3
-Kzd5A0NTKT4wCgYIKoZIzj0EAwIDSAAwRQIgBgJ4fRZfj2saAxFbxubxONRT0/BO
-hbrc2j4C68/dN7QCIQDwGpJrnFvgAPi7dx1LMt8/bt/2humvZxwGEQkYUTytyA==
+gqJ8AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ3WeyonhbG6nHR
+k3MlG2JnNcQOTMdnbuJ9LYsaCzrf69MKG7TJ3r+yvzjYhAF/VZtKtkPjwbzNqPld
+LxkPqc3Mo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
+FgQUsQ5EiIhC+ypLru5WMQs14nySJDIwHwYDVR0jBBgwFoAUXN438qQfFqMXM84W
+0Tp36/BcSN8wCgYIKoZIzj0EAwIDSAAwRQIhAMZ2eCuPM6ose7TpHgfQeMPvAruY
+X7rZCSYnaIaNHz85AiBP42P5V0bk9EcwEc/zeQsLJ9lGoj+zB6sofpmEWGPWEg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.der
index 83a6caba98a9c5..e5819249bdb25f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.pem
index 9d6b8a062aa6c8..564801c6196be8 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBSUU08XVU3a47XNtiMpJKEvYggzg+8sH+8HgGx35jnloAoGCCqGSM49
-AwEHoUQDQgAEAuD6ATxRAA+tXBUgle8XbvBBapd5WNOfrfgHv2TzzSLMtQNEpW6A
-RZKltUCrkxUq5Mb83k9z2QMxJdLnVA1wgQ==
+MHcCAQEEIO/SCjHTuj/HRVbslvoIy6PMYzZ6TKatKdHhblhU5IUnoAoGCCqGSM49
+AwEHoUQDQgAEN1nsqJ4Wxupx0ZNzJRtiZzXEDkzHZ27ifS2LGgs63+vTChu0yd6/
+sr842IQBf1WbSrZD48G8zaj5XS8ZD6nNzA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.der
index d0f69e485315aa..f7aec19c939c8c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.pem
index c7512914151fac..a49561ca48171c 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByjCCAXCgAwIBAgIIFOLcZBy+5tYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIByzCCAXCgAwIBAgIIYHrPRvHT5c4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPDE6MDgGA1UEAwwxQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMU1waWQ6MDBCMTBZMBMGByqGSM49
-AgEGCCqGSM49AwEHA0IABBpwCLkuV61oc43ZyTvNEfZaM1QSp4tPs0NQkYyEIXY5
-oQYkkxFl+fx/QB7/uoxVCXzoY9/jVvVxdVfoFCQzq4GjZjBkMBIGA1UdEwEB/wQI
-MAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRsTjogMLAGmanZtzcr
-N3kDQ1MpPjAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjO
-PQQDAgNIADBFAiBfhmPZdDcVaxj1ZT5idjUa3upFaIAePFEEfWQXddC8rwIhAKAI
-/Jm2gDTPaEElgffXpGi46kGpuLcwPUsPD45GDez4
+AgEGCCqGSM49AwEHA0IABBQf6FtkzPr0zwjezV5Sfv7bb/vYlKV/SEG8xnhsQEdX
+9Zb0ONwyzpIDKE/8E/tDYdimIecKwcfqDCKakChr9/qjZjBkMBIGA1UdEwEB/wQI
+MAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRc3jfypB8WoxczzhbR
+Onfr8FxI3zAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjO
+PQQDAgNJADBGAiEApgfg2wDr8kEN+fxDbYEsYw41LZj1NT8MxX1bzCwnB7UCIQDT
+25KYbXGH/0X0h7MDPKsCZkXGRgNGH5X0ilcQI1G7hA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.der
index 8265546c7e85d5..5b25be32743b51 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.pem
index c45b0b536a15dd..9fd800e3cd29bd 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPnf8aTRS4hrKdMGL7VOPPx2emNjUAynRwomOpEstu2hoAoGCCqGSM49
-AwEHoUQDQgAEGnAIuS5XrWhzjdnJO80R9lozVBKni0+zQ1CRjIQhdjmhBiSTEWX5
-/H9AHv+6jFUJfOhj3+NW9XF1V+gUJDOrgQ==
+MHcCAQEEINPO5t1B2e4cyTGDQHAdfbSnTdD4Sdo2wSIDzdbgB7TMoAoGCCqGSM49
+AwEHoUQDQgAEFB/oW2TM+vTPCN7NXlJ+/ttv+9iUpX9IQbzGeGxAR1f1lvQ43DLO
+kgMoT/wT+0Nh2KYh5wrBx+oMIpqQKGv3+g==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/test_case_vector.json
index 5bc5d706bdb173..c0fd626b74fff3 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_04/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: valid, but less readable",
     "is_success_case": "true",
-    "dac_cert": "308201da30820180a00302010202081d3beee04f13d4cc300a06082a8648ce3d040302303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464646314d7069643a303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000402e0fa013c51000fad5c152095ef176ef0416a977958d39fadf807bf64f3cd22ccb50344a56e804592a5b540ab93152ae4c6fcde4f73d9033125d2e7540d7081a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a14fdde8bdaddb86126091e4e1d32a985def7687301f0603551d230418301680146c4e3a2030b00699a9d9b7372b3779034353293e300a06082a8648ce3d040302034800304502200602787d165f8f6b1a03115bc6e6f138d453d3f04e85badcda3e02ebcfdd37b4022100f01a926b9c5be000f8bb771d4b32df3f6edff686e9af671c06110918513cadc8",
-    "pai_cert": "308201ca30820170a003020102020814e2dc641cbee6d6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464646314d7069643a303042313059301306072a8648ce3d020106082a8648ce3d030107034200041a7008b92e57ad68738dd9c93bcd11f65a335412a78b4fb34350918c84217639a10624931165f9fc7f401effba8c55097ce863dfe356f5717557e8142433ab81a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146c4e3a2030b00699a9d9b7372b3779034353293e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205f8663d97437156b18f5653e6276351adeea4568801e3c51047d641775d0bcaf022100a008fc99b68034cf68412581f7d7a468b8ea41a9b8b7303d4b0f0f8e460decf8",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b8c4643d9fce2dd67e314ec2f941716e5c7ba57a2d29d001f49626bc89e63eff02210085890e9a0b49f6c43ee73b84cd32d7e753ed2660ac6363f8d16857186b48c524",
-    "dac_private_key": "1494534f17554ddae3b5cdb6232924a12f62083383ef2c1fef07806c77e639e5",
-    "dac_public_key": "0402e0fa013c51000fad5c152095ef176ef0416a977958d39fadf807bf64f3cd22ccb50344a56e804592a5b540ab93152ae4c6fcde4f73d9033125d2e7540d7081"
+    "dac_cert": "308201da30820180a0030201020208341c84535eef2a8c300a06082a8648ce3d040302303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464646314d7069643a303042313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200043759eca89e16c6ea71d19373251b626735c40e4cc7676ee27d2d8b1a0b3adfebd30a1bb4c9debfb2bf38d884017f559b4ab643e3c1bccda8f95d2f190fa9cdcca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b10e44888842fb2a4baeee56310b35e27c922432301f0603551d230418301680145cde37f2a41f16a31733ce16d13a77ebf05c48df300a06082a8648ce3d0403020348003045022100c676782b8f33aa2c7bb4e91e07d078c3ef02bb985fbad909262768868d1f3f3902204fe363f95746e4f4473011cff3790b0b27d946a23fb307ab287e99845863d612",
+    "pai_cert": "308201cb30820170a0030201020208607acf46f1d3e5ce300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464646314d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004141fe85b64ccfaf4cf08decd5e527efedb6ffbd894a57f4841bcc6786c404757f596f438dc32ce9203284ffc13fb4361d8a621e70ac1c7ea0c229a90286bf7faa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604145cde37f2a41f16a31733ce16d13a77ebf05c48df301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a607e0db00ebf2410df9fc436d812c630e352d98f5353f0cc57d5bcc2c2707b5022100d3db92986d7187ff45f487b3033cab026645c64603461f95f48a57102351bb84",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220718da3c75864aaafae04ae718df356f20cdb4688a3b6934d37bff390e3111d170221008d6449aec65b2c295effd4f8136fc8fcd014bb7bf43e741947e56d744dbb05c1",
+    "dac_private_key": "efd20a31d3ba3fc74556ec96fa08cba3cc63367a4ca6ad29d1e16e5854e48527",
+    "dac_public_key": "043759eca89e16c6ea71d19373251b626735c40e4cc7676ee27d2d8b1a0b3adfebd30a1bb4c9debfb2bf38d884017f559b4ab643e3c1bccda8f95d2f190fa9cdcc"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/cd.der
index 0da9fe3f6fda79..4538a62e976f23 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.der
index 307702f3cd8086..8898e32bd3f906 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.pem
index c649e70e5276c3..064abedcbc9a69 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAX+gAwIBAgIIMTHLnqc7KtwwCgYIKoZIzj0EAwIwOzE5MDcGA1UEAwww
+MIIB2TCCAX+gAwIBAgIIeIwduoffHsowCgYIKoZIzj0EAwIwOzE5MDcGA1UEAwww
 TXZpZDpGRkYxQUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREFNcGlkOjAwQjE5ODk5
-MCAXDTIyMDUyNzAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9N
+MCAXDTIyMDkyMzAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9N
 YXR0ZXIgVGVzdCBEQUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGC
-onwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKYYBnH5BzT+PZ0c
-GeybkppHaxMDdGXuKmV0DNdXeQG6hCs+/VA9KQ78ckLFpB8Qjbydh2+yi3nDg8GO
-zQTOHgejYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
-BBQDRaPFCi7wYpbbgOzstWXbzwItbzAfBgNVHSMEGDAWgBRtslzJ0jVUrEx6xCd1
-XteDf1RsxjAKBggqhkjOPQQDAgNJADBGAiEAn1ADcoOQ+ptfyZzZCVd37OZaGIH+
-kesu056Axpmg/jsCIQDzvDD3uggyPyWxT2yFXDdEMreR7BKow8+6ZMIukKQoKA==
+onwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH3P/cAguYz0UkP/
+ALbm7LmyEEcWrPWMqtpWWU4V2XZcOrPV71kVcQvnSyqY6MVWzXUBz1TRHzgf2jRe
+Prv4ka+jYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
+BBSqMy3UdPQ4z+/aEMnedG1Homwq7zAfBgNVHSMEGDAWgBTreO0eYW0pSkuoDHFD
+JyNo6KFfczAKBggqhkjOPQQDAgNIADBFAiEAguzrWqVqG0xVF2UgyNNrBZzlbAUj
+qQIxLU2CH6dQtxMCIHwkqdOQTbVKlnxQ45z92IvSYA1f37u1sEMFzGuNOwE+
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.der
index b5a1d070b2ce25..02457602db154e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.pem
index b53874b648ec73..adc0c66720f3f9 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEII+TfDePW4dqeNJDbjnPe3OKW95WU16SRbI16rDGCtrtoAoGCCqGSM49
-AwEHoUQDQgAEphgGcfkHNP49nRwZ7JuSmkdrEwN0Ze4qZXQM11d5AbqEKz79UD0p
-DvxyQsWkHxCNvJ2Hb7KLecODwY7NBM4eBw==
+MHcCAQEEIOwShUvimXTiBaYXo5sTyLx8wu+3vkGytW/gPybV+8gRoAoGCCqGSM49
+AwEHoUQDQgAEfc/9wCC5jPRSQ/8AtubsubIQRxas9Yyq2lZZThXZdlw6s9XvWRVx
+C+dLKpjoxVbNdQHPVNEfOB/aNF4+u/iRrw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.der
index cc20356b470f20..9c7519ad2b9637 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.pem
index d902ce0eb2bef6..06896bb917c7a4 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByTCCAW+gAwIBAgIIPIl8dQhlBTcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIByjCCAW+gAwIBAgIIdtjgE6u/8igwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowOzE5MDcGA1UEAwwwTXZpZDpGRkYxQUNN
 RSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREFNcGlkOjAwQjE5ODk5MFkwEwYHKoZIzj0C
-AQYIKoZIzj0DAQcDQgAEF2boa2yrvHNUYZrtJG5RTkk/v5pT7IpESKLCPzE4T9AY
-ij7cFG0ttCoy6jqvD2BdnVhFJIuplueHZrOKQcENjaNmMGQwEgYDVR0TAQH/BAgw
-BgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFG2yXMnSNVSsTHrEJ3Ve
-14N/VGzGMB8GA1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49
-BAMCA0gAMEUCIQCpSX/8rRS4RoAURl/lY4LAnBZa3kPka1fl0R/gBKEEZAIgcjsj
-DUGHTXJgW5P/J8ZCBDCF43ZPFNO2IKtMD/88AZc=
+AQYIKoZIzj0DAQcDQgAERSnTEXwWILhb7boWJdBTLc8nqsq/cn3l/Ydxj6gxwiGd
+fikOVWmpg4Ou3dZTXBzn9xMgdLBRy8RJQc1Ln4jIpaNmMGQwEgYDVR0TAQH/BAgw
+BgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFOt47R5hbSlKS6gMcUMn
+I2jooV9zMB8GA1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49
+BAMCA0kAMEYCIQDYV8o5GF1lXnZe2GqOAmfIBO83CDGr1kO0nMkV0jZyNAIhAMtC
+q7qSkMfpi1QeROHeoINqzyjvymREM5QBdp+e4B5y
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.der
index 5e2bcf4522cf1c..3cfc9c012e43c9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.pem
index 10e24c97236984..3c0095c789c583 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIA2XQ+zhAFaCqVeYrHvGgcFAmJDj4NFW+nASQQ8Kv6eyoAoGCCqGSM49
-AwEHoUQDQgAEF2boa2yrvHNUYZrtJG5RTkk/v5pT7IpESKLCPzE4T9AYij7cFG0t
-tCoy6jqvD2BdnVhFJIuplueHZrOKQcENjQ==
+MHcCAQEEIDbqSwF3r3yNInb+yct6KDCnXJeZatgnhiaBIFnN4NBroAoGCCqGSM49
+AwEHoUQDQgAERSnTEXwWILhb7boWJdBTLc8nqsq/cn3l/Ydxj6gxwiGdfikOVWmp
+g4Ou3dZTXBzn9xMgdLBRy8RJQc1Ln4jIpQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/test_case_vector.json
index 2ebbfae63188cd..1749235ae42c2a 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: valid, but highly discouraged, since embedding of substrings within other substrings may be confusing to human readers",
     "is_success_case": "true",
-    "dac_cert": "308201da3082017fa00302010202083131cb9ea73b2adc300a06082a8648ce3d040302303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2050414920354344414d7069643a30304231393839393020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004a6180671f90734fe3d9d1c19ec9b929a476b13037465ee2a65740cd7577901ba842b3efd503d290efc7242c5a41f108dbc9d876fb28b79c383c18ecd04ce1e07a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140345a3c50a2ef06296db80ececb565dbcf022d6f301f0603551d230418301680146db25cc9d23554ac4c7ac427755ed7837f546cc6300a06082a8648ce3d04030203490030460221009f5003728390fa9b5fc99cd9095777ece65a1881fe91eb2ed39e80c699a0fe3b022100f3bc30f7ba08323f25b14f6c855c374432b791ec12a8c3cfba64c22e90a42828",
-    "pai_cert": "308201c93082016fa00302010202083c897c7508650537300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2050414920354344414d7069643a30304231393839393059301306072a8648ce3d020106082a8648ce3d030107034200041766e86b6cabbc7354619aed246e514e493fbf9a53ec8a4448a2c23f31384fd0188a3edc146d2db42a32ea3aaf0f605d9d5845248ba996e78766b38a41c10d8da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146db25cc9d23554ac4c7ac427755ed7837f546cc6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a9497ffcad14b8468014465fe56382c09c165ade43e46b57e5d11fe004a104640220723b230d41874d72605b93ff27c642043085e3764f14d3b620ab4c0fff3c0197",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450220330309fb1ee5265b6dc996c28e9468a38d3bc6c3ea4b38d20d60f4c71dcf8f1b022100ba156574d72cfdbda2707924b2f9d87bfbefaf057a815f7c2e98bd51431f6867",
-    "dac_private_key": "8f937c378f5b876a78d2436e39cf7b738a5bde56535e9245b235eab0c60adaed",
-    "dac_public_key": "04a6180671f90734fe3d9d1c19ec9b929a476b13037465ee2a65740cd7577901ba842b3efd503d290efc7242c5a41f108dbc9d876fb28b79c383c18ecd04ce1e07"
+    "dac_cert": "308201d93082017fa0030201020208788c1dba87df1eca300a06082a8648ce3d040302303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2050414920354344414d7069643a30304231393839393020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200047dcffdc020b98cf45243ff00b6e6ecb9b2104716acf58caada56594e15d9765c3ab3d5ef5915710be74b2a98e8c556cd7501cf54d11f381fda345e3ebbf891afa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414aa332dd474f438cfefda10c9de746d47a26c2aef301f0603551d23041830168014eb78ed1e616d294a4ba80c7143272368e8a15f73300a06082a8648ce3d040302034800304502210082eceb5aa56a1b4c55176520c8d36b059ce56c0523a902312d4d821fa750b71302207c24a9d3904db54a967c50e39cfdd88bd2600d5fdfbbb5b04305cc6b8d3b013e",
+    "pai_cert": "308201ca3082016fa003020102020876d8e013abbff228300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a303b3139303706035504030c304d7669643a4646463141434d45204d617474657220446576656c2050414920354344414d7069643a30304231393839393059301306072a8648ce3d020106082a8648ce3d030107034200044529d3117c1620b85bedba1625d0532dcf27aacabf727de5fd87718fa831c2219d7e290e5569a98383aeddd6535c1ce7f7132074b051cbc44941cd4b9f88c8a5a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414eb78ed1e616d294a4ba80c7143272368e8a15f73301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100d857ca39185d655e765ed86a8e0267c804ef370831abd643b49cc915d2367234022100cb42abba9290c7e98b541e44e1dea0836acf28efca6444339401769f9ee01e72",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d040302044730450221008c5e26f9803a761df58dad43a982b9d847c3c5314e3f96f2ded64e141506dae402205fd7b4753013d99a84a7ffbedf849f637c2460aabe0aff798766cf9b4cc973b2",
+    "dac_private_key": "ec12854be29974e205a617a39b13c8bc7cc2efb7be41b2b56fe03f26d5fbc811",
+    "dac_public_key": "047dcffdc020b98cf45243ff00b6e6ecb9b2104716acf58caada56594e15d9765c3ab3d5ef5915710be74b2a98e8c556cd7501cf54d11f381fda345e3ebbf891af"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/cd.der
index aa20b0c055c7ca..6387bc383c918e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.der
index 6fca82e831d7b6..b8abc92b9864a6 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.pem
index 9b8e8d5e0c9880..7fb28270926b56 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAYCgAwIBAgIIaFuSg1fO06AwCgYIKoZIzj0EAwIwPDE6MDgGA1UEAwwx
+MIIB2jCCAYCgAwIBAgIILMCricVzdnEwCgYIKoZIzj0EAwIwPDE6MDgGA1UEAwwx
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkYxIE1waWQ6MDBC
-MTAgFw0yMjA1MjcwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwP
+MTAgFw0yMjA5MjMwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwP
 TWF0dGVyIFRlc3QgREFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQB
-gqJ8AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT034FzT1uclSfO
-1WYg/J9/O/6ESv145iyjFnjQvkW/z44j4WtDomTCIxRkDPy77HhGvmcHFO3uiPiu
-7POLsRkno2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
-FgQU84Jm/S0HXWT5OQMt83RM1M4pr8QwHwYDVR0jBBgwFoAUAgipGQX+IUwbCMy1
-6DcBUAoictAwCgYIKoZIzj0EAwIDSAAwRQIhAPH9orGAY+qIxDerxF1EujTjyACo
-0/WLvYq2snqSi1/kAiB5q/rVmuktZBDv01j6+MoyZrASeRFVXQ6KqExUuiJfZw==
+gqJ8AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR0w2hxFJpk6Hgi
+Cnl1LAGe23GTwhRKSm6ILvtZSpbsn3yglT+kI4uaSf6U1gwox98LoeCFLGD7G4Kp
+xMarawXso2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
+FgQUunOky+/ZRo+91+opv6tQaarLz1QwHwYDVR0jBBgwFoAUQDmZTAHgdmkNuL3h
+I3lUjVgklJIwCgYIKoZIzj0EAwIDSAAwRQIgKnF7217EMXvcOOulEH9ioz/od2Y4
+705DSmOgST2rk1wCIQDHMWDCZfQ7qzl9gCO8UIVN48vI9h6UWN64AjOqVLZZpA==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.der
index c534e76f15c174..e99a5b767c1ff1 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.pem
index bd610b4f4179ee..7c22ab004a385d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIK1mGhnH0baf2XmfhnReXrq1SG9ceZafw7OiWgBkUEkjoAoGCCqGSM49
-AwEHoUQDQgAE9N+Bc09bnJUnztVmIPyffzv+hEr9eOYsoxZ40L5Fv8+OI+FrQ6Jk
-wiMUZAz8u+x4Rr5nBxTt7oj4ruzzi7EZJw==
+MHcCAQEEIMx/noypKUI9kEZLMJzUUbq5HZCpwdNrxP2gjg1mqOYooAoGCCqGSM49
+AwEHoUQDQgAEdMNocRSaZOh4Igp5dSwBnttxk8IUSkpuiC77WUqW7J98oJU/pCOL
+mkn+lNYMKMffC6HghSxg+xuCqcTGq2sF7A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.der
index 3ba8996c7ede40..c34b7cab1939c6 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.pem
index 3c71a69db7a6bf..458ae7b808e118 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByjCCAXCgAwIBAgIIF0SrhL1RN50wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIByjCCAXCgAwIBAgIIHFHJbDpueRcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPDE6MDgGA1UEAwwxQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkYxIE1waWQ6MDBCMTBZMBMGByqGSM49
-AgEGCCqGSM49AwEHA0IABAYr1zfNJO25edT155EUYSHKTGpG3Ecd5fZcVJi7cqX0
-98hOOKnfSo8S3ULE5HhgHEA+CWB3gQjfkYGS/LW+ZwWjZjBkMBIGA1UdEwEB/wQI
-MAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQCCKkZBf4hTBsIzLXo
-NwFQCiJy0DAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjO
-PQQDAgNIADBFAiEAq0HrnLO1VX2N4RkyJZIRWJRaV8dOPpQJLkMZGWs9MaUCICF5
-3OkLBLNSiPfYj+PyB/Xqg+JcL5WuaxqwVBsEja/H
+AgEGCCqGSM49AwEHA0IABG2CN6/Rqql41h17tFvhBtwpxlEwYbY83HrzAE1+iOoU
+2hhVdB6AX1TdgpJnaHHTRkwlI0wt1UpWfMuEVm7NHbyjZjBkMBIGA1UdEwEB/wQI
+MAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRAOZlMAeB2aQ24veEj
+eVSNWCSUkjAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjO
+PQQDAgNIADBFAiAn3iYsk0XOqaj0VZfWrvEu99zgw8zR0SMFFGxclANVvgIhAOo0
+IiaAZQCwvwymnsLyM6+2xEDgGXz6Pd+tR9vziIpi
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.der
index f0160b8b705495..5c4012f7f8d1cf 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.pem
index a5177518fcf704..4586c85fa70336 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOxnSjizstuYGMm40HYwF7MxvyCa/jkKldClUgRwiES+oAoGCCqGSM49
-AwEHoUQDQgAEBivXN80k7bl51PXnkRRhIcpMakbcRx3l9lxUmLtypfT3yE44qd9K
-jxLdQsTkeGAcQD4JYHeBCN+RgZL8tb5nBQ==
+MHcCAQEEIA1an5EMKgn9o9METaiy6hlrZ+JJXrfkSwLe3O7/UBNsoAoGCCqGSM49
+AwEHoUQDQgAEbYI3r9GqqXjWHXu0W+EG3CnGUTBhtjzcevMATX6I6hTaGFV0HoBf
+VN2CkmdocdNGTCUjTC3VSlZ8y4RWbs0dvA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/test_case_vector.json
index 215bb5735b9177..fbb97c09628413 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mvid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "false",
-    "dac_cert": "308201da30820180a0030201020208685b928357ced3a0300a06082a8648ce3d040302303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464631204d7069643a303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004f4df81734f5b9c9527ced56620fc9f7f3bfe844afd78e62ca31678d0be45bfcf8e23e16b43a264c22314640cfcbbec7846be670714edee88f8aeecf38bb11927a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414f38266fd2d075d64f939032df3744cd4ce29afc4301f0603551d230418301680140208a91905fe214c1b08ccb5e83701500a2272d0300a06082a8648ce3d0403020348003045022100f1fda2b18063ea88c437abc45d44ba34e3c800a8d3f58bbd8ab6b27a928b5fe4022079abfad59ae92d6410efd358faf8ca3266b0127911555d0e8aa84c54ba225f67",
-    "pai_cert": "308201ca30820170a00302010202081744ab84bd51379d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004062bd737cd24edb979d4f5e791146121ca4c6a46dc471de5f65c5498bb72a5f4f7c84e38a9df4a8f12dd42c4e478601c403e0960778108df918192fcb5be6705a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604140208a91905fe214c1b08ccb5e83701500a2272d0301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ab41eb9cb3b5557d8de1193225921158945a57c74e3e94092e4319196b3d31a502202179dce90b04b35288f7d88fe3f207f5ea83e25c2f95ae6b1ab0541b048dafc7",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402203c9a4a5b55935b44f8b87d79613492134bcbe7592e9fbadc001ac3b99145a2c70220173330c6bb8c3487d644e4ad5e7aaea9ae10c443413debcdf7e33041c0d10497",
-    "dac_private_key": "ad661a19c7d1b69fd9799f86745e5ebab5486f5c79969fc3b3a25a0064504923",
-    "dac_public_key": "04f4df81734f5b9c9527ced56620fc9f7f3bfe844afd78e62ca31678d0be45bfcf8e23e16b43a264c22314640cfcbbec7846be670714edee88f8aeecf38bb11927"
+    "dac_cert": "308201da30820180a00302010202082cc0ab89c5737671300a06082a8648ce3d040302303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464631204d7069643a303042313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000474c36871149a64e878220a79752c019edb7193c2144a4a6e882efb594a96ec9f7ca0953fa4238b9a49fe94d60c28c7df0ba1e0852c60fb1b82a9c4c6ab6b05eca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ba73a4cbefd9468fbdd7ea29bfab5069aacbcf54301f0603551d230418301680144039994c01e076690db8bde12379548d58249492300a06082a8648ce3d040302034800304502202a717bdb5ec4317bdc38eba5107f62a33fe8776638ef4e434a63a0493dab935c022100c73160c265f43bab397d8023bc50854de3cbc8f61e9458deb80233aa54b659a4",
+    "pai_cert": "308201ca30820170a00302010202081c51c96c3a6e7917300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a303c313a303806035504030c3141434d45204d617474657220446576656c20504149203543444139383939204d7669643a464631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d030107034200046d8237afd1aaa978d61d7bb45be106dc29c6513061b63cdc7af3004d7e88ea14da1855741e805f54dd8292676871d3464c25234c2dd54a567ccb84566ecd1dbca366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604144039994c01e076690db8bde12379548d58249492301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022027de262c9345cea9a8f45597d6aef12ef7dce0c3ccd1d12305146c5c940355be022100ea342226806500b0bf0ca69ec2f233afb6c440e0197cfa3ddfad47dbf3888a62",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022076a4dd713a309fecfa71e707b71519a76d545c4d9a5195a0d58a4c9c49464bcc022100d562b3b2ef277df2cf64873d9e308ab622b81abe89aaa9114bbae1ad3efa9c4d",
+    "dac_private_key": "cc7f9e8ca929423d90464b309cd451bab91d90a9c1d36bc4fda08e0d66a8e628",
+    "dac_public_key": "0474c36871149a64e878220a79752c019edb7193c2144a4a6e882efb594a96ec9f7ca0953fa4238b9a49fe94d60c28c7df0ba1e0852c60fb1b82a9c4c6ab6b05ec"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/cd.der
index 22c2dbc9a94c68..5ecca77d917638 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.der
index 2cd36841d4cb73..9863f7151f301b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.pem
index 8b9163b17d5b2b..c606fb86880c6e 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAYGgAwIBAgIIAjg0q9T18ZowCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
+MIIB2zCCAYGgAwIBAgIIRZ58FhgAu3kwCgYIKoZIzj0EAwIwPTE7MDkGA1UEAwwy
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6ZmZmMSBNcGlkOjAw
-QjEwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
+QjEwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMEYxGDAWBgNVBAMM
 D01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEE
-AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEs0X1uuXUrqkY
-n0pxdJo3hE92/IUsntEP0EaX1WdyI2aTcjkNvhavHOSUGQKU8f6WTZyy3tAXjS8d
-FNnCa+HFC6NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
-BBYEFLMfPWXaC+KseyHsr3c2SmrlEoPZMB8GA1UdIwQYMBaAFKPkrgdDl6WvJc4Q
-6LFaxEbbpr9+MAoGCCqGSM49BAMCA0cAMEQCIDUk43AHJtU5Trnu6T5iHUrJ8SMb
-0Z8MFQm4tT5wW6DiAiAljIWWgqLWc/UxdvwCy43qBVPbRLrbxrGrAozytyB5eg==
+AYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEDWS72ZEqCQX1
+56GZ3SwMqdyckYb5pkAedDZ/COrBWm3hsrEeZ6RciwHz8Bd0j3VpAPFaphOX3TQu
+Lo5bWGCl16NgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFMYcAzUdNolYDj0weToOmJQTCN+TMB8GA1UdIwQYMBaAFLZb6hPtqHrnNJtB
+dCn83CG14MasMAoGCCqGSM49BAMCA0gAMEUCIAYxmJ8bzpI6QdcIrhV/ctmpsN+h
+zW2FsBO0bvNuT8woAiEAljgTzG9o0SXUEIpOncMKTn3p0RV+GylzJjG0aCWXFy0=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.der
index 13db58a476bf02..b0d1c7c8f407d1 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.pem
index ef03c942139269..9fc97a78974b04 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEypTYwqPME41wxkJgKEF9D2mjoUZ2rO2bXGTVUmyLYSoAoGCCqGSM49
-AwEHoUQDQgAEs0X1uuXUrqkYn0pxdJo3hE92/IUsntEP0EaX1WdyI2aTcjkNvhav
-HOSUGQKU8f6WTZyy3tAXjS8dFNnCa+HFCw==
+MHcCAQEEIF8irvKBSyqCMma3NMXkaoBGd0QT4Ac+mRCijthnFiCaoAoGCCqGSM49
+AwEHoUQDQgAEDWS72ZEqCQX156GZ3SwMqdyckYb5pkAedDZ/COrBWm3hsrEeZ6Rc
+iwHz8Bd0j3VpAPFaphOX3TQuLo5bWGCl1w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.der
index 50273966bd1f0f..982d82d906d63e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.pem
index ad37cd5fe05cc7..9599f2a1f67c03 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXGgAwIBAgIIDdAtFVKhYGYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIByzCCAXGgAwIBAgIINt4lTAnixbUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPTE7MDkGA1UEAwwyQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6ZmZmMSBNcGlkOjAwQjEwWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAATj8vxn4mlQm1b1mN/kQq3/3P0lILXw4vuKZE8aNs9z
-hBvpAFO+VI/NwYfjG50H4cPpwQEGvCE1VYnOi/ypYjQxo2YwZDASBgNVHRMBAf8E
-CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo+SuB0OXpa8lzhDo
-sVrERtumv34wHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
-zj0EAwIDSQAwRgIhAKOYMyLqVPU+LiJfWo6KrUJTGdGg83ECvIZ3Q6eQsIZDAiEA
-hIhv4MVTH+sxKFHc3HRnHh2W8bnbzzVNpTA/e1ObKaw=
+PQIBBggqhkjOPQMBBwNCAATDBSUPZkQiA/XQodSmmxXioE0yNNoY2xcUQXGx/G5x
+E5nlMu1OHPLn6iX2k5MwtCAMKqmVeVXxqHdnO97P+A7xo2YwZDASBgNVHRMBAf8E
+CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtlvqE+2oeuc0m0F0
+KfzcIbXgxqwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
+zj0EAwIDSAAwRQIhAK6IPhwCv4ktlzXpl+oeTj+0V2BNkiFW1p2w1Wot5vd8AiAg
+wlSCN5ExeYYaK3z/qZikkM/Yp60G3Flw8n9ANCnwNg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.der
index 2c9427a88c5d0a..3a8a209522fbca 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.pem
index 592ede36cc9b0f..a4a72046febe53 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOn7aNNguyUmtHNFJdP7T7jteMAmvJYln5FKw9BE8hdsoAoGCCqGSM49
-AwEHoUQDQgAE4/L8Z+JpUJtW9Zjf5EKt/9z9JSC18OL7imRPGjbPc4Qb6QBTvlSP
-zcGH4xudB+HD6cEBBrwhNVWJzov8qWI0MQ==
+MHcCAQEEIClGx5kZ9BgplNdw+sjEIURiVaHdqVJMpVGSrSMvsp3joAoGCCqGSM49
+AwEHoUQDQgAEwwUlD2ZEIgP10KHUppsV4qBNMjTaGNsXFEFxsfxucROZ5TLtThzy
+5+ol9pOTMLQgDCqplXlV8ah3Zzvez/gO8Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/test_case_vector.json
index 43d4a681683ed3..ff957566887a19 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mvid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "false",
-    "dac_cert": "308201da30820181a0030201020208023834abd4f5f19a300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a66666631204d7069643a303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004b345f5bae5d4aea9189f4a71749a37844f76fc852c9ed10fd04697d5677223669372390dbe16af1ce494190294f1fe964d9cb2ded0178d2f1d14d9c26be1c50ba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414b31f3d65da0be2ac7b21ecaf77364a6ae51283d9301f0603551d23041830168014a3e4ae074397a5af25ce10e8b15ac446dba6bf7e300a06082a8648ce3d040302034700304402203524e3700726d5394eb9eee93e621d4ac9f1231bd19f0c1509b8b53e705ba0e20220258c859682a2d673f53176fc02cb8dea0553db44badbc6b1ab028cf2b720797a",
-    "pai_cert": "308201cc30820171a00302010202080dd02d1552a16066300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a66666631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004e3f2fc67e269509b56f598dfe442adffdcfd2520b5f0e2fb8a644f1a36cf73841be90053be548fcdc187e31b9d07e1c3e9c10106bc21355589ce8bfca9623431a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a3e4ae074397a5af25ce10e8b15ac446dba6bf7e301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a3983322ea54f53e2e225f5a8e8aad425319d1a0f37102bc867743a790b0864302210084886fe0c5531feb312851dcdc74671e1d96f1b9dbcf354da5303f7b539b29ac",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502200dcf99449b2ec378c99d4635178736cf3c0988a5e32f61c604434539f26469af022100e85e0252d373fea140d7f4ef5caec379e393821c1da47017fc30b1eecb222066",
-    "dac_private_key": "4ca94d8c2a3cc138d70c6426028417d0f69a3a14676aced9b5c64d5526c8b612",
-    "dac_public_key": "04b345f5bae5d4aea9189f4a71749a37844f76fc852c9ed10fd04697d5677223669372390dbe16af1ce494190294f1fe964d9cb2ded0178d2f1d14d9c26be1c50b"
+    "dac_cert": "308201db30820181a0030201020208459e7c161800bb79300a06082a8648ce3d040302303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a66666631204d7069643a303042313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200040d64bbd9912a0905f5e7a199dd2c0ca9dc9c9186f9a6401e74367f08eac15a6de1b2b11e67a45c8b01f3f017748f756900f15aa61397dd342e2e8e5b5860a5d7a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c61c03351d3689580e3d30793a0e98941308df93301f0603551d23041830168014b65bea13eda87ae7349b417429fcdc21b5e0c6ac300a06082a8648ce3d040302034800304502200631989f1bce923a41d708ae157f72d9a9b0dfa1cd6d85b013b46ef36e4fcc28022100963813cc6f68d125d4108a4e9dc30a4e7de9d1157e1b29732631b4682597172d",
+    "pai_cert": "308201cb30820171a003020102020836de254c09e2c5b5300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a303d313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a66666631204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004c305250f66442203f5d0a1d4a69b15e2a04d3234da18db17144171b1fc6e711399e532ed4e1cf2e7ea25f6939330b4200c2aa9957955f1a877673bdecff80ef1a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b65bea13eda87ae7349b417429fcdc21b5e0c6ac301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ae883e1c02bf892d9735e997ea1e4e3fb457604d922156d69db0d56a2de6f77c022020c2548237913179861a2b7cffa998a490cfd8a7ad06dc5970f27f403429f036",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022078c7912cf529c6667355bdcc47943465c0e0938a39097b729944b8eca11b2c33022100cb500ec6b4291d8a1ec7fa4190e295ef1581af65fc79236dd728f36adc29a6ec",
+    "dac_private_key": "5f22aef2814b2a823266b734c5e46a8046774413e0073e9910a28ed86716209a",
+    "dac_public_key": "040d64bbd9912a0905f5e7a199dd2c0ca9dc9c9186f9a6401e74367f08eac15a6de1b2b11e67a45c8b01f3f017748f756900f15aa61397dd342e2e8e5b5860a5d7"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/cd.der
index 9a64e79a056afd..5bfe1013cfb04b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.der
index 25ad54644d5035..983f3b09fd28bb 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.pem
index b5e536eabc5a52..8ae0b8acc029d8 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2TCCAX+gAwIBAgIIKzOsbhbHWCcwCgYIKoZIzj0EAwIwOzE5MDcGA1UEAwww
+MIIB2TCCAX+gAwIBAgIIRstBrzp/ycMwCgYIKoZIzj0EAwIwOzE5MDcGA1UEAwww
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOkIx
-MCAXDTIyMDUyNzAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9N
+MCAXDTIyMDkyMzAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9N
 YXR0ZXIgVGVzdCBEQUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGC
-onwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABEEMoM8hQ+uSX/j4
-mkRxpzkEsDMPPlIVTu6qrxjApUz7AhKUg7Itao2g2wne/uRJkO3GnT+7Us8zq0Vd
-sbWlrH+jYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
-BBSlk0YpTGU3PHYwOb3Q1/XLfe0PrjAfBgNVHSMEGDAWgBRuMc10cYzZEF6YcQI3
-0Z6y/kgNhjAKBggqhkjOPQQDAgNIADBFAiA8Y+UfRWE375WbtRSHqiVhbYq28Su8
-U093hCGJvUlangIhAP0/feXccje5fzvM9CVafdVQEXnIz0gONICc/dix3FPX
+onwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNPhxUIqshPxGPlZ
+oz0iBDQs9Zjf/PXOwEdKG7puTBpyY6WcYFz4kgOKcE/SZhSbXIn+NeF+jdonm7A8
+sce/jKajYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
+BBQwYW3KvodKxl49zojefFzF3v2G+TAfBgNVHSMEGDAWgBSPoDYmjo7tvHPhKg7q
+3LL77I+qrDAKBggqhkjOPQQDAgNIADBFAiBO8TTWC7FQ3vMPfC34+IxGdV429IoS
+gxqu3xfElEzXDQIhAPYVVQhRB+Tng6Wtarxk4e4fDXGbfYOl+LrOQZSfhcKE
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.der
index 8f4f090876ad1f..0d761e385f744a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.pem
index 025ea70304e17d..357c9c6e59485d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINpQPky8BdPz5QVNqPQvjFI6N/k9LMwMimLkgw9mKTGCoAoGCCqGSM49
-AwEHoUQDQgAEQQygzyFD65Jf+PiaRHGnOQSwMw8+UhVO7qqvGMClTPsCEpSDsi1q
-jaDbCd7+5EmQ7cadP7tSzzOrRV2xtaWsfw==
+MHcCAQEEIAXaYOHeu+4J8xiBrILrbOURbbgCYGB3Zh/5aDEkZfp1oAoGCCqGSM49
+AwEHoUQDQgAE0+HFQiqyE/EY+VmjPSIENCz1mN/89c7AR0obum5MGnJjpZxgXPiS
+A4pwT9JmFJtcif414X6N2iebsDyxx7+Mpg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.der
index d2ad805ab8382c..cbfa3da9cb70ca 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.pem
index 97453033c1ec97..5e520252b1e7b9 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByjCCAW+gAwIBAgIIZSqzwIXu0DcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIByTCCAW+gAwIBAgIIIbF9Ni/pr64wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowOzE5MDcGA1UEAwwwQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOkIxMFkwEwYHKoZIzj0C
-AQYIKoZIzj0DAQcDQgAEMTGfMCT1PovNRKy3ekqKHU32GWbwtKBv+4+lr1uimI+j
-4sZ3R/tZ6U6dNW6VCdvJXZNFygxeeAeMiTYP50nKLaNmMGQwEgYDVR0TAQH/BAgw
-BgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFG4xzXRxjNkQXphxAjfR
-nrL+SA2GMB8GA1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49
-BAMCA0kAMEYCIQCTCRxWEPkh2dfjr+aOd/6f3yhXugnivNLlAxlhh+eQMgIhAM6P
-iOHpRpBE71g/wG7X3iJ3eXVyBvN3nnUXZj2CbfYS
+AQYIKoZIzj0DAQcDQgAE5y2+Kg9gA1iXgCLqcPt+8+8U3pKg37nPuDtUL7zLe4p7
+E9Pzeibf0kACJK5KuC4cE8pXpF5O5U6GKhkqbU8fOqNmMGQwEgYDVR0TAQH/BAgw
+BgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFI+gNiaOju28c+EqDurc
+svvsj6qsMB8GA1UdIwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49
+BAMCA0gAMEUCIQCTpjxvOX0536W2DAbCg5RIq12wvwcox0ScZr3FXj/2wwIgewyZ
+f/lfF5W4aCjRE3s08/Ku8f+yGDpuTAKDbBxzUXE=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.der
index 8d60101685d385..f3ec56e7145ab2 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.pem
index eca9f56636d881..1da2c4d4aba7b1 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPWzamTiFoWR2jAlmYiJJDdEUf9HK3axqPx1KWKPIBn0oAoGCCqGSM49
-AwEHoUQDQgAEMTGfMCT1PovNRKy3ekqKHU32GWbwtKBv+4+lr1uimI+j4sZ3R/tZ
-6U6dNW6VCdvJXZNFygxeeAeMiTYP50nKLQ==
+MHcCAQEEIKokLn2sgFRaF4Fy+z+AgDGnhqOyIAcJBbxvzMNbUG3uoAoGCCqGSM49
+AwEHoUQDQgAE5y2+Kg9gA1iXgCLqcPt+8+8U3pKg37nPuDtUL7zLe4p7E9Pzeibf
+0kACJK5KuC4cE8pXpF5O5U6GKhkqbU8fOg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/test_case_vector.json
index 0753d4ec94cf62..85eb673f5d51fd 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_08/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mpid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "true",
-    "dac_cert": "308201d93082017fa00302010202082b33ac6e16c75827300a06082a8648ce3d040302303b3139303706035504030c3041434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a42313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004410ca0cf2143eb925ff8f89a4471a73904b0330f3e52154eeeaaaf18c0a54cfb02129483b22d6a8da0db09defee44990edc69d3fbb52cf33ab455db1b5a5ac7fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a59346294c65373c763039bdd0d7f5cb7ded0fae301f0603551d230418301680146e31cd74718cd9105e98710237d19eb2fe480d86300a06082a8648ce3d040302034800304502203c63e51f456137ef959bb51487aa25616d8ab6f12bbc534f77842189bd495a9e022100fd3f7de5dc7237b97f3bccf4255a7dd5501179c8cf480e34809cfdd8b1dc53d7",
-    "pai_cert": "308201ca3082016fa0030201020208652ab3c085eed037300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a303b3139303706035504030c3041434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a42313059301306072a8648ce3d020106082a8648ce3d0301070342000431319f3024f53e8bcd44acb77a4a8a1d4df61966f0b4a06ffb8fa5af5ba2988fa3e2c67747fb59e94e9d356e9509dbc95d9345ca0c5e78078c89360fe749ca2da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604146e31cd74718cd9105e98710237d19eb2fe480d86301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210093091c5610f921d9d7e3afe68e77fe9fdf2857ba09e2bcd2e503196187e79032022100ce8f88e1e9469044ef583fc06ed7de227779757206f3779e7517663d826df612",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100ffe39b9f479f0f6c98a02a3a97c0a8c7c1754d3c87e7b70f6c676bc12ed83dc302203c6f75ed2d90c9c75a28836c6cdf4191f4c9ad9d940d5108217ac597c2f16980",
-    "dac_private_key": "da503e4cbc05d3f3e5054da8f42f8c523a37f93d2ccc0c8a62e4830f66293182",
-    "dac_public_key": "04410ca0cf2143eb925ff8f89a4471a73904b0330f3e52154eeeaaaf18c0a54cfb02129483b22d6a8da0db09defee44990edc69d3fbb52cf33ab455db1b5a5ac7f"
+    "dac_cert": "308201d93082017fa003020102020846cb41af3a7fc9c3300a06082a8648ce3d040302303b3139303706035504030c3041434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a42313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004d3e1c5422ab213f118f959a33d2204342cf598dffcf5cec0474a1bba6e4c1a7263a59c605cf892038a704fd266149b5c89fe35e17e8dda279bb03cb1c7bf8ca6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041430616dcabe874ac65e3dce88de7c5cc5defd86f9301f0603551d230418301680148fa036268e8eedbc73e12a0eeadcb2fbec8faaac300a06082a8648ce3d040302034800304502204ef134d60bb150def30f7c2df8f88c46755e36f48a12831aaedf17c4944cd70d022100f61555085107e4e783a5ad6abc64e1ee1f0d719b7d83a5f8bace41949f85c284",
+    "pai_cert": "308201c93082016fa003020102020821b17d362fe9afae300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a303b3139303706035504030c3041434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a42313059301306072a8648ce3d020106082a8648ce3d03010703420004e72dbe2a0f600358978022ea70fb7ef3ef14de92a0dfb9cfb83b542fbccb7b8a7b13d3f37a26dfd2400224ae4ab82e1c13ca57a45e4ee54e862a192a6d4f1f3aa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148fa036268e8eedbc73e12a0eeadcb2fbec8faaac301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502210093a63c6f397d39dfa5b60c06c2839448ab5db0bf0728c7449c66bdc55e3ff6c302207b0c997ff95f1795b86828d1137b34f3f2aef1ffb2183a6e4c02836c1c735171",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e1d4967878513c474101db44c68061689be47443e21f6675c34b872edc5a319c022100a963e07bcd8e4abeb8b4fcb19f6a59c92f1a3bad4d7153f333684f93a836e3f9",
+    "dac_private_key": "05da60e1debbee09f31881ac82eb6ce5116db802606077661ff968312465fa75",
+    "dac_public_key": "04d3e1c5422ab213f118f959a33d2204342cf598dffcf5cec0474a1bba6e4c1a7263a59c605cf892038a704fd266149b5c89fe35e17e8dda279bb03cb1c7bf8ca6"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/cd.der
index e3c7d0b4870ff2..189d033f1c426c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.der
index 8871297d37ca0a..be36c25e6d76e9 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.pem
index 7d2f9f22acc6cb..5bd03d17a195ce 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2DCCAX2gAwIBAgIITntKURGuIa8wCgYIKoZIzj0EAwIwOTE3MDUGA1UEAwwu
+MIIB2DCCAX2gAwIBAgIIaX6kgeF/D5wwCgYIKoZIzj0EAwIwOTE3MDUGA1UEAwwu
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE1waWQ6IE12aWQ6RkZGMTAg
-Fw0yMjA1MjcwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
+Fw0yMjA5MjMwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
 dGVyIFRlc3QgREFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8
-AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR2DDIOfC1WUILu/euh
-1m81fvULh6mMkMO7SzFKecQqPkAUKWoasL8Wbc7+86hsMOMzT4XeuwklC2R1L5Rd
-RAifo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-1+B6S4ROW6D+m+9AR26eisnopb8wHwYDVR0jBBgwFoAUVRQK9QaXbZJhHFHOw8ID
-d5DdR8AwCgYIKoZIzj0EAwIDSQAwRgIhANxBzygTuSLw+chPtVBZtdLj9oSSOh2D
-9tmquu5gy/vUAiEAoklbCKSmqnu07J9wAKQQsEu2n0jEVX9b3Ehk/LqqeH0=
+AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARuuAeHdvr5EGEBG6yo
+HUV3tba2Tm8wCd28Ba6iDqoETb3i9wcW3h0OoiIaV7pcoqsjmV//GOY8bGdeQD97
+9+1To2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+HBvap7PBgHboEYfaYyle4Gin/ikwHwYDVR0jBBgwFoAUvXgVF+xSS4t1Ln5SkGPe
+ltbC3rEwCgYIKoZIzj0EAwIDSQAwRgIhAMpZ+1zJ/Xd2Qbp2HJ+/Ftwk8ET8/KXe
+rRftfK4Co/ZNAiEAu1AeUr7y4P89m2ybyNrBxq35ShnWbzjPhAuJ4LvX3BI=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.der
index b5ae1a4cbc96a5..504f07824ffbc4 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.pem
index 625c9a354d7d74..fe91443f61935b 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPRs2bn77Sgnu1BgZ8GYl/I8jd9orP8R8ZHlgzs3fO4toAoGCCqGSM49
-AwEHoUQDQgAEdgwyDnwtVlCC7v3rodZvNX71C4epjJDDu0sxSnnEKj5AFClqGrC/
-Fm3O/vOobDDjM0+F3rsJJQtkdS+UXUQInw==
+MHcCAQEEIIwO/rDQivQ4S/PPdSVsOkeoilFEJtkRN1rFvH0DVkISoAoGCCqGSM49
+AwEHoUQDQgAEbrgHh3b6+RBhARusqB1Fd7W2tk5vMAndvAWuog6qBE294vcHFt4d
+DqIiGle6XKKrI5lf/xjmPGxnXkA/e/ftUw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.der
index ee746d4bf00032..562fcc4bd2eb4c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.pem
index e20e77cc869887..43d17c7fc83870 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBxjCCAW2gAwIBAgIIPZVSLqZoKkwwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBxjCCAW2gAwIBAgIILb/ANO4uvjIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowOTE3MDUGA1UEAwwuQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE1waWQ6IE12aWQ6RkZGMTBZMBMGByqGSM49AgEG
-CCqGSM49AwEHA0IABP3qi83ECOWohcvGIXaVdYOgQh5ORHEaCA/xVyJi56/vxNa1
-aniNTTtXGsJdZ4r5ZOiiNbBf4RL5nu479X1xfNijZjBkMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRVFAr1BpdtkmEcUc7DwgN3
-kN1HwDAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
-AgNHADBEAiAUPf5G+P+qEyGigcHFz9DDvkl27QWC0mpSmpPqGHg2NwIgRaX9kDAd
-EVb7PsLf4nP5ymY7AbQYhXkLgRgpN+0bn2w=
+CCqGSM49AwEHA0IABBqHLjnE+DN5RcUbGl36AJ4PhAKlnZltoFeqNwrLGEULwzFr
+q898bu0FVTANfp5KxCwOlVaFeDXo6N4tkaG70n2jZjBkMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS9eBUX7FJLi3UuflKQY96W
+1sLesTAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
+AgNHADBEAiBcOP+TxAeWGpjmG8I+plOBp2D5esBIHs6O4hvNRRuMIAIgHWx+5RCu
+wQ6gJAL19tgLx0SJ+4eT1kp34GuP7Oac1Lg=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.der
index ae6c118f1306ea..c937d3e53f4293 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.pem
index 236053914b1b5a..82c081b5552ba9 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMnOpWwbesfaUBE10ikq7Ed8hcvNuhypIh/EdZOgiq7YoAoGCCqGSM49
-AwEHoUQDQgAE/eqLzcQI5aiFy8YhdpV1g6BCHk5EcRoID/FXImLnr+/E1rVqeI1N
-O1cawl1nivlk6KI1sF/hEvme7jv1fXF82A==
+MHcCAQEEIKKFVOVJ/t3u4VEsgX9bYlqcw1y4Y2ZvccUJmPYBO31roAoGCCqGSM49
+AwEHoUQDQgAEGocuOcT4M3lFxRsaXfoAng+EAqWdmW2gV6o3CssYRQvDMWurz3xu
+7QVVMA1+nkrELA6VVoV4Nejo3i2RobvSfQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/test_case_vector.json
index 58f67d5a51c7ee..6f714c607caacf 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_09/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example from spec: invalid, since substring following Mpid: is not exactly 4 uppercase hexadecimal digits",
     "is_success_case": "true",
-    "dac_cert": "308201d83082017da00302010202084e7b4a5111ae21af300a06082a8648ce3d04030230393137303506035504030c2e41434d45204d617474657220446576656c20504149203543444139383939204d7069643a204d7669643a464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004760c320e7c2d565082eefdeba1d66f357ef50b87a98c90c3bb4b314a79c42a3e4014296a1ab0bf166dcefef3a86c30e3334f85debb09250b64752f945d44089fa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414d7e07a4b844e5ba0fe9bef40476e9e8ac9e8a5bf301f0603551d2304183016801455140af506976d92611c51cec3c2037790dd47c0300a06082a8648ce3d0403020349003046022100dc41cf2813b922f0f9c84fb55059b5d2e3f684923a1d83f6d9aabaee60cbfbd4022100a2495b08a4a6aa7bb4ec9f7000a410b04bb69f48c4557f5bdc4864fcbaaa787d",
-    "pai_cert": "308201c63082016da00302010202083d95522ea6682a4c300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30393137303506035504030c2e41434d45204d617474657220446576656c20504149203543444139383939204d7069643a204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d03010703420004fdea8bcdc408e5a885cbc62176957583a0421e4e44711a080ff1572262e7afefc4d6b56a788d4d3b571ac25d678af964e8a235b05fe112f99eee3bf57d717cd8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041455140af506976d92611c51cec3c2037790dd47c0301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220143dfe46f8ffaa1321a281c1c5cfd0c3be4976ed0582d26a529a93ea18783637022045a5fd90301d1156fb3ec2dfe273f9ca663b01b41885790b81182937ed1b9f6c",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402206d1701c37ff7fffb8dada85e67146289458cc617ac0efc3c115f076ff75d0b280220725e63658d8715bc8dbe2459c499a8456254eec0a518e0205ec52ec80649af4e",
-    "dac_private_key": "f46cd9b9fbed2827bb506067c19897f23c8ddf68acff11f191e5833b377cee2d",
-    "dac_public_key": "04760c320e7c2d565082eefdeba1d66f357ef50b87a98c90c3bb4b314a79c42a3e4014296a1ab0bf166dcefef3a86c30e3334f85debb09250b64752f945d44089f"
+    "dac_cert": "308201d83082017da0030201020208697ea481e17f0f9c300a06082a8648ce3d04030230393137303506035504030c2e41434d45204d617474657220446576656c20504149203543444139383939204d7069643a204d7669643a464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200046eb8078776faf91061011baca81d4577b5b6b64e6f3009ddbc05aea20eaa044dbde2f70716de1d0ea2221a57ba5ca2ab23995fff18e63c6c675e403f7bf7ed53a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141c1bdaa7b3c18076e81187da63295ee068a7fe29301f0603551d23041830168014bd781517ec524b8b752e7e529063de96d6c2deb1300a06082a8648ce3d0403020349003046022100ca59fb5cc9fd777641ba761c9fbf16dc24f044fcfca5dead17ed7cae02a3f64d022100bb501e52bef2e0ff3d9b6c9bc8dac1c6adf94a19d66f38cf840b89e0bbd7dc12",
+    "pai_cert": "308201c63082016da00302010202082dbfc034ee2ebe32300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30393137303506035504030c2e41434d45204d617474657220446576656c20504149203543444139383939204d7069643a204d7669643a464646313059301306072a8648ce3d020106082a8648ce3d030107034200041a872e39c4f8337945c51b1a5dfa009e0f8402a59d996da057aa370acb18450bc3316babcf7c6eed0555300d7e9e4ac42c0e9556857835e8e8de2d91a1bbd27da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414bd781517ec524b8b752e7e529063de96d6c2deb1301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402205c38ff93c407961a98e61bc23ea65381a760f97ac0481ece8ee21bcd451b8c2002201d6c7ee510aec10ea02402f5f6d80bc74489fb8793d64a77e06b8fece69cd4b8",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201f38b426df25ab4f552ded014845afb1a353e808e9250fc19dcfcab3d717679f0220575a610c996f0221628ff9a76123d3462922f91b6011ba727e6d42884ae88c08",
+    "dac_private_key": "8c0efeb0d08af4384bf3cf75256c3a47a88a514426d911375ac5bc7d03564212",
+    "dac_public_key": "046eb8078776faf91061011baca81d4577b5b6b64e6f3009ddbc05aea20eaa044dbde2f70716de1d0ea2221a57ba5ca2ab23995fff18e63c6c675e403f7bf7ed53"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/cd.der
index 0f930a5febd4bc..4cc67e7ae7aebb 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.der
index f96087eea09412..c7290b4f197d14 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.pem
index dde91ceee99475..f3cd3a14e18f34 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWOgAwIBAgIIfRsYe5ExaTEwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
-TXZpZDpGRkYgTXBpZDowMEIxMHgwIBcNMjIwNTI3MDAwMDAwWhgPOTk5OTEyMzEy
+MIIBvTCCAWOgAwIBAgIIbkDZ0D1T4EwwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
+TXZpZDpGRkYgTXBpZDowMEIxMHgwIBcNMjIwOTIzMDAwMDAwWhgPOTk5OTEyMzEy
 MzU5NTlaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IERBQzEUMBIGCisGAQQBgqJ8
 AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQwMEIxMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEiQt3dg6LdUyoEjS2Dg1raQgAJJxN+S1xfK/ywGNVQO0nppRsynUT
-zy7cpozaADsUuK2IRXobAb2ryAPC3ciFCaNgMF4wDAYDVR0TAQH/BAIwADAOBgNV
-HQ8BAf8EBAMCB4AwHQYDVR0OBBYEFEUf3Nxx4uqY+EXukMLgZXN4WulsMB8GA1Ud
-IwQYMBaAFIS5DclmFWUt8hazhCen0szPTzbpMAoGCCqGSM49BAMCA0gAMEUCIFA2
-SdpO2lmgs8g1zjNVxVuQE5fiu3jqUqrbuV0RdscnAiEAju0pkLdmXPtOeA8xwHRI
-uC784Gd3qdHnR1yQ8tZcmdo=
+zj0DAQcDQgAEFNuO4dPI5DpAA1LFgTcPc704DteyG6IHl/Uowp3JgOxZbfaBmytx
+6yeMUo8tQKJTcdvFdvp5vB+U9U9JocWPRaNgMF4wDAYDVR0TAQH/BAIwADAOBgNV
+HQ8BAf8EBAMCB4AwHQYDVR0OBBYEFGA6f0xsz2AIBXuK6CYiYf172qVYMB8GA1Ud
+IwQYMBaAFJRwtu6BmdfSLaR1m/QMbIai5i1fMAoGCCqGSM49BAMCA0gAMEUCICiv
+RNF1uyYX7F5SbCUuWMFcQTDOcJVOBqytVmHSWoGFAiEAoi+sYMsbAcxtiR+TORd+
+xauc+od3c7gbLbmxDdGs28M=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.der
index 522cdb5a3c2c81..7f7e829758e50b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.pem
index 0bdf646cd2d3a4..aa9b5b92af4a21 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIO38/cI1g1CafreX/ydhBt0YAIPMf0Bydyjod0RC0sZPoAoGCCqGSM49
-AwEHoUQDQgAEiQt3dg6LdUyoEjS2Dg1raQgAJJxN+S1xfK/ywGNVQO0nppRsynUT
-zy7cpozaADsUuK2IRXobAb2ryAPC3ciFCQ==
+MHcCAQEEIC5bDlxtJ2NhRCkWdFBCZK+JEQC9hlpKCDgT61OyPv0PoAoGCCqGSM49
+AwEHoUQDQgAEFNuO4dPI5DpAA1LFgTcPc704DteyG6IHl/Uowp3JgOxZbfaBmytx
+6yeMUo8tQKJTcdvFdvp5vB+U9U9JocWPRQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.der
index 77db0fbabb84f1..6bff3458383880 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.pem
index 0609b99b715db2..abc727e6cef4e0 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBrjCCAVOgAwIBAgIIZdvrGtcfwNEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBrjCCAVOgAwIBAgIIE56YGOsgaqIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowHzEdMBsGA1UEAwwUTXZpZDpGRkYgTXBp
-ZDowMEIxMHgwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARTBMHhSTAOE/9+OodG
-EkmYhAL+OTqWi1H/mDWO069Hq/DBEMJtUN48tnbBmhtVkWFv5/KrYpReIMf7qqu2
-2yfao2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNV
-HQ4EFgQUhLkNyWYVZS3yFrOEJ6fSzM9PNukwHwYDVR0jBBgwFoAUav0idx9RH+y/
-FkGXZxDc3DGhcX4wCgYIKoZIzj0EAwIDSQAwRgIhAM2aDn88FIGF+1pj85XA6SGN
-qJDsgpl0LyY3QUupfw5aAiEAiBJMPfFy0q1DbG7G1/CkBjvUx/uoexk3LhvTeLRQ
-BJ4=
+ZDowMEIxMHgwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARBzjhW8x3NBz+cPqJt
++AH0dnYXMfXBm1fKn7uZ6nKJ30VFKH7UB1BeG0+VUEELbTtNPU1zchKGtPBVRhOr
+9lZ9o2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUlHC27oGZ19ItpHWb9AxshqLmLV8wHwYDVR0jBBgwFoAUav0idx9RH+y/
+FkGXZxDc3DGhcX4wCgYIKoZIzj0EAwIDSQAwRgIhAKls79kDKcnZszg+nRr7Q2FY
+UZBtYv1GJkIBFy/LXlKNAiEA7lV+bB+l1RNsM0Vh46JMCD3sY63aDtcfdKEdwdQY
+GCk=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.der
index 55218b9581503f..2e4f4b262fa80d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.pem
index a5eaee65598ede..61876676663e23 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEH0DqFaJ0OudBYts5oLpwYPiN0xNikExsSdXIiIFDhqoAoGCCqGSM49
-AwEHoUQDQgAEUwTB4UkwDhP/fjqHRhJJmIQC/jk6lotR/5g1jtOvR6vwwRDCbVDe
-PLZ2wZobVZFhb+fyq2KUXiDH+6qrttsn2g==
+MHcCAQEEILx3qHonh4xx/iY+PlOsdnm2KJ/VKRrFsYBu4b9uP7xYoAoGCCqGSM49
+AwEHoUQDQgAEQc44VvMdzQc/nD6ibfgB9HZ2FzH1wZtXyp+7mepyid9FRSh+1AdQ
+XhtPlVBBC207TT1Nc3IShrTwVUYTq/ZWfQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/test_case_vector.json
index 8b4798194a4ca4..3615a6d9a15024 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example: invalid VID encoding",
     "is_success_case": "false",
-    "dac_cert": "308201bd30820163a00302010202087d1b187b91316931300a06082a8648ce3d040302301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004890b77760e8b754ca81234b60e0d6b690800249c4df92d717caff2c0635540ed27a6946cca7513cf2edca68cda003b14b8ad88457a1b01bdabc803c2ddc88509a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414451fdcdc71e2ea98f845ee90c2e06573785ae96c301f0603551d2304183016801484b90dc96615652df216b38427a7d2cccf4f36e9300a06082a8648ce3d04030203480030450220503649da4eda59a0b3c835ce3355c55b901397e2bb78ea52aadbb95d1176c7270221008eed2990b7665cfb4e780f31c07448b82efce06777a9d1e7475c90f2d65c99da",
-    "pai_cert": "308201ae30820153a003020102020865dbeb1ad71fc0d1300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783059301306072a8648ce3d020106082a8648ce3d030107034200045304c1e149300e13ff7e3a87461249988402fe393a968b51ff98358ed3af47abf0c110c26d50de3cb676c19a1b5591616fe7f2ab62945e20c7fbaaabb6db27daa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041484b90dc96615652df216b38427a7d2cccf4f36e9301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100cd9a0e7f3c148185fb5a63f395c0e9218da890ec8299742f2637414ba97f0e5a02210088124c3df172d2ad436c6ec6d7f0a4063bd4c7fba87b19372e1bd378b450049e",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020448304602210088441ac08531b456749ceaf2450e0122cac19e6e96917b37492a2c9476781605022100a70dacbf57c2fe733383feed0983740dff653f802481ef02108cfeba130a55fb",
-    "dac_private_key": "edfcfdc23583509a7eb797ff276106dd180083cc7f40727728e8774442d2c64f",
-    "dac_public_key": "04890b77760e8b754ca81234b60e0d6b690800249c4df92d717caff2c0635540ed27a6946cca7513cf2edca68cda003b14b8ad88457a1b01bdabc803c2ddc88509"
+    "dac_cert": "308201bd30820163a00302010202086e40d9d03d53e04c300a06082a8648ce3d040302301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000414db8ee1d3c8e43a400352c581370f73bd380ed7b21ba20797f528c29dc980ec596df6819b2b71eb278c528f2d40a25371dbc576fa79bc1f94f54f49a1c58f45a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414603a7f4c6ccf6008057b8ae8262261fd7bdaa558301f0603551d230418301680149470b6ee8199d7d22da4759bf40c6c86a2e62d5f300a06082a8648ce3d0403020348003045022028af44d175bb2617ec5e526c252e58c15c4130ce70954e06acad5661d25a8185022100a22fac60cb1b01cc6d891f9339177ec5ab9cfa877773b81b2db9b10dd1acdbc3",
+    "pai_cert": "308201ae30820153a0030201020208139e9818eb206aa2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a301f311d301b06035504030c144d7669643a464646204d7069643a3030423130783059301306072a8648ce3d020106082a8648ce3d0301070342000441ce3856f31dcd073f9c3ea26df801f476761731f5c19b57ca9fbb99ea7289df4545287ed407505e1b4f9550410b6d3b4d3d4d73721286b4f0554613abf6567da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604149470b6ee8199d7d22da4759bf40c6c86a2e62d5f301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100a96cefd90329c9d9b3383e9d1afb43615851906d62fd46264201172fcb5e528d022100ee557e6c1fa5d5136c334561e3a24c083dec63adda0ed71f74a11dc1d4181829",
+    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402206cd818861259869d69ed0b9cc2b32e31daccf37f7151336fa0c4f165f505d03e022050ac584e1fcd7cb6caca10b21f5c54ac6450610af6d7f2bf8c49905ca2e887ae",
+    "dac_private_key": "2e5b0e5c6d27636144291674504264af891100bd865a4a083813eb53b23efd0f",
+    "dac_public_key": "0414db8ee1d3c8e43a400352c581370f73bd380ed7b21ba20797f528c29dc980ec596df6819b2b71eb278c528f2d40a25371dbc576fa79bc1f94f54f49a1c58f45"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/cd.der
index ac29a73d3e9f0b..524b6299aa2df3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.der
index 33b961c1af6c94..3ab16f38e3eaf2 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.pem
index 9d8b04c8165d6a..7088802ebf7ae3 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzDCCAXOgAwIBAgIIKAMQGorzkWswCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
-TXBpZE12aWQ6RkZGMTAgTWF0dGVyIFRlc3QgTXBpZDowMEIxMCAXDTIyMDUyNzAw
+MIIBzTCCAXOgAwIBAgIIS9s0H1/Fk3owCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
+TXBpZE12aWQ6RkZGMTAgTWF0dGVyIFRlc3QgTXBpZDowMEIxMCAXDTIyMDkyMzAw
 MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBE
 QUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABO2tGs1AhPsq0RQtA/7PJhvBN/lLdc1P
-YpCBrtsI+3ilv2gRkNFGK4qgBl/7ixYhGcKx5oMcz7nxS0/zGUHSVO6jYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBSTeamhtjAKlcWT
-G0IuOwzDJTUE7jAfBgNVHSMEGDAWgBSEOYNr4u6qNznaIR0skx2uNEnN/zAKBggq
-hkjOPQQDAgNHADBEAiB5VB0qfQEkKQliAUYsrbSngvxYY2Y3Voc1SuGE9uMCUgIg
-WuYEXGNsXw4DmSx6FgsYxF205b/0d0Z2R29z3ZB176w=
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABOglRniwI8FzSuqHM31DSKBi5XZtmLGF
+p7QR/ZngcFhBH8g5ZJNsSAI+5iVJeSmA6RjaImMaj00mxXC0F87Fpe2jYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBQUQ2QAVaRcOA6g
+p1iNDBRjR+TAqjAfBgNVHSMEGDAWgBTFD94e56d5CdszFF+/hI8IhoTLMjAKBggq
+hkjOPQQDAgNIADBFAiEAx2iqZrbx9Nt6On+qRBBmxRYZ3tM7+ZO7km1NHrc/2ngC
+IBC3raJCIFIqGpcZUqsMbTOFM8hOKnVSWa5rKiOpW4o8
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.der
index f78c07242bb4cb..9d4a798719153d 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.pem
index d505adc11cbd5d..39f3ae393ed545 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJc8x/jAp5hoEbsY5xeKCbAhOwZPInv7j5YRKoKjXZrUoAoGCCqGSM49
-AwEHoUQDQgAE7a0azUCE+yrRFC0D/s8mG8E3+Ut1zU9ikIGu2wj7eKW/aBGQ0UYr
-iqAGX/uLFiEZwrHmgxzPufFLT/MZQdJU7g==
+MHcCAQEEIKTuUub/nelJKUbXffwjvLzoaZB8Qvj4gKM0pwxxyq5poAoGCCqGSM49
+AwEHoUQDQgAE6CVGeLAjwXNK6oczfUNIoGLldm2YsYWntBH9meBwWEEfyDlkk2xI
+Aj7mJUl5KYDpGNoiYxqPTSbFcLQXzsWl7Q==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.der
index 3bf9b3f4cd5c39..d334a43aeffd31 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.pem
index b1039c8fdf2784..fafe54cdee560d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvjCCAWOgAwIBAgIICYrXInrw9rYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
-MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowLzEtMCsGA1UEAwwkTXBpZE12aWQ6RkZG
-MTAgTWF0dGVyIFRlc3QgTXBpZDowMEIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEvJ3EHcsCaFigfbjkoZQ/Nx7/H+wFbuUAxutyd1k6nvZjfHTIlV/uPEsnPRvC
-okdRXR5NpON3/EgiOckTAa5s5qNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIQ5g2vi7qo3OdohHSyTHa40Sc3/MB8GA1Ud
-IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0kAMEYCIQDI
-Fgj0JUEhSIB8avz74RqTfpcBo4T6Vx0uvlJ3Ahv8AQIhAM8IplVr3XPUS61U2UzX
-HKYFBxjY7SNSol1M8MM4j145
+MIIBvDCCAWKgAwIBAgIHR1Ddib00kTAKBggqhkjOPQQDAjAwMRgwFgYDVQQDDA9N
+YXR0ZXIgVGVzdCBQQUExFDASBgorBgEEAYKifAIBDARGRkYxMCAXDTIyMDkyMzAw
+MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjAvMS0wKwYDVQQDDCRNcGlkTXZpZDpGRkYx
+MCBNYXR0ZXIgVGVzdCBNcGlkOjAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
+AATDkRFOf9Yn48FSI1vxYV6sioecfppRunyeZFlYkbysibBmQWlIN2u09PBC0/QB
+kY3/h2AT+Z7D0fMb94/N2ne6o2YwZDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUxQ/eHueneQnbMxRfv4SPCIaEyzIwHwYDVR0j
+BBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZIzj0EAwIDSAAwRQIhAKig
+TV9mmqmx8yjch1pJkWMfQluTD8FnKM1jwp9I3EZcAiAeQe1C5Zu4QnSfRX4GL3Mh
+XNYGgP5Hit1GhlvKNqsd0A==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.der
index 1780a70983b7bc..a6453b5e4d4470 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.pem
index a95b12569bd08d..0533a44cab50f2 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBod1xsLrej5RRswRs8pXCA2JqMSETJFBVEplW8YO6SvoAoGCCqGSM49
-AwEHoUQDQgAEvJ3EHcsCaFigfbjkoZQ/Nx7/H+wFbuUAxutyd1k6nvZjfHTIlV/u
-PEsnPRvCokdRXR5NpON3/EgiOckTAa5s5g==
+MHcCAQEEIF85+/l2oyAsAM3cEpffV3FD/ab9lDbIBKzlnUwNVYCioAoGCCqGSM49
+AwEHoUQDQgAEw5ERTn/WJ+PBUiNb8WFerIqHnH6aUbp8nmRZWJG8rImwZkFpSDdr
+tPTwQtP0AZGN/4dgE/mew9HzG/ePzdp3ug==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/test_case_vector.json
index a85f4fc37932c3..e9a09a8272b614 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_11/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example: valid, but less human-readable",
     "is_success_case": "true",
-    "dac_cert": "308201cc30820173a00302010202082803101a8af3916b300a06082a8648ce3d040302302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004edad1acd4084fb2ad1142d03fecf261bc137f94b75cd4f629081aedb08fb78a5bf681190d1462b8aa0065ffb8b162119c2b1e6831ccfb9f14b4ff31941d254eea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604149379a9a1b6300a95c5931b422e3b0cc3253504ee301f0603551d230418301680148439836be2eeaa3739da211d2c931dae3449cdff300a06082a8648ce3d0403020347003044022079541d2a7d012429096201462cadb4a782fc586366375687354ae184f6e3025202205ae6045c636c5f0e03992c7a160b18c45db4e5bff4774676476f73dd9075efac",
-    "pai_cert": "308201be30820163a0030201020208098ad7227af0f6b6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004bc9dc41dcb026858a07db8e4a1943f371eff1fec056ee500c6eb7277593a9ef6637c74c8955fee3c4b273d1bc2a247515d1e4da4e377fc482239c91301ae6ce6a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604148439836be2eeaa3739da211d2c931dae3449cdff301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c81608f425412148807c6afcfbe11a937e9701a384fa571d2ebe5277021bfc01022100cf08a6556bdd73d44bad54d94cd71ca6050718d8ed2352a25d4cf0c3388f5e39",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100fd5791cb0cb78285cb2c02b7dd7a27a1140105b6405097f017d5eee29f81b5bf022100adb2c7dd511b475a5ca2f39ccc4497161d27dee9692f3241425258da64fdf7f3",
-    "dac_private_key": "973cc7f8c0a7986811bb18e7178a09b0213b064f227bfb8f96112a82a35d9ad4",
-    "dac_public_key": "04edad1acd4084fb2ad1142d03fecf261bc137f94b75cd4f629081aedb08fb78a5bf681190d1462b8aa0065ffb8b162119c2b1e6831ccfb9f14b4ff31941d254ee"
+    "dac_cert": "308201cd30820173a00302010202084bdb341f5fc5937a300a06082a8648ce3d040302302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004e8254678b023c1734aea87337d4348a062e5766d98b185a7b411fd99e07058411fc83964936c48023ee62549792980e918da22631a8f4d26c570b417cec5a5eda360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604141443640055a45c380ea0a7588d0c146347e4c0aa301f0603551d23041830168014c50fde1ee7a77909db33145fbf848f088684cb32300a06082a8648ce3d0403020348003045022100c768aa66b6f1f4db7a3a7faa441066c51619ded33bf993bb926d4d1eb73fda78022010b7ada24220522a1a971952ab0c6d338533c84e2a755259ae6b2a23a95b8a3c",
+    "pai_cert": "308201bc30820162a00302010202074750dd89bd3491300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d7069644d7669643a4646463130204d61747465722054657374204d7069643a303042313059301306072a8648ce3d020106082a8648ce3d03010703420004c391114e7fd627e3c152235bf1615eac8a879c7e9a51ba7c9e64595891bcac89b066416948376bb4f4f042d3f401918dff876013f99ec3d1f31bf78fcdda77baa366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414c50fde1ee7a77909db33145fbf848f088684cb32301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100a8a04d5f669aa9b1f328dc875a4991631f425b930fc16728cd63c29f48dc465c02201e41ed42e59bb842749f457e062f73215cd60680fe478add46865bca36ab1dd0",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502200f2df28c96fdf4315f3aedc2047dc27b7e37b586a2748a6c06803be853289643022100d5f943449ab4e9e5424d425e3572569b784039e0f196fb12ebfae1ab7539fecf",
+    "dac_private_key": "a4ee52e6ff9de9492946d77dfc23bcbce869907c42f8f880a334a70c71caae69",
+    "dac_public_key": "04e8254678b023c1734aea87337d4348a062e5766d98b185a7b411fd99e07058411fc83964936c48023ee62549792980e918da22631a8f4d26c570b417cec5a5ed"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/cd.der
index fa03a54d9b1109..0743b96d9c7ff3 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.der
index f49b1a66b7993e..102e12f387fd02 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.pem
index 80bf607ce1dedd..df88a9a26d2d7f 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByDCCAW6gAwIBAgIIH6b/VhJpj7kwCgYIKoZIzj0EAwIwKjEoMCYGA1UEAwwf
-TWF0dGVyIERldmVsIFBBSSBNcGlkOk12aWQ6RmZmMTAgFw0yMjA1MjcwMDAwMDBa
+MIIByDCCAW6gAwIBAgIIItNmSzOKGG0wCgYIKoZIzj0EAwIwKjEoMCYGA1UEAwwf
+TWF0dGVyIERldmVsIFBBSSBNcGlkOk12aWQ6RmZmMTAgFw0yMjA5MjMwMDAwMDBa
 GA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3QgREFDMRQw
 EgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEwWTATBgcq
-hkjOPQIBBggqhkjOPQMBBwNCAATUOpHOly4FCae9exS3U3P3ueGEmXU2CjNwaeUA
-M6htWiUiD0kHKldpqMvLAnBqOFq9jNn2H+NcIMhx6ZiaCH4Eo2AwXjAMBgNVHRMB
-Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUdxhmlWi7OW8Gzaa29LUh
-qT8q3nswHwYDVR0jBBgwFoAUpHaD4doIA7oVUVomzpSgSbr+G6owCgYIKoZIzj0E
-AwIDSAAwRQIhAKcsHetDqnUCPVPZOht+gaWNxtt5celfULK2DWoa4wZAAiBONMyh
-pB59mtu3+3ydUV5GyH+dNcHcGLzlJzgB8VGsAA==
+hkjOPQIBBggqhkjOPQMBBwNCAATjPYm30aQSMim5BA3d0THR8jOsRbK1B3M5S20T
+b7eL5X1uDw2J/zBlFw1uC0FPqPjsF84vVlAaw9vGSb3l7T1oo2AwXjAMBgNVHRMB
+Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUbb/ViKonWzGqrGz3J11D
+YsSCm0UwHwYDVR0jBBgwFoAU49pclNvfrPONE3vo1L96RSrymvcwCgYIKoZIzj0E
+AwIDSAAwRQIgaTLCkJh4trFK0o2ogF7Abp95druRdNxYs3k8mfZAeBYCIQCixvTZ
+C0pw/yBOQOzENA80OPe6oa5an7hU5Gl61NIy8Q==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.der
index 30090c6a08512f..3c96cb9e1e035a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.pem
index 9cfe766c69af87..72726e03880cfc 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOpb7sOQ9geYs8oNyAYXTLB6b8YvwZjaJcDjXnSZDHLroAoGCCqGSM49
-AwEHoUQDQgAE1DqRzpcuBQmnvXsUt1Nz97nhhJl1NgozcGnlADOobVolIg9JBypX
-aajLywJwajhavYzZ9h/jXCDIcemYmgh+BA==
+MHcCAQEEIIA4vm55bjMj7lCYQ30qpz5k5yTCQsqoUJGUFC7i2/juoAoGCCqGSM49
+AwEHoUQDQgAE4z2Jt9GkEjIpuQQN3dEx0fIzrEWytQdzOUttE2+3i+V9bg8Nif8w
+ZRcNbgtBT6j47BfOL1ZQGsPbxkm95e09aA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.der
index fa12675b4e25c5..3c8a397fcb318b 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.pem
index a5aa18a43c62e0..d4fe97cda75e66 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBuDCCAV6gAwIBAgIIGn6kVMLr+UswCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBuDCCAV6gAwIBAgIILbw4ojhimlgwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowKjEoMCYGA1UEAwwfTWF0dGVyIERldmVs
-IFBBSSBNcGlkOk12aWQ6RmZmMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOX/
-qKLBVv+pOMj+sl07tag2jQrdA/SwbG9aGFNvc7U2dXdq2ivrFGQNUq+gH4t9OW2w
-hpUJdXuWV92lyXpipKSjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/
-BAQDAgEGMB0GA1UdDgQWBBSkdoPh2ggDuhVRWibOlKBJuv4bqjAfBgNVHSMEGDAW
-gBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA22qX+MvH
-GC1fZ5JZPHKIYpCEpRMYGzshB5XowRvkcEcCIFs89iX31dv2VC3lgVuvl6SloxOJ
-tJjK51uOPcZdWl76
+IFBBSSBNcGlkOk12aWQ6RmZmMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOfG
+JcTAQfrhlBwFJW77m5hMBzAkTW2PDadR5mGweZJx4NZrle+aFN+CUOJpkpotgTeZ
+bi6V+FKgAWdbm6xDYnajZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/
+BAQDAgEGMB0GA1UdDgQWBBTj2lyU29+s840Te+jUv3pFKvKa9zAfBgNVHSMEGDAW
+gBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiA25GQSE7CX
+nqx/rjWyOYJQc4w1BkiLfiEro506YO3yaAIhAJmQcIqHtCMZwUsL4AAyIe0Edafz
+QCBmdEkGRaRWNP30
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.der
index 2bbf5c52d04c11..10fbb171391cf4 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.pem
index 026ca1a2511282..215e5bd382f70f 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILdX48WX3v1juDxF5Z2RSHBghXd9ky9/QsUGTxbk/bMooAoGCCqGSM49
-AwEHoUQDQgAE5f+oosFW/6k4yP6yXTu1qDaNCt0D9LBsb1oYU29ztTZ1d2raK+sU
-ZA1Sr6Afi305bbCGlQl1e5ZX3aXJemKkpA==
+MHcCAQEEIGT+7Hmf99EQRPMsdfDBXyMqgMrNKGVoAm23DxPvqeHUoAoGCCqGSM49
+AwEHoUQDQgAE58YlxMBB+uGUHAUlbvubmEwHMCRNbY8Np1HmYbB5knHg1muV75oU
+34JQ4mmSmi2BN5luLpX4UqABZ1ubrENidg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/test_case_vector.json
index dd48a966f34745..f6b538b9a7961a 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example: invalid, PID not present and VID not upper case",
     "is_success_case": "false",
-    "dac_cert": "308201c83082016ea00302010202081fa6ff5612698fb9300a06082a8648ce3d040302302a3128302606035504030c1f4d617474657220446576656c20504149204d7069643a4d7669643a466666313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004d43a91ce972e0509a7bd7b14b75373f7b9e1849975360a337069e50033a86d5a25220f49072a5769a8cbcb02706a385abd8cd9f61fe35c20c871e9989a087e04a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604147718669568bb396f06cda6b6f4b521a93f2ade7b301f0603551d23041830168014a47683e1da0803ba15515a26ce94a049bafe1baa300a06082a8648ce3d0403020348003045022100a72c1deb43aa75023d53d93a1b7e81a58dc6db7971e95f50b2b60d6a1ae3064002204e34cca1a41e7d9adbb7fb7c9d515e46c87f9d35c1dc18bce5273801f151ac00",
-    "pai_cert": "308201b83082015ea00302010202081a7ea454c2ebf94b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a302a3128302606035504030c1f4d617474657220446576656c20504149204d7069643a4d7669643a466666313059301306072a8648ce3d020106082a8648ce3d03010703420004e5ffa8a2c156ffa938c8feb25d3bb5a8368d0add03f4b06c6f5a18536f73b53675776ada2beb14640d52afa01f8b7d396db0869509757b9657dda5c97a62a4a4a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a47683e1da0803ba15515a26ce94a049bafe1baa301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100db6a97f8cbc7182d5f6792593c7288629084a513181b3b210795e8c11be4704702205b3cf625f7d5dbf6542de5815baf97a4a5a31389b498cae75b8e3dc65d5a5efa",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022029432f34e1c2fb1ad66b0b8d4e51a8cc2476d4e0888d8db0ceb9423cdcf128760221008448d5cf1ac4229d4198679ae531a4c4ac360ddc7582e7ac775fdc0eccfb2a92",
-    "dac_private_key": "ea5beec390f60798b3ca0dc806174cb07a6fc62fc198da25c0e35e74990c72eb",
-    "dac_public_key": "04d43a91ce972e0509a7bd7b14b75373f7b9e1849975360a337069e50033a86d5a25220f49072a5769a8cbcb02706a385abd8cd9f61fe35c20c871e9989a087e04"
+    "dac_cert": "308201c83082016ea003020102020822d3664b338a186d300a06082a8648ce3d040302302a3128302606035504030c1f4d617474657220446576656c20504149204d7069643a4d7669643a466666313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004e33d89b7d1a4123229b9040dddd131d1f233ac45b2b50773394b6d136fb78be57d6e0f0d89ff3065170d6e0b414fa8f8ec17ce2f56501ac3dbc649bde5ed3d68a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146dbfd588aa275b31aaac6cf7275d4362c4829b45301f0603551d23041830168014e3da5c94dbdfacf38d137be8d4bf7a452af29af7300a06082a8648ce3d040302034800304502206932c2909878b6b14ad28da8805ec06e9f7976bb9174dc58b3793c99f6407816022100a2c6f4d90b4a70ff204e40ecc4340f3438f7baa1ae5a9fb854e4697ad4d232f1",
+    "pai_cert": "308201b83082015ea00302010202082dbc38a238629a58300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a302a3128302606035504030c1f4d617474657220446576656c20504149204d7069643a4d7669643a466666313059301306072a8648ce3d020106082a8648ce3d03010703420004e7c625c4c041fae1941c05256efb9b984c0730244d6d8f0da751e661b0799271e0d66b95ef9a14df8250e269929a2d8137996e2e95f852a001675b9bac436276a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414e3da5c94dbdfacf38d137be8d4bf7a452af29af7301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022036e4641213b0979eac7fae35b2398250738c3506488b7e212ba39d3a60edf2680221009990708a87b42319c14b0be0003221ed0475a7f340206674490645a45634fdf4",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100b4d83918fdaf27d2be610752b8eec9e6d171bdb9bf9adbc3bef6454ff9e70f80022100d92c92837d48c482883ee4b5dbfda63803f99eddc48b771c50b6594a857b55c0",
+    "dac_private_key": "8038be6e796e3323ee5098437d2aa73e64e724c242caa8509194142ee2dbf8ee",
+    "dac_public_key": "04e33d89b7d1a4123229b9040dddd131d1f233ac45b2b50773394b6d136fb78be57d6e0f0d89ff3065170d6e0b414fa8f8ec17ce2f56501ac3dbc649bde5ed3d68"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/cd.der
index e51951dbf01463..bc68d1f6cf97fe 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.der
index 9ed6754e6f4a4f..2b6facaad46f05 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.pem
index 09b739d572deae..f4a49fa26b82c5 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXOgAwIBAgIIe+L+O0PdcgswCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
-TWF0dGVyIERldmVsIFBBSSBNcGlkOjAwQjEgTVZJRDpGRkYxMCAXDTIyMDUyNzAw
+MIIBzjCCAXOgAwIBAgIIV0pJu26AFQgwCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
+TWF0dGVyIERldmVsIFBBSSBNcGlkOjAwQjEgTVZJRDpGRkYxMCAXDTIyMDkyMzAw
 MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBE
 QUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABEsTDUHT3j5Mzi4pwuda4UdU2bMPhmtL
-KZCckFxnAupLHUOAN+tczfWV8Yw1ZVZEiyB1XyquasQeWxHcC0NElZ6jYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBRhUu49MvpIN76x
-w6QWXEASsRdBlDAfBgNVHSMEGDAWgBQitr32lazIUKxpEOyF+FNhBFJsEDAKBggq
-hkjOPQQDAgNIADBFAiEAuKGJA1OBTdiONW0Tjg+Idw2gPebJJvl6roMXa1j4neQC
-IGQMzuwwDVuqKc/HwyRHkBwTIsLxTngYIcgIQJjyKuAj
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABCAb7F85fyyBzefomC9Pj65prirOi90L
+r84E1NxW/6Gy+l7r3LQa+5PIypP8QUNp5/z0ZFobvLmorEr7MrRhCuujYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTN6mvAKAPjDVbp
+W/tVUHQhI4ad8DAfBgNVHSMEGDAWgBS4rt9TGtQmCNGNzQ5de9Gijol/fDAKBggq
+hkjOPQQDAgNJADBGAiEA0+YPWKxlqSwG7mzRuf4F76pAeFiz/q2X5dk6ae17bFYC
+IQCJG8TsViL5B5BI1qDeE5VJbvAn3YJLI35rxAV4vQGIuw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.der
index a0d99e1887230f..9796843c4d75fb 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.pem
index eceab67eb78067..ea2d78e9584902 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBjZAPNHfSlg4UGEXogj5QGFaWR7sqOoIcD/LzmNBIjioAoGCCqGSM49
-AwEHoUQDQgAESxMNQdPePkzOLinC51rhR1TZsw+Ga0spkJyQXGcC6ksdQ4A361zN
-9ZXxjDVlVkSLIHVfKq5qxB5bEdwLQ0SVng==
+MHcCAQEEINyPM69FRShZoePqAem4Gf0KQACtrUhC3vw/zKLhawDUoAoGCCqGSM49
+AwEHoUQDQgAEIBvsXzl/LIHN5+iYL0+PrmmuKs6L3QuvzgTU3Fb/obL6XuvctBr7
+k8jKk/xBQ2nn/PRkWhu8uaisSvsytGEK6w==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.der
index aafdf75228a5a6..79ad2693b36a46 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.pem
index 91ec3c4007bce0..798de2ac20aebe 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvTCCAWOgAwIBAgIIfNRf4aNqu4IwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvjCCAWOgAwIBAgIIacHXeyA6Ci4wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowLzEtMCsGA1UEAwwkTWF0dGVyIERldmVs
 IFBBSSBNcGlkOjAwQjEgTVZJRDpGRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAELKSd+HKczfr499tVROtorl6uvBsIGp+pMK+79qmOMu0gR+rUbWKWdJf7yw81
-1pcccGbiyhqvhrl1Spx0E6kb6aNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFCK2vfaVrMhQrGkQ7IX4U2EEUmwQMB8GA1Ud
-IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0gAMEUCIFop
-jsvlLLk9W18oOeibaXqAQf8impjurEAAIvnpTH4EAiEAw5TPEzkv1KTxR80sek0Z
-13oOf/OCAgYM1qLetlVZjkc=
+QgAEEcGAHTvfS1AvZycRdHCRYhRBxCXz8zFxuGhQpmxBQGhf95hDMbTuNqobqBQx
+OYH+sKrYLsqpEtTA/AWaIYo9JqNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFLiu31Ma1CYI0Y3NDl170aKOiX98MB8GA1Ud
+IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0kAMEYCIQDi
+NWuFA2JybT35jyb3SI8Pxz6VdmnuXBJdwKfOZZgZ9AIhAIS1xmnY+k/NT6MU9ghL
+8FHo8xWdugC/t1vFly4IxtJr
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.der
index adaee899c4517e..7c5e474d9326dd 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.pem
index 833303a2626440..c2ade164f9fe76 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDbjTyzKeuFSj/Ofy7Mw0B9mZNBrLaZenwMco/KuEcbuoAoGCCqGSM49
-AwEHoUQDQgAELKSd+HKczfr499tVROtorl6uvBsIGp+pMK+79qmOMu0gR+rUbWKW
-dJf7yw811pcccGbiyhqvhrl1Spx0E6kb6Q==
+MHcCAQEEIPvp3w39FNPlsxQeG1YJkH9eSkEdj9hOhps55uyGPDUfoAoGCCqGSM49
+AwEHoUQDQgAEEcGAHTvfS1AvZycRdHCRYhRBxCXz8zFxuGhQpmxBQGhf95hDMbTu
+NqobqBQxOYH+sKrYLsqpEtTA/AWaIYo9Jg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/test_case_vector.json
index 5d7576fcea967f..9aafc1fe40ce3b 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example: invalid VID prefix",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820173a00302010202087be2fe3b43dd720b300a06082a8648ce3d040302302f312d302b06035504030c244d617474657220446576656c20504149204d7069643a30304231204d5649443a464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200044b130d41d3de3e4cce2e29c2e75ae14754d9b30f866b4b29909c905c6702ea4b1d438037eb5ccdf595f18c356556448b20755f2aae6ac41e5b11dc0b4344959ea360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604146152ee3d32fa4837beb1c3a4165c4012b1174194301f0603551d2304183016801422b6bdf695acc850ac6910ec85f8536104526c10300a06082a8648ce3d0403020348003045022100b8a1890353814dd88e356d138e0f88770da03de6c926f97aae83176b58f89de40220640cceec300d5baa29cfc7c32447901c1322c2f14e781821c8084098f22ae023",
-    "pai_cert": "308201bd30820163a00302010202087cd45fe1a36abb82300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20504149204d7069643a30304231204d5649443a464646313059301306072a8648ce3d020106082a8648ce3d030107034200042ca49df8729ccdfaf8f7db5544eb68ae5eaebc1b081a9fa930afbbf6a98e32ed2047ead46d62967497fbcb0f35d6971c7066e2ca1aaf86b9754a9c7413a91be9a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041422b6bdf695acc850ac6910ec85f8536104526c10301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502205a298ecbe52cb93d5b5f2839e89b697a8041ff229a98eeac400022f9e94c7e04022100c394cf13392fd4a4f147cd2c7a4d19d77a0e7ff38202060cd6a2deb655598e47",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020446304402201cedfcfa80ad8b0750c43c58d0a63457011ed9000522b96b41e962f8a95a9cf802200eb04c59657acf103ea2f34a394aa138fff7bab104e274733b93ff28b9f688b4",
-    "dac_private_key": "18d900f3477d2960e141845e8823e5018569647bb2a3a821c0ff2f398d0488e2",
-    "dac_public_key": "044b130d41d3de3e4cce2e29c2e75ae14754d9b30f866b4b29909c905c6702ea4b1d438037eb5ccdf595f18c356556448b20755f2aae6ac41e5b11dc0b4344959e"
+    "dac_cert": "308201ce30820173a0030201020208574a49bb6e801508300a06082a8648ce3d040302302f312d302b06035504030c244d617474657220446576656c20504149204d7069643a30304231204d5649443a464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004201bec5f397f2c81cde7e8982f4f8fae69ae2ace8bdd0bafce04d4dc56ffa1b2fa5eebdcb41afb93c8ca93fc414369e7fcf4645a1bbcb9a8ac4afb32b4610aeba360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414cdea6bc02803e30d56e95bfb5550742123869df0301f0603551d23041830168014b8aedf531ad42608d18dcd0e5d7bd1a28e897f7c300a06082a8648ce3d0403020349003046022100d3e60f58ac65a92c06ee6cd1b9fe05efaa407858b3fead97e5d93a69ed7b6c56022100891bc4ec5622f9079048d6a0de1395496ef027dd824b237e6bc40578bd0188bb",
+    "pai_cert": "308201be30820163a003020102020869c1d77b203a0a2e300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20504149204d7069643a30304231204d5649443a464646313059301306072a8648ce3d020106082a8648ce3d0301070342000411c1801d3bdf4b502f672711747091621441c425f3f33171b86850a66c4140685ff7984331b4ee36aa1ba814313981feb0aad82ecaa912d4c0fc059a218a3d26a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b8aedf531ad42608d18dcd0e5d7bd1a28e897f7c301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100e2356b850362726d3df98f26f7488f0fc73e957669ee5c125dc0a7ce659819f402210084b5c669d8fa4fcd4fa314f6084bf051e8f3159dba00bfb75bc5972e08c6d26b",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100e436f76060ebcc3f73aa2ec87de249727b57125160fb154d8b8ed9b4ce9092d202206eed7e11edac26e3c348a41a298507501afba8ad6842d82cbb1fa38a15022daa",
+    "dac_private_key": "dc8f33af45452859a1e3ea01e9b819fd0a4000adad4842defc3fcca2e16b00d4",
+    "dac_public_key": "04201bec5f397f2c81cde7e8982f4f8fae69ae2ace8bdd0bafce04d4dc56ffa1b2fa5eebdcb41afb93c8ca93fc414369e7fcf4645a1bbcb9a8ac4afb32b4610aeb"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/cd.der
index 94a9ecfc9952d0..1db22d4c9d301f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.der
index 0174d8ad9acf73..8ea1be2ec81d8e 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.pem
index f7a0599f34e661..6e29f3c9b8a8be 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBzTCCAXOgAwIBAgIIW2m2ChzvYfQwCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
-TWF0dGVyIERldmVsIFBBSSBNcGlkXzAwQjEgTXZpZF9GRkYxMCAXDTIyMDUyNzAw
+MIIBzjCCAXOgAwIBAgIIbJ/djak1G40wCgYIKoZIzj0EAwIwLzEtMCsGA1UEAwwk
+TWF0dGVyIERldmVsIFBBSSBNcGlkXzAwQjEgTXZpZF9GRkYxMCAXDTIyMDkyMzAw
 MDAwMFoYDzk5OTkxMjMxMjM1OTU5WjBGMRgwFgYDVQQDDA9NYXR0ZXIgVGVzdCBE
 QUMxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABI9AAvyGDYgTkGitbpJkAtb58bmCXWG6
-h3Jm/zI5JMrzIKIM204UtkQp6lOYeamOO2dVb57zS8NyfLHJxrxO8IajYDBeMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTF9uELvG0u4sCT
-P76CaAOywdkPaTAfBgNVHSMEGDAWgBRX7YEr/a00TchHPKNUlO302mrtMjAKBggq
-hkjOPQQDAgNIADBFAiEAgQWtuKPCZGFEWNqQkKIgHEKMdCcqBGbbKbTye8l6oX4C
-IDr77eAhqkTx2NVFbZtTC06d7bFIOhdRuGTyjK+wHwjZ
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABAvWm+5i1Ae6qS17TGjcQD/Isv712dGA
+6RGN68yoTqZv/4paNtveafjT2X8c3fUMeWM7pCksxvW83UEhl/z7HsyjYDBeMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBRO5h57E8RQpi1j
+BDOgG7QOxD37gTAfBgNVHSMEGDAWgBSQdD4jwB032TXWpSbZTbxBUXitajAKBggq
+hkjOPQQDAgNJADBGAiEA9iBfiNzCPqKsqZUr1xTv8vcdzfs/NKIMtxyDP41nQ+YC
+IQC5nf2wqzuv/QMpji9eWE2SyrTae81hW7wR1DDA7fHNow==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.der
index 7f1d3663c561a4..213a662bb0384a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.pem
index 899ca84135333a..3736943772239d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILtZJs4hDUZDroHF5YI0+MtpieC5FgJzAT29HYj5A+wkoAoGCCqGSM49
-AwEHoUQDQgAEj0AC/IYNiBOQaK1ukmQC1vnxuYJdYbqHcmb/MjkkyvMgogzbThS2
-RCnqU5h5qY47Z1VvnvNLw3J8scnGvE7whg==
+MHcCAQEEIIN4wESuXjtIfev/Is9RWs1X7dSbJbgwZyUedra7UzQ1oAoGCCqGSM49
+AwEHoUQDQgAEC9ab7mLUB7qpLXtMaNxAP8iy/vXZ0YDpEY3rzKhOpm//ilo2295p
++NPZfxzd9Qx5YzukKSzG9bzdQSGX/PsezA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.der
index 3dc89017a35aa6..c621f8a2a5b1b5 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.pem
index d7b4fe80b62a4b..55b1fb90e48b4d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvDCCAWOgAwIBAgIIWiPK0Mr6ol0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBvTCCAWOgAwIBAgIIHXD/ruwxlJUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowLzEtMCsGA1UEAwwkTWF0dGVyIERldmVs
 IFBBSSBNcGlkXzAwQjEgTXZpZF9GRkYxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEkvnZ+9YUNhaUDWRxWWc6IqZwwEB4k3/LTYm3UQQsA6BD0/5wL51TmzWZ70y1
-rZJs0i2t6dVhJcg4+FMTYCxAbaNmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFFftgSv9rTRNyEc8o1SU7fTaau0yMB8GA1Ud
-IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0cAMEQCIArN
-AXhL7kEy98hLicvqjdFnPsjv9cWgIQDTY/CV2kzVAiAtUjLsi1YJLyiPTtZ/jOf3
-jKxromzfMMa4zJ0Vy1lFFw==
+QgAEbzTSUDS3Fuf5UTn2l1Modjy59YvWzbzSgx8NPKpmSz6vu6hqucyN+q5xniee
+Y7IJ1K8j4CXwujCFNJGUDbrtt6NmMGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJB0PiPAHTfZNdalJtlNvEFReK1qMB8GA1Ud
+IwQYMBaAFGr9IncfUR/svxZBl2cQ3NwxoXF+MAoGCCqGSM49BAMCA0gAMEUCIQD7
+T4Xe00393t9hmgMtH0VbBlYfzE5kIleL03IigzYCsQIgCMLPIZnmQGq83m5Tx2/p
+8iG9LPvYnGE/d9O5A/D63+c=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.der
index 6e4264b6b87f5e..1da22afeb38634 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.pem
index 26aca7a05d65e2..1f55de4d94d6ab 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDxBtLCnx0PhwtqGB38h75RuzohOiGodPk6xOYO1TZ9uoAoGCCqGSM49
-AwEHoUQDQgAEkvnZ+9YUNhaUDWRxWWc6IqZwwEB4k3/LTYm3UQQsA6BD0/5wL51T
-mzWZ70y1rZJs0i2t6dVhJcg4+FMTYCxAbQ==
+MHcCAQEEICugte43oyIPmjYw5JMSyeVBj+fHGonb1/TBJ8vd83iUoAoGCCqGSM49
+AwEHoUQDQgAEbzTSUDS3Fuf5UTn2l1Modjy59YvWzbzSgx8NPKpmSz6vu6hqucyN
++q5xnieeY7IJ1K8j4CXwujCFNJGUDbrttw==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/test_case_vector.json
index 353b5c41f91f37..bb4ec7ed45158c 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Fallback VID and PID encoding example: invalid PID and VID prefixes",
     "is_success_case": "false",
-    "dac_cert": "308201cd30820173a00302010202085b69b60a1cef61f4300a06082a8648ce3d040302302f312d302b06035504030c244d617474657220446576656c20504149204d7069645f30304231204d7669645f464646313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200048f4002fc860d88139068ad6e926402d6f9f1b9825d61ba877266ff323924caf320a20cdb4e14b64429ea539879a98e3b67556f9ef34bc3727cb1c9c6bc4ef086a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414c5f6e10bbc6d2ee2c0933fbe826803b2c1d90f69301f0603551d2304183016801457ed812bfdad344dc8473ca35494edf4da6aed32300a06082a8648ce3d04030203480030450221008105adb8a3c264614458da9090a2201c428c74272a0466db29b4f27bc97aa17e02203afbede021aa44f1d8d5456d9b530b4e9dedb1483a1751b864f28cafb01f08d9",
-    "pai_cert": "308201bc30820163a00302010202085a23cad0cafaa25d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20504149204d7069645f30304231204d7669645f464646313059301306072a8648ce3d020106082a8648ce3d0301070342000492f9d9fbd6143616940d647159673a22a670c04078937fcb4d89b751042c03a043d3fe702f9d539b3599ef4cb5ad926cd22dade9d56125c838f85313602c406da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041457ed812bfdad344dc8473ca35494edf4da6aed32301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402200acd01784bee4132f7c84b89cbea8dd1673ec8eff5c5a02100d363f095da4cd502202d5232ec8b56092f288f4ed67f8ce7f78cac6ba26cdf30c6b8cc9d15cb594517",
-    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100e6bc44890d97d68833fec44ab5c713f160ab19618c605b5d74934ab659c25cb3022100c1aed58eebc4b02b0aa27df267815817e08a41a0724e790f90ca2690db854b8c",
-    "dac_private_key": "bb5926ce210d4643ae81c5e58234f8cb6989e0b9160273013dbd1d88f903ec24",
-    "dac_public_key": "048f4002fc860d88139068ad6e926402d6f9f1b9825d61ba877266ff323924caf320a20cdb4e14b64429ea539879a98e3b67556f9ef34bc3727cb1c9c6bc4ef086"
+    "dac_cert": "308201ce30820173a00302010202086c9fdd8da9351b8d300a06082a8648ce3d040302302f312d302b06035504030c244d617474657220446576656c20504149204d7069645f30304231204d7669645f464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200040bd69bee62d407baa92d7b4c68dc403fc8b2fef5d9d180e9118debcca84ea66fff8a5a36dbde69f8d3d97f1cddf50c79633ba4292cc6f5bcdd412197fcfb1ecca360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144ee61e7b13c450a62d630433a01bb40ec43dfb81301f0603551d2304183016801490743e23c01d37d935d6a526d94dbc415178ad6a300a06082a8648ce3d0403020349003046022100f6205f88dcc23ea2aca9952bd714eff2f71dcdfb3f34a20cb71c833f8d6743e6022100b99dfdb0ab3baffd03298e2f5e584d92cab4da7bcd615bbc11d430c0edf1cda3",
+    "pai_cert": "308201bd30820163a00302010202081d70ffaeec319495300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a302f312d302b06035504030c244d617474657220446576656c20504149204d7069645f30304231204d7669645f464646313059301306072a8648ce3d020106082a8648ce3d030107034200046f34d25034b716e7f95139f6975328763cb9f58bd6cdbcd2831f0d3caa664b3eafbba86ab9cc8dfaae719e279e63b209d4af23e025f0ba30853491940dbaedb7a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041490743e23c01d37d935d6a526d94dbc415178ad6a301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100fb4f85ded34dfddedf619a032d1f455b06561fcc4e6422578bd37222833602b1022008c2cf2199e6406abcde6e53c76fe9f221bd2cfbd89c613f77d3b903f0fadfe7",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022040f04031f06158305cb23570f815684eda648cd9c631adf3533e72315d11892f022100e64ab06c1da4d959126bf1c7b816dfa495dc57451df41597699419b114ee45e5",
+    "dac_private_key": "8378c044ae5e3b487debff22cf515acd57edd49b25b83067251e76b6bb533435",
+    "dac_public_key": "040bd69bee62d407baa92d7b4c68dc403fc8b2fef5d9d180e9118debcca84ea66fff8a5a36dbde69f8d3d97f1cddf50c79633ba4292cc6f5bcdd412197fcfb1ecc"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/cd.der
index 068f1d681df562..ff10a0c2dbc035 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.der
index 7c2b9095b89b10..975547e7238448 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.pem
index 54c1e939117c4c..657d11c52740c2 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICBzCCAa2gAwIBAgIIa0U5jnEM1mUwCgYIKoZIzj0EAwIwaTE7MDkGA1UEAwwy
+MIICBzCCAa2gAwIBAgIIKVM7FbQ16HcwCgYIKoZIzj0EAwIwaTE7MDkGA1UEAwwy
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMiBNcGlkOjAw
 QjIxFDASBgorBgEEAYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTAg
-Fw0yMjA1MjcwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
+Fw0yMjA5MjMwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
 dGVyIFRlc3QgREFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8
-AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR52a7SEW1qE34IxG09
-u/lSMPTh5IUlM0nwb3kpxZeiWYz/gnjWn2+6ZOJY6UhlCQ/D/SsqHb8TxgDhZJH5
-LJM9o2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-qbQ15k+ogiolsNcmnr/qmnnjV9MwHwYDVR0jBBgwFoAUL6ojeUeqBISQmvEIjcKs
-oOoD/gAwCgYIKoZIzj0EAwIDSAAwRQIgV2c79GRiwDuun2qiWJCqnhhU8wit8URe
-4snaj364e4sCIQDPHAMfExb1zLrBtDUZjntu7oD0i8ViO6ed9r31DqSbRA==
+AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASK+j7eURLeyfZ5gZnI
+/6DR8DoPLj+0ZTa02sfUmSk42j19k5qGpZCUKyD5LZFkBvMTWdGnJm9RBgPl4yW7
+z66Yo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+iAZNEP0JH9B6InM1qiWZKoViY/kwHwYDVR0jBBgwFoAUtcE5j6XVTXGGhYLZSvzC
+1OGqHOwwCgYIKoZIzj0EAwIDSAAwRQIhAMq+WYI53r/Ho0zCeFxcQsSo6psCGffP
+ebGa0D5UOHMUAiBS3cdwPTtiKqsE9c97JXbM7cQddqMmERp4xI1XMps1Cw==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.der
index 857f559270a5c8..71d9c5067f3b75 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.pem
index dfcfb27e4be19d..8212887debff11 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBcI/GzcHFSX9DKOEyIUPfSYa7FA5E2W4T3VsNCxCR8toAoGCCqGSM49
-AwEHoUQDQgAEedmu0hFtahN+CMRtPbv5UjD04eSFJTNJ8G95KcWXolmM/4J41p9v
-umTiWOlIZQkPw/0rKh2/E8YA4WSR+SyTPQ==
+MHcCAQEEILCeeSoLKlvC/itp54X8dJSOoSPYIkQLENzPmp13zITFoAoGCCqGSM49
+AwEHoUQDQgAEivo+3lES3sn2eYGZyP+g0fA6Dy4/tGU2tNrH1JkpONo9fZOahqWQ
+lCsg+S2RZAbzE1nRpyZvUQYD5eMlu8+umA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.der
index 2ef2be7bcf2426..5c460c73b1346f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.pem
index 0171244582b333..34bda60d143203 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB9jCCAZ2gAwIBAgIIOZoWnKwI7IcwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB+DCCAZ2gAwIBAgIIHE3xMoh6gA0wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowaTE7MDkGA1UEAwwyQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMiBNcGlkOjAwQjIxFDASBgorBgEE
 AYKifAIBDARGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTBZMBMGByqGSM49AgEG
-CCqGSM49AwEHA0IABFKrrQwQAaVbYGjfvUd5IhKzfqSMhiDIznV5BvrNpKrrmQGD
-wE6GzaNQGL90WHP+1IUd3CSmjd9ubKcnI7YCf6OjZjBkMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQvqiN5R6oEhJCa8QiNwqyg
-6gP+ADAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
-AgNHADBEAiARPq7CgerZjgYNersLqt2xq2qu+UgL4n8D0mSoolfY/AIgc3wrEsQS
-jirJNQ9XonuXphxrCy9S5E6FUFHdIpT5UDg=
+CCqGSM49AwEHA0IABGZBXH7QyNLCgRkgg7hKME0bzlZf2bfvnvN+BfdH2aBkVVy2
+oa0i/tGdJ5z+7bRckE4uDSyqvUEuzthep4SCTNijZjBkMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1wTmPpdVNcYaFgtlK/MLU
+4aoc7DAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
+AgNJADBGAiEAwyu2WVlEVJpeTrCLROrVa1rM0dJt/A7XV86uRPGaq2gCIQCAzrrx
+aehVximbbyuzgE8FzPfYE1sGv2xkVFbHMGznPg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.der
index 5157f2539be235..da47ae8016f861 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.pem
index d761678b0fb2a6..078f07fe913b6b 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIC3N3xFMOWyuPFkC9mF0E1ecIUKfTFa4hxbOYNZIm/ocoAoGCCqGSM49
-AwEHoUQDQgAEUqutDBABpVtgaN+9R3kiErN+pIyGIMjOdXkG+s2kquuZAYPATobN
-o1AYv3RYc/7UhR3cJKaN325spycjtgJ/ow==
+MHcCAQEEIMHTdWMHuo5H4+ywOleazPPLe1Cdu7oMewYGvbHgqTGRoAoGCCqGSM49
+AwEHoUQDQgAEZkFcftDI0sKBGSCDuEowTRvOVl/Zt++e834F90fZoGRVXLahrSL+
+0Z0nnP7ttFyQTi4NLKq9QS7O2F6nhIJM2A==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/test_case_vector.json
index 19b2f292fa44bf..ea6f3cf8d2ada6 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_15/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: valid, Matter OIDs are used and wrong values in the common-name are ignored",
     "is_success_case": "true",
-    "dac_cert": "30820207308201ada00302010202086b45398e710cd665300a06082a8648ce3d0403023069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000479d9aed2116d6a137e08c46d3dbbf95230f4e1e485253349f06f7929c597a2598cff8278d69f6fba64e258e94865090fc3fd2b2a1dbf13c600e16491f92c933da360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414a9b435e64fa8822a25b0d7269ebfea9a79e357d3301f0603551d230418301680142faa237947aa0484909af1088dc2aca0ea03fe00300a06082a8648ce3d0403020348003045022057673bf46462c03bae9f6aa25890aa9e1854f308adf1445ee2c9da8f7eb87b8b022100cf1c031f1316f5ccbac1b435198e7b6eee80f48bc5623ba79df6bdf50ea49b44",
-    "pai_cert": "308201f63082019da0030201020208399a169cac08ec87300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000452abad0c1001a55b6068dfbd47792212b37ea48c8620c8ce757906facda4aaeb990183c04e86cda35018bf745873fed4851ddc24a68ddf6e6ca72723b6027fa3a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604142faa237947aa0484909af1088dc2aca0ea03fe00301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220113eaec281ead98e060d7abb0baaddb1ab6aaef9480be27f03d264a8a257d8fc0220737c2b12c4128e2ac9350f57a27b97a61c6b0b2f52e44e855051dd2294f95038",
-    "certification_declaration": "3081e706092a864886f70d010702a081d93081d6020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022002efd031c9693288dd9c29d278f663b977c11c1f51cacfbb4165b1baeb092af10220779a8fdc147f2f706eda7e251d89e9e2324f7b00014d79d590df69205982d70c",
-    "dac_private_key": "1708fc6cdc1c5497f4328e1322143df4986bb140e44d96e13dd5b0d0b1091f2d",
-    "dac_public_key": "0479d9aed2116d6a137e08c46d3dbbf95230f4e1e485253349f06f7929c597a2598cff8278d69f6fba64e258e94865090fc3fd2b2a1dbf13c600e16491f92c933d"
+    "dac_cert": "30820207308201ada003020102020829533b15b435e877300a06082a8648ce3d0403023069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200048afa3ede5112dec9f6798199c8ffa0d1f03a0f2e3fb46536b4dac7d4992938da3d7d939a86a590942b20f92d916406f31359d1a7266f510603e5e325bbcfae98a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041488064d10fd091fd07a227335aa25992a856263f9301f0603551d23041830168014b5c1398fa5d54d71868582d94afcc2d4e1aa1cec300a06082a8648ce3d0403020348003045022100cabe598239debfc7a34cc2785c5c42c4a8ea9b0219f7cf79b19ad03e54387314022052ddc7703d3b622aab04f5cf7b2576ccedc41d76a326111a78c48d57329b350b",
+    "pai_cert": "308201f83082019da00302010202081c4df132887a800d300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464632204d7069643a3030423231143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d0301070342000466415c7ed0c8d2c281192083b84a304d1bce565fd9b7ef9ef37e05f747d9a064555cb6a1ad22fed19d279cfeedb45c904e2e0d2caabd412eced85ea784824cd8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414b5c1398fa5d54d71868582d94afcc2d4e1aa1cec301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c32bb6595944549a5e4eb08b44ead56b5accd1d26dfc0ed757ceae44f19aab6802210080cebaf169e855c6299b6f2bb3804f05ccf7d8135b06bf6c645456c7306ce73e",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100cefdbc32a0201dc87435343bb0e7da622955af7b2379f8222210dcf30a70d720022100968c705242ce3b863d173977abaebc43e9d1df8b5e7f7293cf9e389dd142bb38",
+    "dac_private_key": "b09e792a0b2a5bc2fe2b69e785fc74948ea123d822440b10dccf9a9d77cc84c5",
+    "dac_public_key": "048afa3ede5112dec9f6798199c8ffa0d1f03a0f2e3fb46536b4dac7d4992938da3d7d939a86a590942b20f92d916406f31359d1a7266f510603e5e325bbcfae98"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/cd.der
index 9e82f935cedf95..3d5e177dbd6050 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.der
index 676993d0ee4c4f..f2958a5abadb8c 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.pem
index ad74c4985ae28e..917ba1b84eb857 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICBjCCAa2gAwIBAgIIPxC8j5vOi0YwCgYIKoZIzj0EAwIwaTE7MDkGA1UEAwwy
+MIICBzCCAa2gAwIBAgIIdTFegJ+2BPQwCgYIKoZIzj0EAwIwaTE7MDkGA1UEAwwy
 QUNNRSBNYXR0ZXIgRGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOjAw
 QjExFDASBgorBgEEAYKifAIBDARGRkYyMRQwEgYKKwYBBAGConwCAgwEMDBCMjAg
-Fw0yMjA1MjcwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
+Fw0yMjA5MjMwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0
 dGVyIFRlc3QgREFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8
-AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATFOQi1X2UAz5KAiZNr
-iyRjNlm5Yz9J3NdMarcToKj169Xpu3fx3AphP2109x1wuGanoqsL9uUuJb4Mn4nc
-xmQAo2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
-EK8tjzDPzrF0dHazFIjGzBWYwdYwHwYDVR0jBBgwFoAUKUoWwtP/Kuuav6jyLUig
-FTgFuAQwCgYIKoZIzj0EAwIDRwAwRAIgXFWgmKWD/AmvHrpl6xAa+9++YLE+V85q
-hjpHpiX/MzACIE5xudZ934ph98c8cd456nmsC7mmqWokctwkSeB5tTFO
+AgIMBDAwQjEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS6LTRN72aRo/OM6XFD
+fChBho0HjX0WNim63e9NNgHq6SKf43UqjQpmQnGz5JNAxV28ILNbnbeAkQ2RFwo1
+UdVho2AwXjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+5orDcj79QBSUzksw0obUVHliBRYwHwYDVR0jBBgwFoAUVtbic+ok5d/rVwsf+fRP
+VJttNkswCgYIKoZIzj0EAwIDSAAwRQIgaiVbskmk3+79QuxuBK3/WTOO+0ApnjI7
+ciN68w23r7MCIQDWDoKIiD7J6XEW/7Vx8ilbzq+vl8zYMYVXtl6xXIsKxg==
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.der
index 15cb9312da2586..c0ad8d948b31fe 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.pem
index fa5e4599b0a762..c58275cc7bd56d 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEiiDKOv4TTbeTjPMdF0cHesg7vBLNlGSy0huJUnkAOroAoGCCqGSM49
-AwEHoUQDQgAExTkItV9lAM+SgImTa4skYzZZuWM/SdzXTGq3E6Co9evV6bt38dwK
-YT9tdPcdcLhmp6KrC/blLiW+DJ+J3MZkAA==
+MHcCAQEEIHjO4hWOvdKrKj+xM+KYqFbYHCwtKo6mbRdNzeQW1CF/oAoGCCqGSM49
+AwEHoUQDQgAEui00Te9mkaPzjOlxQ3woQYaNB419FjYput3vTTYB6ukin+N1Ko0K
+ZkJxs+STQMVdvCCzW523gJENkRcKNVHVYQ==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.der
index f9c9afbf4ecbb9..f39345505814a7 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.pem
index 97ec1f65d3091d..9cb74e01ecc7e9 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Cert.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB9jCCAZ2gAwIBAgIIQSEubpdenBYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIB9zCCAZ2gAwIBAgIIE5YJYTeVpe8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowaTE7MDkGA1UEAwwyQUNNRSBNYXR0ZXIg
 RGV2ZWwgUEFJIDVDREE5ODk5IE12aWQ6RkZGMSBNcGlkOjAwQjExFDASBgorBgEE
 AYKifAIBDARGRkYyMRQwEgYKKwYBBAGConwCAgwEMDBCMjBZMBMGByqGSM49AgEG
-CCqGSM49AwEHA0IABCjFIo2u9LOZF6o/oWpIzWGoAVJON4SEYm4epTA2hy8rcV/0
-xGzPpVv1enzzgOi+7KlGX6YJDoaXWUSBkJr3+XGjZjBkMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQpShbC0/8q65q/qPItSKAV
-OAW4BDAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
-AgNHADBEAiAZYHFaet973iZLkHafZSaka0K2qALVzXYmN15yN7Xx6gIgGY4qyGhD
-EMoK69UiPPu3S8yQwj0IbDv1soUJMS0k8yI=
+CCqGSM49AwEHA0IABBx75poUMqrEJ3AHKdFrQRa76SaYSe5xI9HojqLtVdqN3qcV
++nVL9le6RiiXKrbeWe+l9AwIXjX+ioKl+KulFEijZjBkMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRW1uJz6iTl3+tXCx/59E9U
+m202SzAfBgNVHSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQD
+AgNIADBFAiAuWkMKTg4TykuLrCj48qAuI3ed71nJOn7Ys0GcksTjjgIhAIw+llMp
+jpvcIxKK6rFD6OJNC5VwAFJhcCDZNC+Ps+VD
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.der
index 05dfaefd132953..b98aa3b68b530a 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.pem
index ed75b5d234788c..5777e70d113d60 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIO7qG6xutH6fpVw3FXOxohA16AXkr5rzWvaXL+4PxXj1oAoGCCqGSM49
-AwEHoUQDQgAEKMUija70s5kXqj+hakjNYagBUk43hIRibh6lMDaHLytxX/TEbM+l
-W/V6fPOA6L7sqUZfpgkOhpdZRIGQmvf5cQ==
+MHcCAQEEIKCZeE+WA5jJSOJ4tz7d9Lv5Kh4TA/7Q/014f4MaRu+CoAoGCCqGSM49
+AwEHoUQDQgAEHHvmmhQyqsQncAcp0WtBFrvpJphJ7nEj0eiOou1V2o3epxX6dUv2
+V7pGKJcqtt5Z76X0DAheNf6KgqX4q6UUSA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/test_case_vector.json
index 7a84dbf163100f..41c2a7aebf0395 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: wrong, Correct values encoded in the common-name are ignored",
     "is_success_case": "false",
-    "dac_cert": "30820206308201ada00302010202083f10bc8f9bce8b46300a06082a8648ce3d0403023069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004c53908b55f6500cf928089936b8b24633659b9633f49dcd74c6ab713a0a8f5ebd5e9bb77f1dc0a613f6d74f71d70b866a7a2ab0bf6e52e25be0c9f89dcc66400a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e0416041410af2d8f30cfceb1747476b31488c6cc1598c1d6301f0603551d23041830168014294a16c2d3ff2aeb9abfa8f22d48a0153805b804300a06082a8648ce3d040302034700304402205c55a098a583fc09af1eba65eb101afbdfbe60b13e57ce6a863a47a625ff333002204e71b9d67ddf8a61f7c73c71de39ea79ac0bb9a6a96a2472dc2449e079b5314e",
-    "pai_cert": "308201f63082019da003020102020841212e6e975e9c16300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323059301306072a8648ce3d020106082a8648ce3d0301070342000428c5228daef4b39917aa3fa16a48cd61a801524e378484626e1ea53036872f2b715ff4c46ccfa55bf57a7cf380e8beeca9465fa6090e8697594481909af7f971a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414294a16c2d3ff2aeb9abfa8f22d48a0153805b804301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402201960715a7adf7bde264b90769f6526a46b42b6a802d5cd7626375e7237b5f1ea0220198e2ac8684310ca0aebd5223cfbb74bcc90c23d086c3bf5b28509312d24f322",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022062c95d1760f1dbe26412f2564c762b114918c9e70ccd1095507104d6c7fadd28022100c486570025adea4a23ad3ce3c3e146b38a3ed33d13faaab4ed2e397219544f44",
-    "dac_private_key": "48a20ca3afe134db7938cf31d1747077ac83bbc12cd9464b2d21b895279003ab",
-    "dac_public_key": "04c53908b55f6500cf928089936b8b24633659b9633f49dcd74c6ab713a0a8f5ebd5e9bb77f1dc0a613f6d74f71d70b866a7a2ab0bf6e52e25be0c9f89dcc66400"
+    "dac_cert": "30820207308201ada003020102020875315e809fb604f4300a06082a8648ce3d0403023069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004ba2d344def6691a3f38ce971437c2841868d078d7d163629baddef4d3601eae9229fe3752a8d0a664271b3e49340c55dbc20b35b9db780910d91170a3551d561a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e68ac3723efd401494ce4b30d286d45479620516301f0603551d2304183016801456d6e273ea24e5dfeb570b1ff9f44f549b6d364b300a06082a8648ce3d040302034800304502206a255bb249a4dfeefd42ec6e04adff59338efb40299e323b72237af30db7afb3022100d60e8288883ec9e97116ffb571f2295bceafaf97ccd8318557b65eb15c8b0ac6",
+    "pai_cert": "308201f73082019da0030201020208139609613795a5ef300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a3069313b303906035504030c3241434d45204d617474657220446576656c20504149203543444139383939204d7669643a46464631204d7069643a3030423131143012060a2b0601040182a27c02010c044646463231143012060a2b0601040182a27c02020c04303042323059301306072a8648ce3d020106082a8648ce3d030107034200041c7be69a1432aac427700729d16b4116bbe9269849ee7123d1e88ea2ed55da8ddea715fa754bf657ba4628972ab6de59efa5f40c085e35fe8a82a5f8aba51448a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041456d6e273ea24e5dfeb570b1ff9f44f549b6d364b301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502202e5a430a4e0e13ca4b8bac28f8f2a02e23779def59c93a7ed8b3419c92c4e38e0221008c3e9653298e9bdc23128aeab143e8e24d0b95700052617020d9342f8fb3e543",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100bf3f12a780ed57f091c7954f4ead03785b333ce9c1b50c4591cf98bb338add83022043898fe00565598e0e2308aa67d232179d7c5e84a76ad08a99f52365dbb33bca",
+    "dac_private_key": "78cee2158ebdd2ab2a3fb133e298a856d81c2c2d2a8ea66d174dcde416d4217f",
+    "dac_public_key": "04ba2d344def6691a3f38ce971437c2841868d078d7d163629baddef4d3601eae9229fe3752a8d0a664271b3e49340c55dbc20b35b9db780910d91170a3551d561"
 }
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/cd.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/cd.der
index 16604780029563..adc5390af37310 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/cd.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.der
index fe0d2d5aabc4b5..9dd59e38fc0d57 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.pem
index 84bf499280ac1d..fefe921808a9c4 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIByDCCAW6gAwIBAgIILzCLs682ZcQwCgYIKoZIzj0EAwIwKjESMBAGA1UEAwwJ
-TXZpZDpGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTAgFw0yMjA1MjcwMDAwMDBa
+MIIBxzCCAW6gAwIBAgIIU6BqNsTqub8wCgYIKoZIzj0EAwIwKjESMBAGA1UEAwwJ
+TXZpZDpGRkYxMRQwEgYKKwYBBAGConwCAgwEMDBCMTAgFw0yMjA5MjMwMDAwMDBa
 GA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3QgREFDMRQw
 EgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDAwQjEwWTATBgcq
-hkjOPQIBBggqhkjOPQMBBwNCAAQ/2ZZJulDtjKzlHVy0IiuSX3fkf+uq/Go+uWrf
-R8eyL2nAYznZYUw3qqNuEdrVsapQbcj0rComaLIyMcrV7HXxo2AwXjAMBgNVHRMB
-Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUv12HZ/IUBDKNDWJf+HK3
-42ks7H4wHwYDVR0jBBgwFoAUpi3f4yBe2vmeUif5KfDbtc0fcWIwCgYIKoZIzj0E
-AwIDSAAwRQIhAIM5lg2NMCO4Xltu/l3S06bLGh3+QQi7ungjFblQbtkYAiA4fGeG
-m8LrIKV783ojxrVUx8BGjZyFEEDwcOeW8QznbA==
+hkjOPQIBBggqhkjOPQMBBwNCAAR7UhCc4OSY+Hte/7QufWnwlQq48rGiUDlDa9Tc
+wkmx+SQPKRxDt4gAeMJb75HgQoyYjOkccQ8QpssRLSrSvOrEo2AwXjAMBgNVHRMB
+Af8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUDvTO5LEHPWDCNikVYnBa
+w4hO4D8wHwYDVR0jBBgwFoAU431u08BgPTvwyiDcklukjETHSC0wCgYIKoZIzj0E
+AwIDRwAwRAIgEy4LTaMQxJCj8sSwXWsEKoDShr1+dAy183X7aPDZ9wICIGYaBGuH
+oyIp19eLxw0weVYwSAW76OBSLAEeRCDKcZEe
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.der
index 15944b79356ecd..9498a1eb5c0c2f 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.pem
index 36074ac3018c2e..3d2ee8c8176739 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/dac-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIrL52clUzCDPlJ1ec4ArlsF3kyLDCx0WoAKpDjug4h1oAoGCCqGSM49
-AwEHoUQDQgAEP9mWSbpQ7Yys5R1ctCIrkl935H/rqvxqPrlq30fHsi9pwGM52WFM
-N6qjbhHa1bGqUG3I9KwqJmiyMjHK1ex18Q==
+MHcCAQEEILfcFsnN6Ewr3Kt7rXepaiAxYSmam0zO/rGi8wUCL33HoAoGCCqGSM49
+AwEHoUQDQgAEe1IQnODkmPh7Xv+0Ln1p8JUKuPKxolA5Q2vU3MJJsfkkDykcQ7eI
+AHjCW++R4EKMmIzpHHEPEKbLES0q0rzqxA==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.der
index 48f5fc9bf91e14..470ee4d0661e97 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.pem
index 173b6354523c1b..55dfe2c300dcfb 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Cert.pem
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBtzCCAV6gAwIBAgIIevMNDRv28ocwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
-TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA1Mjcw
+MIIBtzCCAV6gAwIBAgIIYDy4QZ5n8WEwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA5MjMw
 MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowKjESMBAGA1UEAwwJTXZpZDpGRkYxMRQw
-EgYKKwYBBAGConwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABO0Y
-q5AwEFZLuPSs/+WprAIUxQSpDJfmhNw9kloEIyjwwUeCC/QozPRLNrE3HoHvVrvr
-76rRXnBmfr5hhLjmcuijZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/
-BAQDAgEGMB0GA1UdDgQWBBSmLd/jIF7a+Z5SJ/kp8Nu1zR9xYjAfBgNVHSMEGDAW
-gBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiBJqarfgp5Y
-xWk+JRf1Vn3bEBhB3mV+YABfrbMhT1OjQAIgUdIqaiFIjWV74ksHfmG91L/WFGlE
-7WMQ+47CuKSlwAQ=
+EgYKKwYBBAGConwCAgwEMDBCMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJxy
+K3i7eWfzl4f7TFDis7IlJAdCkXlZ64xTArffZ45S6zzUlZfnmW9ioVy5QImyrYSE
+R5cRlrKnwQ4JVnldYH6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/
+BAQDAgEGMB0GA1UdDgQWBBTjfW7TwGA9O/DKINySW6SMRMdILTAfBgNVHSMEGDAW
+gBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiA+IwTWYz8M
+fXk5nsxAr2VaC3AGpVCEnhURTyS9g3vxXwIgMsMUxiJrin3JHRArX6hitVXaM4hK
+34BJG0FWvc5r/Qo=
 -----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.der
index 856e91133dd483..1ef4dfe35b7b79 100644
Binary files a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.der and b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.pem
index f7241662a1ce8a..16930b9e4a4336 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.pem
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/pai-Key.pem
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILRP8HmxxmxfHSff7kAt86OuYECwsw3ti5yy9PvIe6eQoAoGCCqGSM49
-AwEHoUQDQgAE7RirkDAQVku49Kz/5amsAhTFBKkMl+aE3D2SWgQjKPDBR4IL9CjM
-9Es2sTcege9Wu+vvqtFecGZ+vmGEuOZy6A==
+MHcCAQEEICYuEJwnBAHWVw2LmEhKp6JW707CDGqzIbblFI9hCFOhoAoGCCqGSM49
+AwEHoUQDQgAEnHIreLt5Z/OXh/tMUOKzsiUkB0KReVnrjFMCt99njlLrPNSVl+eZ
+b2KhXLlAibKthIRHlxGWsqfBDglWeV1gfg==
 -----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/test_case_vector.json
index 3b14324bdc5840..d77bc898dd40b4 100644
--- a/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/test_case_vector.json
@@ -1,9 +1,9 @@
 {
     "description": "PAI Test Vector: Mix of Fallback and Matter OID encoding for VID and PID: invalid, PID is using Matter OID then VID must also use Matter OID",
     "is_success_case": "false",
-    "dac_cert": "308201c83082016ea00302010202082f308bb3af3665c4300a06082a8648ce3d040302302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313020170d3232303532373030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200043fd99649ba50ed8cace51d5cb4222b925f77e47febaafc6a3eb96adf47c7b22f69c06339d9614c37aaa36e11dad5b1aa506dc8f4ac2a2668b23231cad5ec75f1a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414bf5d8767f21404328d0d625ff872b7e3692cec7e301f0603551d23041830168014a62ddfe3205edaf99e5227f929f0dbb5cd1f7162300a06082a8648ce3d04030203480030450221008339960d8d3023b85e5b6efe5dd2d3a6cb1a1dfe4108bbba782315b9506ed9180220387c67869bc2eb20a57bf37a23c6b554c7c0468d9c851040f070e796f10ce76c",
-    "pai_cert": "308201b73082015ea00302010202087af30d0d1bf6f287300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303532373030303030305a180f39393939313233313233353935395a302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d03010703420004ed18ab903010564bb8f4acffe5a9ac0214c504a90c97e684dc3d925a042328f0c147820bf428ccf44b36b1371e81ef56bbebefaad15e70667ebe6184b8e672e8a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a62ddfe3205edaf99e5227f929f0dbb5cd1f7162301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020347003044022049a9aadf829e58c5693e2517f5567ddb101841de657e60005fadb3214f53a340022051d22a6a21488d657be24b077e61bdd4bfd6146944ed6310fb8ec2b8a4a5c004",
-    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d0403020447304502204d2a66e481c87ed809de40a15bfe7d9d1367a6bcb03ea6c3ef32d33d519d0b16022100f70d4962fe3e432da5cb021217514dca155ffd4dbdabcd05d7f940aa3a3d714e",
-    "dac_private_key": "8acbe767255330833e527579ce00ae5b05de4c8b0c2c745a800aa438ee838875",
-    "dac_public_key": "043fd99649ba50ed8cace51d5cb4222b925f77e47febaafc6a3eb96adf47c7b22f69c06339d9614c37aaa36e11dad5b1aa506dc8f4ac2a2668b23231cad5ec75f1"
+    "dac_cert": "308201c73082016ea003020102020853a06a36c4eab9bf300a06082a8648ce3d040302302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200047b52109ce0e498f87b5effb42e7d69f0950ab8f2b1a25039436bd4dcc249b1f9240f291c43b7880078c25bef91e0428c988ce91c710f10a6cb112d2ad2bceac4a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140ef4cee4b1073d60c236291562705ac3884ee03f301f0603551d23041830168014e37d6ed3c0603d3bf0ca20dc925ba48c44c7482d300a06082a8648ce3d04030203470030440220132e0b4da310c490a3f2c4b05d6b042a80d286bd7e740cb5f375fb68f0d9f7020220661a046b87a32229d7d78bc70d307956304805bbe8e0522c011e4420ca71911e",
+    "pai_cert": "308201b73082015ea0030201020208603cb8419e67f161300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a302a3112301006035504030c094d7669643a4646463131143012060a2b0601040182a27c02020c04303042313059301306072a8648ce3d020106082a8648ce3d030107034200049c722b78bb7967f39787fb4c50e2b3b225240742917959eb8c5302b7df678e52eb3cd49597e7996f62a15cb94089b2ad848447971196b2a7c10e0956795d607ea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414e37d6ed3c0603d3bf0ca20dc925ba48c44c7482d301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402203e2304d6633f0c7d79399ecc40af655a0b7006a550849e15114f24bd837bf15f022032c314c6226b8a7dc91d102b5fa862b555da33884adf80491b4156bdce6bfd0a",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304406092a864886f70d010701a0370435152400012501f1ff360204b118250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100c3d32a2be9bf2fb5b82199dde590e1af5304c05739de1556fa089a3cab58938c02204915813b12f18101383d9be2157ca725645da86c011c29506f8ac6412cad4d77",
+    "dac_private_key": "b7dc16c9cde84c2bdcab7bad77a96a203161299a9b4ccefeb1a2f305022f7dc7",
+    "dac_public_key": "047b52109ce0e498f87b5effb42e7d69f0950ab8f2b1a25039436bd4dcc249b1f9240f291c43b7880078c25bef91e0428c988ce91c710f10a6cb112d2ad2bceac4"
 }
diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
index 1c384c378f9151..ee7fa3d902c371 100644
--- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
+++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
@@ -968,7 +968,7 @@ bool emberAfOperationalCredentialsClusterAttestationRequestCallback(app::Command
         Crypto::P256ECDSASignature signature;
         MutableByteSpan signatureSpan{ signature.Bytes(), signature.Capacity() };
 
-        // Getnerate attestation signature
+        // Generate attestation signature
         err = dacProvider->SignWithDeviceAttestationKey(tbsSpan, signatureSpan);
         ClearSecretData(attestationElements.Get() + attestationElementsSpan.size(), attestationChallenge.size());
         VerifyOrExit(err == CHIP_NO_ERROR, finalStatus = Status::Failure);
@@ -1101,7 +1101,7 @@ bool emberAfOperationalCredentialsClusterCSRRequestCallback(app::CommandHandler
             Crypto::P256ECDSASignature signature;
             MutableByteSpan signatureSpan{ signature.Bytes(), signature.Capacity() };
 
-            // Getnerate attestation signature
+            // Generate attestation signature
             err = dacProvider->SignWithDeviceAttestationKey(tbsSpan, signatureSpan);
             ClearSecretData(nocsrElements.Get() + nocsrElementsSpan.size(), attestationChallenge.size());
             VerifyOrExit(err == CHIP_NO_ERROR, finalStatus = Status::Failure);
diff --git a/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp b/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
index 4eece60ea37074..56b1b0edf8ef06 100644
--- a/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
+++ b/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
@@ -24,6 +24,7 @@
 #include <json/json.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/BytesToHex.h>
+#include <lib/support/CHIPMemString.h>
 #include <lib/support/Span.h>
 
 #include <fstream>
@@ -92,6 +93,28 @@ ByteSpan ReadValue(Json::Value jsonValue, uint8_t * buffer, size_t bufferLen)
     return ByteSpan(buffer, bytesLen);
 }
 
+CharSpan ReadValue(Json::Value jsonValue, char * buffer, size_t bufferLen)
+{
+    const std::string value = jsonValue.asString();
+    if (value.size() == 0)
+    {
+        return CharSpan();
+    }
+
+    Platform::CopyString(buffer, bufferLen, value.c_str());
+    return CharSpan(buffer, strlen(buffer));
+}
+
+bool ReadValue(Json::Value jsonValue)
+{
+    const std::string value = jsonValue.asString();
+    if (strcmp(value.c_str(), "true") == 0)
+    {
+        return true;
+    }
+    return false;
+}
+
 // TODO: This should be moved to a method of P256Keypair
 CHIP_ERROR LoadKeypairFromRaw(ByteSpan private_key, ByteSpan public_key, Crypto::P256Keypair & keypair)
 {
@@ -118,6 +141,8 @@ void TestHarnessDACProvider::Init(const char * filepath)
     constexpr const char kPaiCertKey[]      = "pai_cert";
     constexpr const char kCertDecKey[]      = "certification_declaration";
     constexpr const char kFirmwareInfoKey[] = "firmware_information";
+    constexpr const char kIsSuccessKey[]    = "is_success_case";
+    constexpr const char kDescription[]     = "description";
 
     std::ifstream json(filepath, std::ifstream::binary);
     if (!json)
@@ -173,6 +198,18 @@ void TestHarnessDACProvider::Init(const char * filepath)
         data.firmwareInformation.SetValue(ReadValue(root[kFirmwareInfoKey], buf, sizeof(buf)));
     }
 
+    if (root.isMember(kIsSuccessKey))
+    {
+        data.isSuccessCase.SetValue(ReadValue(root[kIsSuccessKey]));
+    }
+
+    if (root.isMember(kDescription))
+    {
+        constexpr size_t kMaxTestCaseDescriptionLen = 256;
+        static char buf[kMaxTestCaseDescriptionLen];
+        data.description.SetValue(ReadValue(root[kDescription], buf, sizeof(buf)));
+    }
+
     Init(data);
 }
 
@@ -184,6 +221,8 @@ void TestHarnessDACProvider::Init(const TestHarnessDACProviderData & data)
     mPaiCert       = data.paiCert.HasValue() ? data.paiCert.Value() : DevelopmentCerts::kPaiCert;
     mCertificationDeclaration =
         data.certificationDeclaration.HasValue() ? data.certificationDeclaration.Value() : ByteSpan{ kCdForAllExamples };
+    mIsSuccessCase = data.isSuccessCase.HasValue() ? data.isSuccessCase.Value() : true;
+    mDescription   = data.description.HasValue() ? data.description.Value() : CharSpan();
 
     // TODO: We need a real example FirmwareInformation to be populated.
     mFirmwareInformation = data.firmwareInformation.HasValue() ? data.firmwareInformation.Value() : ByteSpan();
diff --git a/src/app/tests/suites/credentials/TestHarnessDACProvider.h b/src/app/tests/suites/credentials/TestHarnessDACProvider.h
index 0483443fc24337..5904aa52e98cb0 100644
--- a/src/app/tests/suites/credentials/TestHarnessDACProvider.h
+++ b/src/app/tests/suites/credentials/TestHarnessDACProvider.h
@@ -31,6 +31,8 @@ struct TestHarnessDACProviderData
     chip::Optional<ByteSpan> paiCert;
     chip::Optional<ByteSpan> certificationDeclaration;
     chip::Optional<ByteSpan> firmwareInformation;
+    chip::Optional<CharSpan> description;
+    chip::Optional<bool> isSuccessCase;
 };
 
 class TestHarnessDACProvider : public DeviceAttestationCredentialsProvider
@@ -43,6 +45,8 @@ class TestHarnessDACProvider : public DeviceAttestationCredentialsProvider
     CHIP_ERROR GetDeviceAttestationCert(MutableByteSpan & out_dac_buffer) override;
     CHIP_ERROR GetProductAttestationIntermediateCert(MutableByteSpan & out_pai_buffer) override;
     CHIP_ERROR SignWithDeviceAttestationKey(const ByteSpan & message_to_sign, MutableByteSpan & out_signature_buffer) override;
+    CharSpan GetDescription() { return mDescription; }
+    bool IsSuccessCase() { return mIsSuccessCase; }
 
     void Init(const char * filepath);
     void Init(const TestHarnessDACProviderData & data);
@@ -54,6 +58,8 @@ class TestHarnessDACProvider : public DeviceAttestationCredentialsProvider
     ByteSpan mPaiCert;
     ByteSpan mCertificationDeclaration;
     ByteSpan mFirmwareInformation;
+    CharSpan mDescription;
+    bool mIsSuccessCase;
 };
 
 } // namespace Examples
diff --git a/src/credentials/CertificationDeclaration.cpp b/src/credentials/CertificationDeclaration.cpp
index 141191efca9e8c..d18c26e5942371 100644
--- a/src/credentials/CertificationDeclaration.cpp
+++ b/src/credentials/CertificationDeclaration.cpp
@@ -182,6 +182,7 @@ CHIP_ERROR DecodeCertificationElements(const ByteSpan & encodedCertElements, Cer
         err = reader.Next();
     }
     VerifyOrReturnError(err == CHIP_END_OF_TLV || err == CHIP_ERROR_UNEXPECTED_TLV_ELEMENT || err == CHIP_NO_ERROR, err);
+    VerifyOrReturnError(reader.GetTag() != TLV::ContextTag(kTag_DACOriginProductId), CHIP_ERROR_INVALID_TLV_ELEMENT);
 
     if (err != CHIP_END_OF_TLV && reader.GetTag() == ContextTag(kTag_AuthorizedPAAList))
     {
@@ -277,6 +278,7 @@ CHIP_ERROR DecodeCertificationElements(const ByteSpan & encodedCertElements, Cer
         err = reader.Next();
     }
     VerifyOrReturnError(err == CHIP_END_OF_TLV || err == CHIP_ERROR_UNEXPECTED_TLV_ELEMENT || err == CHIP_NO_ERROR, err);
+    VerifyOrReturnError(reader.GetTag() != TLV::ContextTag(kTag_DACOriginProductId), CHIP_ERROR_INVALID_TLV_ELEMENT);
 
     if (err != CHIP_END_OF_TLV && reader.GetTag() == ContextTag(kTag_AuthorizedPAAList))
     {
diff --git a/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp b/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
index 369ba8b22256c7..fc457521cc2570 100644
--- a/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
+++ b/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
@@ -206,7 +206,7 @@ void DefaultDACVerifier::VerifyAttestationInformation(const DeviceAttestationVer
     AttestationCertVidPid paaVidPid;
 
     VerifyOrExit(!info.attestationElementsBuffer.empty() && !info.attestationChallengeBuffer.empty() &&
-                     !info.attestationSignatureBuffer.empty() && !info.paiDerBuffer.empty() && !info.dacDerBuffer.empty() &&
+                     !info.attestationSignatureBuffer.empty() && !info.dacDerBuffer.empty() &&
                      !info.attestationNonceBuffer.empty() && onCompletion != nullptr,
                  attestationError = AttestationVerificationResult::kInvalidArgument);
 
@@ -216,6 +216,14 @@ void DefaultDACVerifier::VerifyAttestationInformation(const DeviceAttestationVer
     // Ensure PAI is present
     VerifyOrExit(!info.paiDerBuffer.empty(), attestationError = AttestationVerificationResult::kPaiMissing);
 
+    // Validate Proper Certificate Format
+    {
+        VerifyOrExit(VerifyAttestationCertificateFormat(info.paiDerBuffer, AttestationCertType::kPAI) == CHIP_NO_ERROR,
+                     attestationError = AttestationVerificationResult::kPaiFormatInvalid);
+        VerifyOrExit(VerifyAttestationCertificateFormat(info.dacDerBuffer, AttestationCertType::kDAC) == CHIP_NO_ERROR,
+                     attestationError = AttestationVerificationResult::kDacFormatInvalid);
+    }
+
     // match DAC and PAI VIDs
     {
         VerifyOrExit(ExtractVIDPIDFromX509Cert(info.dacDerBuffer, dacVidPid) == CHIP_NO_ERROR,
diff --git a/src/credentials/attestation_verifier/FileAttestationTrustStore.cpp b/src/credentials/attestation_verifier/FileAttestationTrustStore.cpp
index 67c729014e9536..c5e59153491378 100644
--- a/src/credentials/attestation_verifier/FileAttestationTrustStore.cpp
+++ b/src/credentials/attestation_verifier/FileAttestationTrustStore.cpp
@@ -95,6 +95,11 @@ std::vector<std::vector<uint8_t>> LoadAllX509DerCerts(const char * trustStorePat
                         MutableByteSpan kidSpan{ kidBuf };
                         ByteSpan certSpan{ certificate.data(), certificate.size() };
 
+                        if (CHIP_NO_ERROR != VerifyAttestationCertificateFormat(certSpan, Crypto::AttestationCertType::kPAA))
+                        {
+                            continue;
+                        }
+
                         if (CHIP_NO_ERROR == Crypto::ExtractSKIDFromX509Cert(certSpan, kidSpan))
                         {
                             certs.push_back(certificate);
diff --git a/src/credentials/tests/BUILD.gn b/src/credentials/tests/BUILD.gn
index 87c694bb8aa364..041d26e20e3138 100644
--- a/src/credentials/tests/BUILD.gn
+++ b/src/credentials/tests/BUILD.gn
@@ -46,6 +46,7 @@ chip_test_suite("tests") {
   test_sources = [
     "TestCertificationDeclaration.cpp",
     "TestChipCert.cpp",
+    "TestCommissionerDUTVectors.cpp",
     "TestDeviceAttestationConstruction.cpp",
     "TestDeviceAttestationCredentials.cpp",
     "TestFabricTable.cpp",
@@ -57,6 +58,8 @@ chip_test_suite("tests") {
 
   public_deps = [
     ":cert_test_vectors",
+    "${chip_root}/src/app/tests/suites/credentials:dac_provider",
+    "${chip_root}/src/controller:controller",
     "${chip_root}/src/credentials",
     "${chip_root}/src/credentials:default_attestation_verifier",
     "${chip_root}/src/lib/core",
diff --git a/src/credentials/tests/TestCommissionerDUTVectors.cpp b/src/credentials/tests/TestCommissionerDUTVectors.cpp
new file mode 100644
index 00000000000000..99a586d1b5b5b8
--- /dev/null
+++ b/src/credentials/tests/TestCommissionerDUTVectors.cpp
@@ -0,0 +1,221 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#include <crypto/CHIPCryptoPAL.h>
+
+#include <app/tests/suites/credentials/TestHarnessDACProvider.h>
+#include <controller/CHIPDeviceController.h>
+#include <controller/CommissioneeDeviceProxy.h>
+#include <credentials/CertificationDeclaration.h>
+#include <credentials/DeviceAttestationCredsProvider.h>
+#include <credentials/attestation_verifier/DefaultDeviceAttestationVerifier.h>
+#include <credentials/attestation_verifier/DeviceAttestationVerifier.h>
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+
+#include <lib/core/CHIPError.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/Span.h>
+#include <lib/support/UnitTestExtendedAssertions.h>
+#include <lib/support/UnitTestRegistration.h>
+
+#include <nlunit-test.h>
+
+#include <dirent.h>
+#include <stdio.h>
+#include <string>
+
+using namespace chip;
+using namespace chip::Crypto;
+using namespace chip::Credentials;
+
+static void OnAttestationInformationVerificationCallback(void * context, const DeviceAttestationVerifier::AttestationInfo & info,
+                                                         AttestationVerificationResult result)
+{
+    AttestationVerificationResult * pResult = reinterpret_cast<AttestationVerificationResult *>(context);
+    *pResult                                = result;
+}
+
+static void TestCommissionerDUTVectors(nlTestSuite * inSuite, void * inContext)
+{
+    DeviceAttestationVerifier * example_dac_verifier = GetDefaultDACVerifier(GetTestAttestationTrustStore());
+    NL_TEST_ASSERT(inSuite, example_dac_verifier != nullptr);
+
+    std::string dirPath("../../../../../credentials/development/commissioner_dut/");
+    DIR * dir = opendir(dirPath.c_str());
+    while (dir == nullptr && (dirPath.find("../") == 0))
+    {
+        dirPath = dirPath.substr(3);
+        dir     = opendir(dirPath.c_str());
+    }
+    if (dir == nullptr)
+    {
+        ChipLogError(Crypto, "Couldn't open folder with Commissioner DUT Test Vectors.");
+        return;
+    }
+
+    dirent * entry;
+    while ((entry = readdir(dir)) != nullptr)
+    {
+        if (entry->d_name[0] == '.')
+            continue;
+
+        // Skip this test case because the code below will fail to use secp256k1 to sign attestation data.
+        if (strstr(entry->d_name, "struct_dac_sig_curve_secp256k1"))
+            continue;
+
+        std::string jsonFilePath = dirPath + std::string(entry->d_name) + std::string("/test_case_vector.json");
+
+        chip::Credentials::Examples::TestHarnessDACProvider dacProvider;
+        dacProvider.Init(jsonFilePath.c_str());
+
+        uint8_t attestationChallengeBuf[Crypto::kAES_CCM128_Key_Length];
+        MutableByteSpan attestationChallengeSpan(attestationChallengeBuf);
+        Crypto::DRBG_get_bytes(attestationChallengeBuf, sizeof(attestationChallengeBuf));
+
+        Crypto::P256ECDSASignature signature;
+        MutableByteSpan attestationSignatureSpan{ signature.Bytes(), signature.Capacity() };
+
+        uint8_t certDeclBuf[Credentials::kMaxCMSSignedCDMessage];
+        MutableByteSpan certDeclSpan(certDeclBuf);
+
+        uint8_t dacCertBuf[kMaxDERCertLength];
+        MutableByteSpan dacCertSpan(dacCertBuf);
+
+        uint8_t paiCertBuf[kMaxDERCertLength];
+        MutableByteSpan paiCertSpan(paiCertBuf);
+
+        uint8_t attestationNonceBuf[kAttestationNonceLength];
+        MutableByteSpan attestationNonceSpan(attestationNonceBuf);
+        Crypto::DRBG_get_bytes(attestationNonceBuf, sizeof(attestationNonceBuf));
+
+        VendorId vid = TestVendor1;
+        uint16_t pid = strstr(entry->d_name, "_vidpid_fallback_encoding_") ? 0x00B1 : 0x8000;
+
+        NL_TEST_ASSERT_SUCCESS(inSuite, dacProvider.GetCertificationDeclaration(certDeclSpan));
+        NL_TEST_ASSERT_SUCCESS(inSuite, dacProvider.GetDeviceAttestationCert(dacCertSpan));
+        NL_TEST_ASSERT_SUCCESS(inSuite, dacProvider.GetProductAttestationIntermediateCert(paiCertSpan));
+
+        size_t attestationElementsLen =
+            TLV::EstimateStructOverhead(certDeclSpan.size(), attestationNonceSpan.size(), sizeof(uint64_t) * 8);
+        Platform::ScopedMemoryBuffer<uint8_t> attestationElements;
+        NL_TEST_ASSERT(inSuite, attestationElements.Alloc(attestationElementsLen + attestationChallengeSpan.size()));
+        MutableByteSpan attestationElementsSpan(attestationElements.Get(), attestationElementsLen);
+
+        // Construct attestation elements
+        {
+            uint32_t timestamp = 0;
+            Credentials::DeviceAttestationVendorReservedConstructor emptyVendorReserved(nullptr, 0);
+            const ByteSpan kEmptyFirmwareInfo;
+
+            NL_TEST_ASSERT_SUCCESS(inSuite,
+                                   Credentials::ConstructAttestationElements(certDeclSpan, attestationNonceSpan, timestamp,
+                                                                             kEmptyFirmwareInfo, emptyVendorReserved,
+                                                                             attestationElementsSpan));
+        }
+
+        // Generate attestation signature
+        {
+            // Append attestation challenge in the back of the reserved space for the signature
+            memcpy(attestationElementsSpan.data() + attestationElementsSpan.size(), attestationChallengeSpan.data(),
+                   attestationChallengeSpan.size());
+            ByteSpan tbsSpan(attestationElementsSpan.data(), attestationElementsSpan.size() + attestationChallengeSpan.size());
+
+            NL_TEST_ASSERT_SUCCESS(inSuite, dacProvider.SignWithDeviceAttestationKey(tbsSpan, attestationSignatureSpan));
+            NL_TEST_ASSERT(inSuite, attestationSignatureSpan.size() == signature.Capacity());
+        }
+
+        AttestationVerificationResult attestationResult = AttestationVerificationResult::kNotImplemented;
+        Callback::Callback<DeviceAttestationVerifier::OnAttestationInformationVerification>
+            attestationInformationVerificationCallback(OnAttestationInformationVerificationCallback, &attestationResult);
+
+        DeviceAttestationVerifier::AttestationInfo info(attestationElementsSpan, attestationChallengeSpan, attestationSignatureSpan,
+                                                        paiCertSpan, dacCertSpan, attestationNonceSpan, vid, pid);
+
+        example_dac_verifier->VerifyAttestationInformation(info, &attestationInformationVerificationCallback);
+
+        bool isSuccessCase = dacProvider.IsSuccessCase();
+        // The DefaultDACVerifier doesn't currently check validity of CD elements values.
+        if (strstr(entry->d_name, "struct_cd_device_type_id_mismatch") || strstr(entry->d_name, "struct_cd_security_info_wrong") ||
+            strstr(entry->d_name, "struct_cd_cert_type_wrong") || strstr(entry->d_name, "struct_cd_security_level_wrong") ||
+            strstr(entry->d_name, "struct_cd_version_number_wrong") || strstr(entry->d_name, "struct_cd_format_version_2") ||
+            strstr(entry->d_name, "struct_cd_cert_id_mismatch"))
+        {
+            isSuccessCase = true;
+        }
+
+        if (isSuccessCase)
+        {
+            NL_TEST_ASSERT(inSuite, attestationResult == AttestationVerificationResult::kSuccess);
+        }
+        else
+        {
+            NL_TEST_ASSERT(inSuite, attestationResult != AttestationVerificationResult::kSuccess);
+        }
+    }
+    closedir(dir);
+}
+
+/**
+ *  Set up the test suite.
+ */
+int TestCommissionerDUT_Setup(void * inContext)
+{
+    CHIP_ERROR error = chip::Platform::MemoryInit();
+
+    if (error != CHIP_NO_ERROR)
+    {
+        return FAILURE;
+    }
+
+    return SUCCESS;
+}
+
+/**
+ *  Tear down the test suite.
+ */
+int TestCommissionerDUT_Teardown(void * inContext)
+{
+    chip::Platform::MemoryShutdown();
+    return SUCCESS;
+}
+
+/**
+ *   Test Suite. It lists all the test functions.
+ */
+// clang-format off
+static const nlTest sTests[] = {
+    NL_TEST_DEF("Test Device Attestation Credentials Vectors", TestCommissionerDUTVectors),
+    NL_TEST_SENTINEL()
+};
+// clang-format on
+
+int TestCommissionerDUT()
+{
+    // clang-format off
+    nlTestSuite theSuite =
+    {
+        "Device Attestation Credentials Test Vectors",
+        &sTests[0],
+        TestCommissionerDUT_Setup,
+        TestCommissionerDUT_Teardown
+    };
+    // clang-format on
+    nlTestRunner(&theSuite, nullptr);
+    return (nlTestRunnerStats(&theSuite));
+}
+
+CHIP_REGISTER_TEST_SUITE(TestCommissionerDUT);
diff --git a/src/crypto/CHIPCryptoPAL.h b/src/crypto/CHIPCryptoPAL.h
index 9c5de092867ee3..a2b87df555d31a 100644
--- a/src/crypto/CHIPCryptoPAL.h
+++ b/src/crypto/CHIPCryptoPAL.h
@@ -1436,6 +1436,15 @@ CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t root
                                     size_t caCertificateLen, const uint8_t * leafCertificate, size_t leafCertificateLen,
                                     CertificateChainValidationResult & result);
 
+enum class AttestationCertType
+{
+    kPAA = 0,
+    kPAI = 1,
+    kDAC = 2,
+};
+
+CHIP_ERROR VerifyAttestationCertificateFormat(const ByteSpan & cert, AttestationCertType certType);
+
 /**
  * @brief Validate notBefore timestamp of a certificate (candidateCertificate) against validity period of the
  *        issuer certificate (issuerCertificate).
diff --git a/src/crypto/CHIPCryptoPALOpenSSL.cpp b/src/crypto/CHIPCryptoPALOpenSSL.cpp
index bc75369dbb2b88..693f87c3cd95df 100644
--- a/src/crypto/CHIPCryptoPALOpenSSL.cpp
+++ b/src/crypto/CHIPCryptoPALOpenSSL.cpp
@@ -1602,6 +1602,111 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointIsValid(void * R)
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR VerifyAttestationCertificateFormat(const ByteSpan & cert, AttestationCertType certType)
+{
+    CHIP_ERROR err          = CHIP_NO_ERROR;
+    const uint8_t * certPtr = cert.data();
+    X509 * x509Cert         = nullptr;
+    bool extBasicPresent    = false;
+    bool extKeyUsagePresent = false;
+    bool extSKIDPresent     = false;
+    bool extAKIDPresent     = false;
+
+    VerifyOrReturnError(!cert.empty() && CanCastTo<long>(cert.size()), CHIP_ERROR_INVALID_ARGUMENT);
+
+    x509Cert = d2i_X509(nullptr, &certPtr, static_cast<long>(cert.size()));
+    VerifyOrExit(x509Cert != nullptr, err = CHIP_ERROR_INTERNAL);
+
+    VerifyOrExit(X509_get_version(x509Cert) == 2, err = CHIP_ERROR_INTERNAL);
+    VerifyOrExit(X509_get_serialNumber(x509Cert) != nullptr, err = CHIP_ERROR_INTERNAL);
+    VerifyOrExit(X509_get_signature_nid(x509Cert) == NID_ecdsa_with_SHA256, err = CHIP_ERROR_INTERNAL);
+    VerifyOrExit(X509_get_issuer_name(x509Cert) != nullptr, err = CHIP_ERROR_INTERNAL);
+    VerifyOrExit(X509_get_notBefore(x509Cert) != nullptr, err = CHIP_ERROR_INTERNAL);
+    VerifyOrExit(X509_get_notAfter(x509Cert) != nullptr, err = CHIP_ERROR_INTERNAL);
+    VerifyOrExit(X509_get_subject_name(x509Cert) != nullptr, err = CHIP_ERROR_INTERNAL);
+
+    // Verify public key presence and format.
+    {
+        Crypto::P256PublicKey pubkey;
+        SuccessOrExit(err = ExtractPubkeyFromX509Cert(cert, pubkey));
+    }
+
+    for (int i = 0; i < X509_get_ext_count(x509Cert); i++)
+    {
+        X509_EXTENSION * ex = X509_get_ext(x509Cert, i);
+        ASN1_OBJECT * obj   = X509_EXTENSION_get_object(ex);
+        bool isCritical     = X509_EXTENSION_get_critical(ex) == 1;
+
+        switch (OBJ_obj2nid(obj))
+        {
+        case NID_basic_constraints:
+            VerifyOrExit(isCritical && !extBasicPresent, err = CHIP_ERROR_INTERNAL);
+            extBasicPresent = true;
+            {
+                bool isCA    = X509_get_extension_flags(x509Cert) & EXFLAG_CA;
+                long pathLen = X509_get_pathlen(x509Cert);
+                if (certType == AttestationCertType::kDAC)
+                {
+                    VerifyOrExit(!isCA && pathLen == -1, err = CHIP_ERROR_INTERNAL);
+                }
+                else if (certType == AttestationCertType::kPAI)
+                {
+                    VerifyOrExit(isCA && pathLen == 0, err = CHIP_ERROR_INTERNAL);
+                }
+                else
+                {
+                    VerifyOrExit(isCA && (pathLen == -1 || pathLen == 0 || pathLen == 1), err = CHIP_ERROR_INTERNAL);
+                }
+            }
+            break;
+        case NID_key_usage:
+            VerifyOrExit(isCritical && !extKeyUsagePresent, err = CHIP_ERROR_INTERNAL);
+            extKeyUsagePresent = true;
+            {
+                uint32_t keyUsage = X509_get_key_usage(x509Cert);
+                if (certType == AttestationCertType::kDAC)
+                {
+                    // SHALL only have the digitalSignature bit set.
+                    VerifyOrExit(keyUsage == X509v3_KU_DIGITAL_SIGNATURE, err = CHIP_ERROR_INTERNAL);
+                }
+                else
+                {
+                    bool keyCertSignFlag = keyUsage & X509v3_KU_KEY_CERT_SIGN;
+                    bool crlSignFlag     = keyUsage & X509v3_KU_CRL_SIGN;
+                    bool otherFlags      = keyUsage & ~(X509v3_KU_CRL_SIGN | X509v3_KU_KEY_CERT_SIGN | X509v3_KU_DIGITAL_SIGNATURE);
+                    VerifyOrExit(keyCertSignFlag && crlSignFlag && !otherFlags, err = CHIP_ERROR_INTERNAL);
+                }
+            }
+            break;
+        case NID_subject_key_identifier:
+            VerifyOrExit(!isCritical && !extSKIDPresent, err = CHIP_ERROR_INTERNAL);
+            VerifyOrExit(X509_get0_subject_key_id(x509Cert)->length == kSubjectKeyIdentifierLength, err = CHIP_ERROR_INTERNAL);
+            extSKIDPresent = true;
+            break;
+        case NID_authority_key_identifier:
+            VerifyOrExit(!isCritical && !extAKIDPresent, err = CHIP_ERROR_INTERNAL);
+            VerifyOrExit(X509_get0_authority_key_id(x509Cert)->length == kAuthorityKeyIdentifierLength, err = CHIP_ERROR_INTERNAL);
+            extAKIDPresent = true;
+            break;
+        default:
+            break;
+        }
+    }
+    // Mandatory extensions for all certs.
+    VerifyOrExit(extBasicPresent && extKeyUsagePresent && extSKIDPresent, err = CHIP_ERROR_INTERNAL);
+
+    if (certType == AttestationCertType::kDAC || certType == AttestationCertType::kPAI)
+    {
+        // Mandatory extension for DAC and PAI certs.
+        VerifyOrExit(extAKIDPresent, err = CHIP_ERROR_INTERNAL);
+    }
+
+exit:
+    X509_free(x509Cert);
+
+    return err;
+}
+
 CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t rootCertificateLen, const uint8_t * caCertificate,
                                     size_t caCertificateLen, const uint8_t * leafCertificate, size_t leafCertificateLen,
                                     CertificateChainValidationResult & result)
@@ -1681,6 +1786,7 @@ CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t root
         VerifyOrExit(CanCastTo<time_t>(unixEpoch),
                      (result = CertificateChainValidationResult::kLeafFormatInvalid, err = CHIP_ERROR_INTERNAL));
         X509_VERIFY_PARAM_set_time(param, static_cast<time_t>(unixEpoch));
+        X509_VERIFY_PARAM_set_flags(param, X509_V_FLAG_X509_STRICT);
     }
 
     status = X509_verify_cert(verifyCtx);
@@ -1786,6 +1892,7 @@ CHIP_ERROR IsCertificateValidAtCurrentTime(const ByteSpan & certificate)
 CHIP_ERROR ExtractPubkeyFromX509Cert(const ByteSpan & certificate, Crypto::P256PublicKey & pubkey)
 {
     CHIP_ERROR err                       = CHIP_NO_ERROR;
+    EC_KEY * ec_key                      = nullptr;
     EVP_PKEY * pkey                      = nullptr;
     X509 * x509certificate               = nullptr;
     const unsigned char * pCertificate   = certificate.data();
@@ -1804,12 +1911,17 @@ CHIP_ERROR ExtractPubkeyFromX509Cert(const ByteSpan & certificate, Crypto::P256P
     VerifyOrExit(EVP_PKEY_base_id(pkey) == EVP_PKEY_EC, err = CHIP_ERROR_INTERNAL);
     VerifyOrExit(EVP_PKEY_bits(pkey) == 256, err = CHIP_ERROR_INTERNAL);
 
+    ec_key = EVP_PKEY_get1_EC_KEY(pkey);
+    VerifyOrExit(ec_key != nullptr, err = CHIP_ERROR_NO_MEMORY);
+    VerifyOrExit(EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key)) == NID_X9_62_prime256v1, err = CHIP_ERROR_INTERNAL);
+
     pkeyLen = i2d_PublicKey(pkey, nullptr);
     VerifyOrExit(pkeyLen == static_cast<int>(pubkey.Length()), err = CHIP_ERROR_INTERNAL);
 
     VerifyOrExit(i2d_PublicKey(pkey, ppPubkey) == pkeyLen, err = CHIP_ERROR_INTERNAL);
 
 exit:
+    EC_KEY_free(ec_key);
     EVP_PKEY_free(pkey);
     X509_free(x509certificate);
 
@@ -1832,7 +1944,7 @@ CHIP_ERROR ExtractKIDFromX509Cert(bool isSKID, const ByteSpan & certificate, Mut
     VerifyOrExit(x509certificate != nullptr, err = CHIP_ERROR_NO_MEMORY);
 
     kidString = isSKID ? X509_get0_subject_key_id(x509certificate) : X509_get0_authority_key_id(x509certificate);
-    VerifyOrExit(kidString != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrExit(kidString != nullptr, err = CHIP_ERROR_NOT_FOUND);
     VerifyOrExit(CanCastTo<size_t>(kidString->length), err = CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrExit(kidString->length == kSubjectKeyIdentifierLength, err = CHIP_ERROR_WRONG_CERT_TYPE);
     VerifyOrExit(static_cast<size_t>(kidString->length) <= kid.size(), err = CHIP_ERROR_BUFFER_TOO_SMALL);
diff --git a/src/crypto/CHIPCryptoPALTinyCrypt.cpp b/src/crypto/CHIPCryptoPALTinyCrypt.cpp
index 2083728bdd5135..3af44e91c933bc 100644
--- a/src/crypto/CHIPCryptoPALTinyCrypt.cpp
+++ b/src/crypto/CHIPCryptoPALTinyCrypt.cpp
@@ -1155,7 +1155,7 @@ CHIP_ERROR IsCertificateValidAtIssuance(const mbedtls_x509_crt * candidateCertif
     return CHIP_NO_ERROR;
 }
 
-static int CallbackForCustomValidityCheck(void * data, mbedtls_x509_crt * crt, int depth, uint32_t * flags)
+int CallbackForCustomValidityCheck(void * data, mbedtls_x509_crt * crt, int depth, uint32_t * flags)
 {
     mbedtls_x509_crt * leafCert   = reinterpret_cast<mbedtls_x509_crt *>(data);
     mbedtls_x509_crt * issuerCert = crt;
@@ -1172,10 +1172,190 @@ static int CallbackForCustomValidityCheck(void * data, mbedtls_x509_crt * crt, i
 
     return 0;
 }
+
+constexpr uint8_t sOID_AttributeType_CommonName[]         = { 0x55, 0x04, 0x03 };
+constexpr uint8_t sOID_AttributeType_MatterVendorId[]     = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x01 };
+constexpr uint8_t sOID_AttributeType_MatterProductId[]    = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x02 };
+constexpr uint8_t sOID_SigAlgo_ECDSAWithSHA256[]          = { 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02 };
+constexpr uint8_t sOID_Extension_BasicConstraints[]       = { 0x55, 0x1D, 0x13 };
+constexpr uint8_t sOID_Extension_KeyUsage[]               = { 0x55, 0x1D, 0x0F };
+constexpr uint8_t sOID_Extension_SubjectKeyIdentifier[]   = { 0x55, 0x1D, 0x0E };
+constexpr uint8_t sOID_Extension_AuthorityKeyIdentifier[] = { 0x55, 0x1D, 0x23 };
+
+/**
+ * Compares an mbedtls_asn1_buf structure (oidBuf) to a reference OID represented as uint8_t array (oid).
+ */
+#define OID_CMP(oid, oidBuf)                                                                                                       \
+    ((MBEDTLS_ASN1_OID == (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(tag)) &&                                                           \
+     (sizeof(oid) == (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(len)) &&                                                                \
+     (memcmp((oid), (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(p), (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(len)) == 0))
+
 #endif // defined(MBEDTLS_X509_CRT_PARSE_C)
 
 } // anonymous namespace
 
+CHIP_ERROR VerifyAttestationCertificateFormat(const ByteSpan & cert, AttestationCertType certType)
+{
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
+    CHIP_ERROR error = CHIP_NO_ERROR;
+    int result       = 0;
+    mbedtls_x509_crt mbed_cert;
+    unsigned char * p         = nullptr;
+    const unsigned char * end = nullptr;
+    size_t len                = 0;
+    bool extBasicPresent      = false;
+    bool extKeyUsagePresent   = false;
+
+    VerifyOrReturnError(!cert.empty(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    mbedtls_x509_crt_init(&mbed_cert);
+
+    result = mbedtls_x509_crt_parse(&mbed_cert, Uint8::to_const_uchar(cert.data()), cert.size());
+    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+    // "version" value is 1 higher than the actual encoded value.
+    VerifyOrExit(mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(version) - 1 == 2, error = CHIP_ERROR_INTERNAL);
+
+    // Verify signature algorithms is ECDSA with SHA256.
+    VerifyOrExit(OID_CMP(sOID_SigAlgo_ECDSAWithSHA256, mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(sig_oid)),
+                 error = CHIP_ERROR_INTERNAL);
+
+    // Verify public key presence and format.
+    {
+        Crypto::P256PublicKey pubkey;
+        SuccessOrExit(error = ExtractPubkeyFromX509Cert(cert, pubkey));
+    }
+
+    p      = mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(v3_ext).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
+    end    = p + mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(v3_ext).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
+    result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+    while (p < end)
+    {
+        mbedtls_x509_buf extOID = { 0, 0, nullptr };
+        int extCritical         = 0;
+
+        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+        /* Get extension ID */
+        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OID);
+        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(tag) = MBEDTLS_ASN1_OID;
+        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(len) = len;
+        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(p)   = p;
+        p += len;
+
+        /* Get optional critical */
+        result = mbedtls_asn1_get_bool(&p, end, &extCritical);
+        VerifyOrExit(result == 0 || result == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG, error = CHIP_ERROR_INTERNAL);
+
+        /* Data should be octet string type */
+        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING);
+        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+        if (OID_CMP(sOID_Extension_BasicConstraints, extOID))
+        {
+            int isCA                 = 0;
+            int pathLen              = -1;
+            unsigned char * seqStart = p;
+
+            VerifyOrExit(extCritical, error = CHIP_ERROR_INTERNAL);
+            extBasicPresent = true;
+
+            result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+            VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+            if (len > 0)
+            {
+                result = mbedtls_asn1_get_bool(&p, end, &isCA);
+                VerifyOrExit(result == 0 || result == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG, error = CHIP_ERROR_INTERNAL);
+
+                if (p != seqStart + len)
+                {
+                    result = mbedtls_asn1_get_int(&p, end, &pathLen);
+                    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+                }
+            }
+
+            if (certType == AttestationCertType::kDAC)
+            {
+                VerifyOrExit(!isCA && pathLen == -1, error = CHIP_ERROR_INTERNAL);
+            }
+            else if (certType == AttestationCertType::kPAI)
+            {
+                VerifyOrExit(isCA && pathLen == 0, error = CHIP_ERROR_INTERNAL);
+            }
+            else
+            {
+                VerifyOrExit(isCA && (pathLen == -1 || pathLen == 0 || pathLen == 1), error = CHIP_ERROR_INTERNAL);
+            }
+        }
+        else if (OID_CMP(sOID_Extension_KeyUsage, extOID))
+        {
+            mbedtls_x509_bitstring bs = { 0, 0, nullptr };
+            unsigned int keyUsage     = 0;
+
+            VerifyOrExit(extCritical, error = CHIP_ERROR_INTERNAL);
+            extKeyUsagePresent = true;
+
+            result = mbedtls_asn1_get_bitstring(&p, p + len, &bs);
+            VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+            for (size_t i = 0; i < bs.CHIP_CRYPTO_PAL_PRIVATE_X509(len) && i < sizeof(unsigned int); i++)
+            {
+                keyUsage |= static_cast<unsigned int>(bs.CHIP_CRYPTO_PAL_PRIVATE_X509(p)[i]) << (8 * i);
+            }
+
+            if (certType == AttestationCertType::kDAC)
+            {
+                // SHALL only have the digitalSignature bit set.
+                VerifyOrExit(keyUsage == MBEDTLS_X509_KU_DIGITAL_SIGNATURE, error = CHIP_ERROR_INTERNAL);
+            }
+            else
+            {
+                bool keyCertSignFlag = keyUsage & MBEDTLS_X509_KU_KEY_CERT_SIGN;
+                bool crlSignFlag     = keyUsage & MBEDTLS_X509_KU_CRL_SIGN;
+                bool otherFlags =
+                    keyUsage & ~(MBEDTLS_X509_KU_CRL_SIGN | MBEDTLS_X509_KU_KEY_CERT_SIGN | MBEDTLS_X509_KU_DIGITAL_SIGNATURE);
+                VerifyOrExit(keyCertSignFlag && crlSignFlag && !otherFlags, error = CHIP_ERROR_INTERNAL);
+            }
+        }
+        else
+        {
+            p += len;
+        }
+    }
+
+    // Verify basic and key usage extensions are present.
+    VerifyOrExit(extBasicPresent && extKeyUsagePresent, error = CHIP_ERROR_INTERNAL);
+
+    // Verify that SKID and AKID extensions are present.
+    {
+        uint8_t kidBuf[kSubjectKeyIdentifierLength];
+        MutableByteSpan kid(kidBuf);
+        SuccessOrExit(error = ExtractSKIDFromX509Cert(cert, kid));
+        if (certType == AttestationCertType::kDAC || certType == AttestationCertType::kPAI)
+        {
+            // Mandatory extension for DAC and PAI certs.
+            SuccessOrExit(error = ExtractAKIDFromX509Cert(cert, kid));
+        }
+    }
+
+exit:
+    _log_mbedTLS_error(result);
+    mbedtls_x509_crt_free(&mbed_cert);
+
+#else
+    (void) cert;
+    (void) certType;
+    CHIP_ERROR error = CHIP_ERROR_NOT_IMPLEMENTED;
+#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
+
+    return error;
+}
+
 CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t rootCertificateLen, const uint8_t * caCertificate,
                                     size_t caCertificateLen, const uint8_t * leafCertificate, size_t leafCertificateLen,
                                     CertificateChainValidationResult & result)
@@ -1362,14 +1542,11 @@ namespace {
 CHIP_ERROR ExtractKIDFromX509Cert(bool extractSKID, const ByteSpan & certificate, MutableByteSpan & kid)
 {
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
-    CHIP_ERROR error = CHIP_NO_ERROR;
+    CHIP_ERROR error = CHIP_ERROR_NOT_FOUND;
     mbedtls_x509_crt mbed_cert;
-    unsigned char * p;
-    const unsigned char * end;
-    size_t len;
-
-    constexpr uint8_t sOID_Extension_SubjectKeyIdentifier[]   = { 0x55, 0x1D, 0x0E };
-    constexpr uint8_t sOID_Extension_AuthorityKeyIdentifier[] = { 0x55, 0x1D, 0x23 };
+    unsigned char * p         = nullptr;
+    const unsigned char * end = nullptr;
+    size_t len                = 0;
 
     mbedtls_x509_crt_init(&mbed_cert);
 
@@ -1392,10 +1569,9 @@ CHIP_ERROR ExtractKIDFromX509Cert(bool extractSKID, const ByteSpan & certificate
         result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OID);
         VerifyOrExit(result == 0, error = CHIP_ERROR_WRONG_CERT_TYPE);
 
-        bool extractCurrentExtSKID = extractSKID && (sizeof(sOID_Extension_SubjectKeyIdentifier) == len) &&
-            (memcmp(p, sOID_Extension_SubjectKeyIdentifier, len) == 0);
-        bool extractCurrentExtAKID = !extractSKID && (sizeof(sOID_Extension_AuthorityKeyIdentifier) == len) &&
-            (memcmp(p, sOID_Extension_AuthorityKeyIdentifier, len) == 0);
+        mbedtls_x509_buf extOID    = { MBEDTLS_ASN1_OID, len, p };
+        bool extractCurrentExtSKID = extractSKID && OID_CMP(sOID_Extension_SubjectKeyIdentifier, extOID);
+        bool extractCurrentExtAKID = !extractSKID && OID_CMP(sOID_Extension_AuthorityKeyIdentifier, extOID);
         p += len;
 
         int is_critical = 0;
@@ -1461,10 +1637,6 @@ CHIP_ERROR ExtractAKIDFromX509Cert(const ByteSpan & certificate, MutableByteSpan
 CHIP_ERROR ExtractVIDPIDFromX509Cert(const ByteSpan & certificate, AttestationCertVidPid & vidpid)
 {
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
-    constexpr uint8_t sOID_AttributeType_CommonName[]      = { 0x55, 0x04, 0x03 };
-    constexpr uint8_t sOID_AttributeType_MatterVendorId[]  = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x01 };
-    constexpr uint8_t sOID_AttributeType_MatterProductId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x02 };
-
     CHIP_ERROR error = CHIP_NO_ERROR;
     mbedtls_x509_crt mbed_cert;
     mbedtls_asn1_named_data * dnIterator = nullptr;
@@ -1478,32 +1650,24 @@ CHIP_ERROR ExtractVIDPIDFromX509Cert(const ByteSpan & certificate, AttestationCe
     for (dnIterator = &mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(subject); dnIterator != nullptr;
          dnIterator = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(next))
     {
-        size_t oid_len  = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
-        uint8_t * oid_p = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
-        size_t val_len  = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
-        uint8_t * val_p = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
-
-        if (oid_p != nullptr && val_p != nullptr)
+        DNAttrType attrType = DNAttrType::kUnspecified;
+        if (OID_CMP(sOID_AttributeType_CommonName, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
         {
-            DNAttrType attrType = DNAttrType::kUnspecified;
-            if ((oid_len == sizeof(sOID_AttributeType_CommonName)) && (memcmp(sOID_AttributeType_CommonName, oid_p, oid_len) == 0))
-            {
-                attrType = DNAttrType::kCommonName;
-            }
-            else if ((oid_len == sizeof(sOID_AttributeType_MatterVendorId)) &&
-                     (memcmp(sOID_AttributeType_MatterVendorId, oid_p, oid_len) == 0))
-            {
-                attrType = DNAttrType::kMatterVID;
-            }
-            else if ((oid_len == sizeof(sOID_AttributeType_MatterProductId)) &&
-                     (memcmp(sOID_AttributeType_MatterProductId, oid_p, oid_len) == 0))
-            {
-                attrType = DNAttrType::kMatterPID;
-            }
-
-            error = ExtractVIDPIDFromAttributeString(attrType, ByteSpan(val_p, val_len), vidpid, vidpidFromCN);
-            SuccessOrExit(error);
+            attrType = DNAttrType::kCommonName;
         }
+        else if (OID_CMP(sOID_AttributeType_MatterVendorId, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
+        {
+            attrType = DNAttrType::kMatterVID;
+        }
+        else if (OID_CMP(sOID_AttributeType_MatterProductId, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
+        {
+            attrType = DNAttrType::kMatterPID;
+        }
+
+        size_t val_len  = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
+        uint8_t * val_p = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
+        error           = ExtractVIDPIDFromAttributeString(attrType, ByteSpan(val_p, val_len), vidpid, vidpidFromCN);
+        SuccessOrExit(error);
     }
 
     // If Matter Attributes were not found use values extracted from the CN Attribute,
diff --git a/src/crypto/CHIPCryptoPALmbedTLS.cpp b/src/crypto/CHIPCryptoPALmbedTLS.cpp
index 1a81f309f3e223..d1b3d2940a1564 100644
--- a/src/crypto/CHIPCryptoPALmbedTLS.cpp
+++ b/src/crypto/CHIPCryptoPALmbedTLS.cpp
@@ -1296,7 +1296,7 @@ CHIP_ERROR IsCertificateValidAtIssuance(const mbedtls_x509_crt * candidateCertif
     return CHIP_NO_ERROR;
 }
 
-static int CallbackForCustomValidityCheck(void * data, mbedtls_x509_crt * crt, int depth, uint32_t * flags)
+int CallbackForCustomValidityCheck(void * data, mbedtls_x509_crt * crt, int depth, uint32_t * flags)
 {
     mbedtls_x509_crt * leafCert   = reinterpret_cast<mbedtls_x509_crt *>(data);
     mbedtls_x509_crt * issuerCert = crt;
@@ -1313,10 +1313,190 @@ static int CallbackForCustomValidityCheck(void * data, mbedtls_x509_crt * crt, i
 
     return 0;
 }
+
+constexpr uint8_t sOID_AttributeType_CommonName[]         = { 0x55, 0x04, 0x03 };
+constexpr uint8_t sOID_AttributeType_MatterVendorId[]     = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x01 };
+constexpr uint8_t sOID_AttributeType_MatterProductId[]    = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x02 };
+constexpr uint8_t sOID_SigAlgo_ECDSAWithSHA256[]          = { 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02 };
+constexpr uint8_t sOID_Extension_BasicConstraints[]       = { 0x55, 0x1D, 0x13 };
+constexpr uint8_t sOID_Extension_KeyUsage[]               = { 0x55, 0x1D, 0x0F };
+constexpr uint8_t sOID_Extension_SubjectKeyIdentifier[]   = { 0x55, 0x1D, 0x0E };
+constexpr uint8_t sOID_Extension_AuthorityKeyIdentifier[] = { 0x55, 0x1D, 0x23 };
+
+/**
+ * Compares an mbedtls_asn1_buf structure (oidBuf) to a reference OID represented as uint8_t array (oid).
+ */
+#define OID_CMP(oid, oidBuf)                                                                                                       \
+    ((MBEDTLS_ASN1_OID == (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(tag)) &&                                                           \
+     (sizeof(oid) == (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(len)) &&                                                                \
+     (memcmp((oid), (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(p), (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(len)) == 0))
+
 #endif // defined(MBEDTLS_X509_CRT_PARSE_C)
 
 } // anonymous namespace
 
+CHIP_ERROR VerifyAttestationCertificateFormat(const ByteSpan & cert, AttestationCertType certType)
+{
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
+    CHIP_ERROR error = CHIP_NO_ERROR;
+    int result       = 0;
+    mbedtls_x509_crt mbed_cert;
+    unsigned char * p         = nullptr;
+    const unsigned char * end = nullptr;
+    size_t len                = 0;
+    bool extBasicPresent      = false;
+    bool extKeyUsagePresent   = false;
+
+    VerifyOrReturnError(!cert.empty(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    mbedtls_x509_crt_init(&mbed_cert);
+
+    result = mbedtls_x509_crt_parse(&mbed_cert, Uint8::to_const_uchar(cert.data()), cert.size());
+    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+    // "version" value is 1 higher than the actual encoded value.
+    VerifyOrExit(mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(version) - 1 == 2, error = CHIP_ERROR_INTERNAL);
+
+    // Verify signature algorithms is ECDSA with SHA256.
+    VerifyOrExit(OID_CMP(sOID_SigAlgo_ECDSAWithSHA256, mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(sig_oid)),
+                 error = CHIP_ERROR_INTERNAL);
+
+    // Verify public key presence and format.
+    {
+        Crypto::P256PublicKey pubkey;
+        SuccessOrExit(error = ExtractPubkeyFromX509Cert(cert, pubkey));
+    }
+
+    p      = mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(v3_ext).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
+    end    = p + mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(v3_ext).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
+    result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+    while (p < end)
+    {
+        mbedtls_x509_buf extOID = { 0, 0, nullptr };
+        int extCritical         = 0;
+
+        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+        /* Get extension ID */
+        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OID);
+        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(tag) = MBEDTLS_ASN1_OID;
+        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(len) = len;
+        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(p)   = p;
+        p += len;
+
+        /* Get optional critical */
+        result = mbedtls_asn1_get_bool(&p, end, &extCritical);
+        VerifyOrExit(result == 0 || result == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG, error = CHIP_ERROR_INTERNAL);
+
+        /* Data should be octet string type */
+        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING);
+        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+        if (OID_CMP(sOID_Extension_BasicConstraints, extOID))
+        {
+            int isCA                 = 0;
+            int pathLen              = -1;
+            unsigned char * seqStart = p;
+
+            VerifyOrExit(extCritical, error = CHIP_ERROR_INTERNAL);
+            extBasicPresent = true;
+
+            result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+            VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+            if (len > 0)
+            {
+                result = mbedtls_asn1_get_bool(&p, end, &isCA);
+                VerifyOrExit(result == 0 || result == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG, error = CHIP_ERROR_INTERNAL);
+
+                if (p != seqStart + len)
+                {
+                    result = mbedtls_asn1_get_int(&p, end, &pathLen);
+                    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+                }
+            }
+
+            if (certType == AttestationCertType::kDAC)
+            {
+                VerifyOrExit(!isCA && pathLen == -1, error = CHIP_ERROR_INTERNAL);
+            }
+            else if (certType == AttestationCertType::kPAI)
+            {
+                VerifyOrExit(isCA && pathLen == 0, error = CHIP_ERROR_INTERNAL);
+            }
+            else
+            {
+                VerifyOrExit(isCA && (pathLen == -1 || pathLen == 0 || pathLen == 1), error = CHIP_ERROR_INTERNAL);
+            }
+        }
+        else if (OID_CMP(sOID_Extension_KeyUsage, extOID))
+        {
+            mbedtls_x509_bitstring bs = { 0, 0, nullptr };
+            unsigned int keyUsage     = 0;
+
+            VerifyOrExit(extCritical, error = CHIP_ERROR_INTERNAL);
+            extKeyUsagePresent = true;
+
+            result = mbedtls_asn1_get_bitstring(&p, p + len, &bs);
+            VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+            for (size_t i = 0; i < bs.CHIP_CRYPTO_PAL_PRIVATE_X509(len) && i < sizeof(unsigned int); i++)
+            {
+                keyUsage |= static_cast<unsigned int>(bs.CHIP_CRYPTO_PAL_PRIVATE_X509(p)[i]) << (8 * i);
+            }
+
+            if (certType == AttestationCertType::kDAC)
+            {
+                // SHALL only have the digitalSignature bit set.
+                VerifyOrExit(keyUsage == MBEDTLS_X509_KU_DIGITAL_SIGNATURE, error = CHIP_ERROR_INTERNAL);
+            }
+            else
+            {
+                bool keyCertSignFlag = keyUsage & MBEDTLS_X509_KU_KEY_CERT_SIGN;
+                bool crlSignFlag     = keyUsage & MBEDTLS_X509_KU_CRL_SIGN;
+                bool otherFlags =
+                    keyUsage & ~(MBEDTLS_X509_KU_CRL_SIGN | MBEDTLS_X509_KU_KEY_CERT_SIGN | MBEDTLS_X509_KU_DIGITAL_SIGNATURE);
+                VerifyOrExit(keyCertSignFlag && crlSignFlag && !otherFlags, error = CHIP_ERROR_INTERNAL);
+            }
+        }
+        else
+        {
+            p += len;
+        }
+    }
+
+    // Verify basic and key usage extensions are present.
+    VerifyOrExit(extBasicPresent && extKeyUsagePresent, error = CHIP_ERROR_INTERNAL);
+
+    // Verify that SKID and AKID extensions are present.
+    {
+        uint8_t kidBuf[kSubjectKeyIdentifierLength];
+        MutableByteSpan kid(kidBuf);
+        SuccessOrExit(error = ExtractSKIDFromX509Cert(cert, kid));
+        if (certType == AttestationCertType::kDAC || certType == AttestationCertType::kPAI)
+        {
+            // Mandatory extension for DAC and PAI certs.
+            SuccessOrExit(error = ExtractAKIDFromX509Cert(cert, kid));
+        }
+    }
+
+exit:
+    _log_mbedTLS_error(result);
+    mbedtls_x509_crt_free(&mbed_cert);
+
+#else
+    (void) cert;
+    (void) certType;
+    CHIP_ERROR error = CHIP_ERROR_NOT_IMPLEMENTED;
+#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
+
+    return error;
+}
+
 CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t rootCertificateLen, const uint8_t * caCertificate,
                                     size_t caCertificateLen, const uint8_t * leafCertificate, size_t leafCertificateLen,
                                     CertificateChainValidationResult & result)
@@ -1507,14 +1687,11 @@ namespace {
 CHIP_ERROR ExtractKIDFromX509Cert(bool extractSKID, const ByteSpan & certificate, MutableByteSpan & kid)
 {
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
-    CHIP_ERROR error = CHIP_NO_ERROR;
+    CHIP_ERROR error = CHIP_ERROR_NOT_FOUND;
     mbedtls_x509_crt mbed_cert;
-    unsigned char * p;
-    const unsigned char * end;
-    size_t len;
-
-    constexpr uint8_t sOID_Extension_SubjectKeyIdentifier[]   = { 0x55, 0x1D, 0x0E };
-    constexpr uint8_t sOID_Extension_AuthorityKeyIdentifier[] = { 0x55, 0x1D, 0x23 };
+    unsigned char * p         = nullptr;
+    const unsigned char * end = nullptr;
+    size_t len                = 0;
 
     mbedtls_x509_crt_init(&mbed_cert);
 
@@ -1537,10 +1714,9 @@ CHIP_ERROR ExtractKIDFromX509Cert(bool extractSKID, const ByteSpan & certificate
         result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OID);
         VerifyOrExit(result == 0, error = CHIP_ERROR_WRONG_CERT_TYPE);
 
-        bool extractCurrentExtSKID = extractSKID && (sizeof(sOID_Extension_SubjectKeyIdentifier) == len) &&
-            (memcmp(p, sOID_Extension_SubjectKeyIdentifier, len) == 0);
-        bool extractCurrentExtAKID = !extractSKID && (sizeof(sOID_Extension_AuthorityKeyIdentifier) == len) &&
-            (memcmp(p, sOID_Extension_AuthorityKeyIdentifier, len) == 0);
+        mbedtls_x509_buf extOID    = { MBEDTLS_ASN1_OID, len, p };
+        bool extractCurrentExtSKID = extractSKID && OID_CMP(sOID_Extension_SubjectKeyIdentifier, extOID);
+        bool extractCurrentExtAKID = !extractSKID && OID_CMP(sOID_Extension_AuthorityKeyIdentifier, extOID);
         p += len;
 
         int is_critical = 0;
@@ -1573,6 +1749,7 @@ CHIP_ERROR ExtractKIDFromX509Cert(bool extractSKID, const ByteSpan & certificate
             {
                 kid.reduce_size(len);
             }
+            ExitNow(error = CHIP_NO_ERROR);
             break;
         }
         p += len;
@@ -1606,10 +1783,6 @@ CHIP_ERROR ExtractAKIDFromX509Cert(const ByteSpan & certificate, MutableByteSpan
 CHIP_ERROR ExtractVIDPIDFromX509Cert(const ByteSpan & certificate, AttestationCertVidPid & vidpid)
 {
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
-    constexpr uint8_t sOID_AttributeType_CommonName[]      = { 0x55, 0x04, 0x03 };
-    constexpr uint8_t sOID_AttributeType_MatterVendorId[]  = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x01 };
-    constexpr uint8_t sOID_AttributeType_MatterProductId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x02 };
-
     CHIP_ERROR error = CHIP_NO_ERROR;
     mbedtls_x509_crt mbed_cert;
     mbedtls_asn1_named_data * dnIterator = nullptr;
@@ -1623,32 +1796,24 @@ CHIP_ERROR ExtractVIDPIDFromX509Cert(const ByteSpan & certificate, AttestationCe
     for (dnIterator = &mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(subject); dnIterator != nullptr;
          dnIterator = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(next))
     {
-        size_t oid_len  = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
-        uint8_t * oid_p = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
-        size_t val_len  = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
-        uint8_t * val_p = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
-
-        if (oid_p != nullptr && val_p != nullptr)
+        DNAttrType attrType = DNAttrType::kUnspecified;
+        if (OID_CMP(sOID_AttributeType_CommonName, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
         {
-            DNAttrType attrType = DNAttrType::kUnspecified;
-            if ((oid_len == sizeof(sOID_AttributeType_CommonName)) && (memcmp(sOID_AttributeType_CommonName, oid_p, oid_len) == 0))
-            {
-                attrType = DNAttrType::kCommonName;
-            }
-            else if ((oid_len == sizeof(sOID_AttributeType_MatterVendorId)) &&
-                     (memcmp(sOID_AttributeType_MatterVendorId, oid_p, oid_len) == 0))
-            {
-                attrType = DNAttrType::kMatterVID;
-            }
-            else if ((oid_len == sizeof(sOID_AttributeType_MatterProductId)) &&
-                     (memcmp(sOID_AttributeType_MatterProductId, oid_p, oid_len) == 0))
-            {
-                attrType = DNAttrType::kMatterPID;
-            }
-
-            error = ExtractVIDPIDFromAttributeString(attrType, ByteSpan(val_p, val_len), vidpid, vidpidFromCN);
-            SuccessOrExit(error);
+            attrType = DNAttrType::kCommonName;
         }
+        else if (OID_CMP(sOID_AttributeType_MatterVendorId, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
+        {
+            attrType = DNAttrType::kMatterVID;
+        }
+        else if (OID_CMP(sOID_AttributeType_MatterProductId, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
+        {
+            attrType = DNAttrType::kMatterPID;
+        }
+
+        size_t val_len  = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
+        uint8_t * val_p = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
+        error           = ExtractVIDPIDFromAttributeString(attrType, ByteSpan(val_p, val_len), vidpid, vidpidFromCN);
+        SuccessOrExit(error);
     }
 
     // If Matter Attributes were not found use values extracted from the CN Attribute,
diff --git a/src/crypto/tests/CHIPCryptoPALTest.cpp b/src/crypto/tests/CHIPCryptoPALTest.cpp
index 3e70bec8bbfebb..75add0d8cd14cf 100644
--- a/src/crypto/tests/CHIPCryptoPALTest.cpp
+++ b/src/crypto/tests/CHIPCryptoPALTest.cpp
@@ -1904,6 +1904,40 @@ static void TestPubkey_x509Extraction(nlTestSuite * inSuite, void * inContext)
     }
 }
 
+static void TestX509_VerifyAttestationCertificateFormat(nlTestSuite * inSuite, void * inContext)
+{
+    using namespace TestCerts;
+
+    HeapChecker heapChecker(inSuite);
+
+    struct ValidationTestCase
+    {
+        ByteSpan cert;
+        AttestationCertType type;
+        CHIP_ERROR expectedError;
+    };
+
+    // clang-format off
+    static ValidationTestCase sValidationTestCases[] = {
+        // cert                                           type                               Expected Error
+        // ===============================================================================================================
+        {  sTestCert_PAA_FFF1_Cert,                       Crypto::AttestationCertType::kPAA, CHIP_NO_ERROR               },
+        {  sTestCert_PAI_FFF1_8000_Cert,                  Crypto::AttestationCertType::kPAI, CHIP_NO_ERROR               },
+        {  sTestCert_DAC_FFF2_8002_0017_Cert,             Crypto::AttestationCertType::kDAC, CHIP_NO_ERROR               },
+        {  ByteSpan(),                                    Crypto::AttestationCertType::kDAC, CHIP_ERROR_INVALID_ARGUMENT },
+        {  sTestCert_PAI_FFF2_NoPID_FB_Cert,              Crypto::AttestationCertType::kDAC, CHIP_ERROR_INTERNAL         },
+        {  sTestCert_DAC_FFF2_8006_0025_ValInFuture_Cert, Crypto::AttestationCertType::kPAA, CHIP_ERROR_INTERNAL         },
+    };
+    // clang-format on
+
+    for (auto & testCase : sValidationTestCases)
+    {
+        ByteSpan cert  = testCase.cert;
+        CHIP_ERROR err = VerifyAttestationCertificateFormat(cert, testCase.type);
+        NL_TEST_ASSERT(inSuite, err == testCase.expectedError);
+    }
+}
+
 static void TestX509_CertChainValidation(nlTestSuite * inSuite, void * inContext)
 {
     using namespace TestCerts;
@@ -2416,6 +2450,7 @@ static const nlTest sTests[] = {
     NL_TEST_DEF("Test Spake2+ object reuse", TestSPAKE2P_Reuse),
     NL_TEST_DEF("Test compressed fabric identifier", TestCompressedFabricIdentifier),
     NL_TEST_DEF("Test Pubkey Extraction from x509 Certificate", TestPubkey_x509Extraction),
+    NL_TEST_DEF("Test x509 Attestation Certificate Format Validation", TestX509_VerifyAttestationCertificateFormat),
     NL_TEST_DEF("Test x509 Certificate Chain Validation", TestX509_CertChainValidation),
     NL_TEST_DEF("Test x509 Certificate Timestamp Validation", TestX509_IssuingTimestampValidation),
     NL_TEST_DEF("Test Subject Key Id Extraction from x509 Certificate", TestSKID_x509Extraction),
diff --git a/src/platform/EFR32/CHIPCryptoPALPsaEfr32.cpp b/src/platform/EFR32/CHIPCryptoPALPsaEfr32.cpp
index 329721dd6f5c80..478ee5ba603d33 100644
--- a/src/platform/EFR32/CHIPCryptoPALPsaEfr32.cpp
+++ b/src/platform/EFR32/CHIPCryptoPALPsaEfr32.cpp
@@ -1299,6 +1299,185 @@ CHIP_ERROR Spake2p_P256_SHA256_HKDF_HMAC::PointIsValid(void * R)
     return CHIP_NO_ERROR;
 }
 
+constexpr uint8_t sOID_AttributeType_CommonName[]         = { 0x55, 0x04, 0x03 };
+constexpr uint8_t sOID_AttributeType_MatterVendorId[]     = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x01 };
+constexpr uint8_t sOID_AttributeType_MatterProductId[]    = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x02 };
+constexpr uint8_t sOID_SigAlgo_ECDSAWithSHA256[]          = { 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02 };
+constexpr uint8_t sOID_Extension_BasicConstraints[]       = { 0x55, 0x1D, 0x13 };
+constexpr uint8_t sOID_Extension_KeyUsage[]               = { 0x55, 0x1D, 0x0F };
+constexpr uint8_t sOID_Extension_SubjectKeyIdentifier[]   = { 0x55, 0x1D, 0x0E };
+constexpr uint8_t sOID_Extension_AuthorityKeyIdentifier[] = { 0x55, 0x1D, 0x23 };
+
+/**
+ * Compares an mbedtls_asn1_buf structure (oidBuf) to a reference OID represented as uint8_t array (oid).
+ */
+#define OID_CMP(oid, oidBuf)                                                                                                       \
+    ((MBEDTLS_ASN1_OID == (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(tag)) &&                                                           \
+     (sizeof(oid) == (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(len)) &&                                                                \
+     (memcmp((oid), (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(p), (oidBuf).CHIP_CRYPTO_PAL_PRIVATE_X509(len)) == 0))
+
+CHIP_ERROR VerifyAttestationCertificateFormat(const ByteSpan & cert, AttestationCertType certType)
+{
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
+    CHIP_ERROR error = CHIP_NO_ERROR;
+    int result       = 0;
+    mbedtls_x509_crt mbed_cert;
+    unsigned char * p         = nullptr;
+    const unsigned char * end = nullptr;
+    size_t len                = 0;
+    bool extBasicPresent      = false;
+    bool extKeyUsagePresent   = false;
+
+    VerifyOrReturnError(!cert.empty(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    mbedtls_x509_crt_init(&mbed_cert);
+
+    result = mbedtls_x509_crt_parse(&mbed_cert, Uint8::to_const_uchar(cert.data()), cert.size());
+    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+    // "version" value is 1 higher than the actual encoded value.
+    VerifyOrExit(mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(version) - 1 == 2, error = CHIP_ERROR_INTERNAL);
+
+    // Verify signature algorithms is ECDSA with SHA256.
+    VerifyOrExit(OID_CMP(sOID_SigAlgo_ECDSAWithSHA256, mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(sig_oid)),
+                 error = CHIP_ERROR_INTERNAL);
+
+    // Verify public key presence and format.
+    {
+        Crypto::P256PublicKey pubkey;
+        SuccessOrExit(error = ExtractPubkeyFromX509Cert(cert, pubkey));
+    }
+
+    p      = mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(v3_ext).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
+    end    = p + mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(v3_ext).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
+    result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+    while (p < end)
+    {
+        mbedtls_x509_buf extOID = { 0, 0, nullptr };
+        int extCritical         = 0;
+
+        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+        /* Get extension ID */
+        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OID);
+        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(tag) = MBEDTLS_ASN1_OID;
+        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(len) = len;
+        extOID.CHIP_CRYPTO_PAL_PRIVATE_X509(p)   = p;
+        p += len;
+
+        /* Get optional critical */
+        result = mbedtls_asn1_get_bool(&p, end, &extCritical);
+        VerifyOrExit(result == 0 || result == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG, error = CHIP_ERROR_INTERNAL);
+
+        /* Data should be octet string type */
+        result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OCTET_STRING);
+        VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+        if (OID_CMP(sOID_Extension_BasicConstraints, extOID))
+        {
+            int isCA                 = 0;
+            int pathLen              = -1;
+            unsigned char * seqStart = p;
+
+            VerifyOrExit(extCritical, error = CHIP_ERROR_INTERNAL);
+            extBasicPresent = true;
+
+            result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
+            VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+            if (len > 0)
+            {
+                result = mbedtls_asn1_get_bool(&p, end, &isCA);
+                VerifyOrExit(result == 0 || result == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG, error = CHIP_ERROR_INTERNAL);
+
+                if (p != seqStart + len)
+                {
+                    result = mbedtls_asn1_get_int(&p, end, &pathLen);
+                    VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+                }
+            }
+
+            if (certType == AttestationCertType::kDAC)
+            {
+                VerifyOrExit(!isCA && pathLen == -1, error = CHIP_ERROR_INTERNAL);
+            }
+            else if (certType == AttestationCertType::kPAI)
+            {
+                VerifyOrExit(isCA && pathLen == 0, error = CHIP_ERROR_INTERNAL);
+            }
+            else
+            {
+                VerifyOrExit(isCA && (pathLen == -1 || pathLen == 0 || pathLen == 1), error = CHIP_ERROR_INTERNAL);
+            }
+        }
+        else if (OID_CMP(sOID_Extension_KeyUsage, extOID))
+        {
+            mbedtls_x509_bitstring bs = { 0, 0, nullptr };
+            unsigned int keyUsage     = 0;
+
+            VerifyOrExit(extCritical, error = CHIP_ERROR_INTERNAL);
+            extKeyUsagePresent = true;
+
+            result = mbedtls_asn1_get_bitstring(&p, p + len, &bs);
+            VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
+
+            for (size_t i = 0; i < bs.CHIP_CRYPTO_PAL_PRIVATE_X509(len) && i < sizeof(unsigned int); i++)
+            {
+                keyUsage |= static_cast<unsigned int>(bs.CHIP_CRYPTO_PAL_PRIVATE_X509(p)[i]) << (8 * i);
+            }
+
+            if (certType == AttestationCertType::kDAC)
+            {
+                // SHALL only have the digitalSignature bit set.
+                VerifyOrExit(keyUsage == MBEDTLS_X509_KU_DIGITAL_SIGNATURE, error = CHIP_ERROR_INTERNAL);
+            }
+            else
+            {
+                bool keyCertSignFlag = keyUsage & MBEDTLS_X509_KU_KEY_CERT_SIGN;
+                bool crlSignFlag     = keyUsage & MBEDTLS_X509_KU_CRL_SIGN;
+                bool otherFlags =
+                    keyUsage & ~(MBEDTLS_X509_KU_CRL_SIGN | MBEDTLS_X509_KU_KEY_CERT_SIGN | MBEDTLS_X509_KU_DIGITAL_SIGNATURE);
+                VerifyOrExit(keyCertSignFlag && crlSignFlag && !otherFlags, error = CHIP_ERROR_INTERNAL);
+            }
+        }
+        else
+        {
+            p += len;
+        }
+    }
+
+    // Verify basic and key usage extensions are present.
+    VerifyOrExit(extBasicPresent && extKeyUsagePresent, error = CHIP_ERROR_INTERNAL);
+
+    // Verify that SKID and AKID extensions are present.
+    {
+        uint8_t kidBuf[kSubjectKeyIdentifierLength];
+        MutableByteSpan kid(kidBuf);
+        SuccessOrExit(error = ExtractSKIDFromX509Cert(cert, kid));
+        if (certType == AttestationCertType::kDAC || certType == AttestationCertType::kPAI)
+        {
+            // Mandatory extension for DAC and PAI certs.
+            SuccessOrExit(error = ExtractAKIDFromX509Cert(cert, kid));
+        }
+    }
+
+exit:
+    _log_mbedTLS_error(result);
+    mbedtls_x509_crt_free(&mbed_cert);
+
+#else
+    (void) cert;
+    (void) certType;
+    CHIP_ERROR error = CHIP_ERROR_NOT_IMPLEMENTED;
+#endif // defined(MBEDTLS_X509_CRT_PARSE_C)
+
+    return error;
+}
+
 CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t rootCertificateLen, const uint8_t * caCertificate,
                                     size_t caCertificateLen, const uint8_t * leafCertificate, size_t leafCertificateLen,
                                     CertificateChainValidationResult & result)
@@ -1543,14 +1722,11 @@ namespace {
 CHIP_ERROR ExtractKIDFromX509Cert(bool extractSKID, const ByteSpan & certificate, MutableByteSpan & kid)
 {
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
-    CHIP_ERROR error = CHIP_NO_ERROR;
+    CHIP_ERROR error = CHIP_ERROR_NOT_FOUND;
     mbedtls_x509_crt mbed_cert;
-    unsigned char * p;
-    const unsigned char * end;
-    size_t len;
-
-    constexpr uint8_t sOID_Extension_SubjectKeyIdentifier[]   = { 0x55, 0x1D, 0x0E };
-    constexpr uint8_t sOID_Extension_AuthorityKeyIdentifier[] = { 0x55, 0x1D, 0x23 };
+    unsigned char * p         = nullptr;
+    const unsigned char * end = nullptr;
+    size_t len                = 0;
 
     mbedtls_x509_crt_init(&mbed_cert);
 
@@ -1573,10 +1749,9 @@ CHIP_ERROR ExtractKIDFromX509Cert(bool extractSKID, const ByteSpan & certificate
         result = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_OID);
         VerifyOrExit(result == 0, error = CHIP_ERROR_WRONG_CERT_TYPE);
 
-        bool extractCurrentExtSKID = extractSKID && (sizeof(sOID_Extension_SubjectKeyIdentifier) == len) &&
-            (memcmp(p, sOID_Extension_SubjectKeyIdentifier, len) == 0);
-        bool extractCurrentExtAKID = !extractSKID && (sizeof(sOID_Extension_AuthorityKeyIdentifier) == len) &&
-            (memcmp(p, sOID_Extension_AuthorityKeyIdentifier, len) == 0);
+        mbedtls_x509_buf extOID    = { MBEDTLS_ASN1_OID, len, p };
+        bool extractCurrentExtSKID = extractSKID && OID_CMP(sOID_Extension_SubjectKeyIdentifier, extOID);
+        bool extractCurrentExtAKID = !extractSKID && OID_CMP(sOID_Extension_AuthorityKeyIdentifier, extOID);
         p += len;
 
         int is_critical = 0;
@@ -1642,10 +1817,6 @@ CHIP_ERROR ExtractAKIDFromX509Cert(const ByteSpan & certificate, MutableByteSpan
 CHIP_ERROR ExtractVIDPIDFromX509Cert(const ByteSpan & certificate, AttestationCertVidPid & vidpid)
 {
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
-    constexpr uint8_t sOID_AttributeType_CommonName[]      = { 0x55, 0x04, 0x03 };
-    constexpr uint8_t sOID_AttributeType_MatterVendorId[]  = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x01 };
-    constexpr uint8_t sOID_AttributeType_MatterProductId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x02, 0x02 };
-
     CHIP_ERROR error = CHIP_NO_ERROR;
     mbedtls_x509_crt mbed_cert;
     mbedtls_asn1_named_data * dnIterator = nullptr;
@@ -1659,32 +1830,24 @@ CHIP_ERROR ExtractVIDPIDFromX509Cert(const ByteSpan & certificate, AttestationCe
     for (dnIterator = &mbed_cert.CHIP_CRYPTO_PAL_PRIVATE_X509(subject); dnIterator != nullptr;
          dnIterator = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(next))
     {
-        size_t oid_len  = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
-        uint8_t * oid_p = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
-        size_t val_len  = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
-        uint8_t * val_p = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
-
-        if (oid_p != nullptr && val_p != nullptr)
+        DNAttrType attrType = DNAttrType::kUnspecified;
+        if (OID_CMP(sOID_AttributeType_CommonName, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
         {
-            DNAttrType attrType = DNAttrType::kUnspecified;
-            if ((oid_len == sizeof(sOID_AttributeType_CommonName)) && (memcmp(sOID_AttributeType_CommonName, oid_p, oid_len) == 0))
-            {
-                attrType = DNAttrType::kCommonName;
-            }
-            else if ((oid_len == sizeof(sOID_AttributeType_MatterVendorId)) &&
-                     (memcmp(sOID_AttributeType_MatterVendorId, oid_p, oid_len) == 0))
-            {
-                attrType = DNAttrType::kMatterVID;
-            }
-            else if ((oid_len == sizeof(sOID_AttributeType_MatterProductId)) &&
-                     (memcmp(sOID_AttributeType_MatterProductId, oid_p, oid_len) == 0))
-            {
-                attrType = DNAttrType::kMatterPID;
-            }
-
-            error = ExtractVIDPIDFromAttributeString(attrType, ByteSpan(val_p, val_len), vidpid, vidpidFromCN);
-            SuccessOrExit(error);
+            attrType = DNAttrType::kCommonName;
+        }
+        else if (OID_CMP(sOID_AttributeType_MatterVendorId, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
+        {
+            attrType = DNAttrType::kMatterVID;
+        }
+        else if (OID_CMP(sOID_AttributeType_MatterProductId, dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(oid)))
+        {
+            attrType = DNAttrType::kMatterPID;
         }
+
+        size_t val_len  = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(len);
+        uint8_t * val_p = dnIterator->CHIP_CRYPTO_PAL_PRIVATE_X509(val).CHIP_CRYPTO_PAL_PRIVATE_X509(p);
+        error           = ExtractVIDPIDFromAttributeString(attrType, ByteSpan(val_p, val_len), vidpid, vidpidFromCN);
+        SuccessOrExit(error);
     }
 
     // If Matter Attributes were not found use values extracted from the CN Attribute,
diff --git a/src/tools/chip-cert/CertUtils.cpp b/src/tools/chip-cert/CertUtils.cpp
index a7558fb812f3fb..d275c9bf575929 100644
--- a/src/tools/chip-cert/CertUtils.cpp
+++ b/src/tools/chip-cert/CertUtils.cpp
@@ -1272,7 +1272,6 @@ bool MakeAttCert(AttCertType attCertType, const char * subjectCN, uint16_t subje
     uint16_t vid = certConfig.IsSubjectVIDMismatch() ? static_cast<uint16_t>(subjectVID + 1) : subjectVID;
     uint16_t pid = certConfig.IsSubjectPIDMismatch() ? static_cast<uint16_t>(subjectPID + 1) : subjectPID;
     bool isCA    = (attCertType != kAttCertType_DAC);
-    int pathLen  = kPathLength_NotSpecified;
 
     VerifyOrReturnError(subjectCN != nullptr, false);
     VerifyOrReturnError(caCert != nullptr, false);
@@ -1409,11 +1408,7 @@ bool MakeAttCert(AttCertType attCertType, const char * subjectCN, uint16_t subje
     }
 
     // Add basic constraints certificate extensions.
-    if (certConfig.IsExtensionBasicPathLenPresent(attCertType) || !certConfig.IsExtensionBasicCAPresent())
-    {
-        pathLen = certConfig.GetExtensionBasicPathLenValue(attCertType);
-    }
-    res = SetBasicConstraintsExtension(newCert, isCA, pathLen, certConfig);
+    res = SetBasicConstraintsExtension(newCert, isCA, certConfig.GetExtensionBasicPathLenValue(attCertType), certConfig);
     VerifyTrueOrExit(res);
 
     // Add key usage certificate extensions.
diff --git a/src/tools/chip-cert/Cmd_GenCD.cpp b/src/tools/chip-cert/Cmd_GenCD.cpp
index 36f15f1a5a8324..a338e19ea6e835 100644
--- a/src/tools/chip-cert/Cmd_GenCD.cpp
+++ b/src/tools/chip-cert/Cmd_GenCD.cpp
@@ -281,7 +281,7 @@ class CDStructConfig
 
     bool IsErrorTestCaseEnabled() { return mEnabled; }
     bool IsFormatVersionPresent() { return (!mEnabled || !mFlags.Has(CDConfigFlags::kFormatVersionMissing)); }
-    int GetFormatVersion() { return (mEnabled && mFlags.Has(CDConfigFlags::kFormatVersionWrong)) ? 2 : 1; }
+    uint8_t GetFormatVersion() { return (mEnabled && mFlags.Has(CDConfigFlags::kFormatVersionWrong)) ? 2 : 1; }
     bool IsVIDPresent() { return (!mEnabled || !mFlags.Has(CDConfigFlags::kVIDMissing)); }
     bool IsVIDCorrect() { return (!mEnabled || !mFlags.Has(CDConfigFlags::kVIDWrong)); }
     bool IsPIDArrayPresent() { return (!mEnabled || !mFlags.Has(CDConfigFlags::kPIDArrayMissing)); }
@@ -304,7 +304,7 @@ class CDStructConfig
     bool IsDACOriginPIDCorrect() { return (!mEnabled || !mFlags.Has(CDConfigFlags::kDACOriginPID)); }
     bool IsDACOriginVIDPresent() { return (mEnabled && mFlags.Has(CDConfigFlags::kDACOriginVIDPresent)); }
     bool IsDACOriginPIDPresent() { return (mEnabled && mFlags.Has(CDConfigFlags::kDACOriginPIDPresent)); }
-    bool IsAuthPAAListPresent() { return (mEnabled || mFlags.Has(CDConfigFlags::kAuthPAAListPresent)); }
+    bool IsAuthPAAListPresent() { return (mFlags.Has(CDConfigFlags::kAuthPAAListPresent)); }
     bool IsAuthPAAListCorrect() { return (!mEnabled || !mFlags.Has(CDConfigFlags::kAuthPAAListWrong)); }
     uint8_t GetAuthPAAListCount() const { return mAuthPAAListCount; }
     bool IsSignerInfoVersionCorrect() { return (!mEnabled || !mFlags.Has(CDConfigFlags::kSignerInfoVersion)); }
diff --git a/src/tools/chip-cert/Cmd_ValidateAttCert.cpp b/src/tools/chip-cert/Cmd_ValidateAttCert.cpp
index 15d33ca7bd2a5c..2506f67d3607c4 100644
--- a/src/tools/chip-cert/Cmd_ValidateAttCert.cpp
+++ b/src/tools/chip-cert/Cmd_ValidateAttCert.cpp
@@ -205,6 +205,14 @@ bool Cmd_ValidateAttCert(int argc, char * argv[])
         return false;
     }
 
+    // Validate Proper Certificate Format
+    VerifyOrExit(VerifyAttestationCertificateFormat(paa, AttestationCertType::kPAA) == CHIP_NO_ERROR,
+                 attestationError = AttestationVerificationResult::kPaaFormatInvalid);
+    VerifyOrExit(VerifyAttestationCertificateFormat(pai, AttestationCertType::kPAI) == CHIP_NO_ERROR,
+                 attestationError = AttestationVerificationResult::kPaiFormatInvalid);
+    VerifyOrExit(VerifyAttestationCertificateFormat(dac, AttestationCertType::kDAC) == CHIP_NO_ERROR,
+                 attestationError = AttestationVerificationResult::kDacFormatInvalid);
+
     // Verify certificate is valid at the current time
     VerifyOrExit(IsCertificateValidAtCurrentTime(dac) == CHIP_NO_ERROR,
                  attestationError = AttestationVerificationResult::kDacExpired);
diff --git a/src/tools/chip-cert/chip-cert.h b/src/tools/chip-cert/chip-cert.h
index 06ccd93693880f..fe5d8e7f4d2160 100644
--- a/src/tools/chip-cert/chip-cert.h
+++ b/src/tools/chip-cert/chip-cert.h
@@ -224,35 +224,42 @@ class CertStructConfig
     bool IsExtensionBasicCritical() { return (!mEnabled || !mFlags.Has(CertErrorFlags::kExtBasicCriticalWrong)); }
     bool IsExtensionBasicCAPresent() { return (!mEnabled || !mFlags.Has(CertErrorFlags::kExtBasicCAMissing)); }
     bool IsExtensionBasicCACorrect() { return (!mEnabled || !mFlags.Has(CertErrorFlags::kExtBasicCAWrong)); }
-    bool IsExtensionBasicPathLenPresent(AttCertType & attCertType)
-    {
-        bool normallyPresent = (attCertType != kAttCertType_DAC);
-        bool testCaseWrong   = (mEnabled && mFlags.Has(CertErrorFlags::kExtBasicPathLenWrong));
-        return (normallyPresent ^ testCaseWrong);
-    }
     int GetExtensionBasicPathLenValue(AttCertType & attCertType)
     {
-        if (mFlags.Has(CertErrorFlags::kExtBasicPathLen0))
+        if (mEnabled && mFlags.Has(CertErrorFlags::kExtBasicPathLen0))
         {
             return 0;
         }
-        if (mFlags.Has(CertErrorFlags::kExtBasicPathLen1))
+        if (mEnabled && mFlags.Has(CertErrorFlags::kExtBasicPathLen1))
         {
             return 1;
         }
-        if (mFlags.Has(CertErrorFlags::kExtBasicPathLen2))
+        if (mEnabled && mFlags.Has(CertErrorFlags::kExtBasicPathLen2))
         {
             return 2;
         }
-        if (attCertType == kAttCertType_PAA)
+        if (mEnabled && mFlags.Has(CertErrorFlags::kExtBasicPathLenWrong))
         {
-            return 1;
+            if (attCertType == kAttCertType_DAC)
+            {
+                return 0;
+            }
+            else
+            {
+                return IsExtensionBasicCAPresent() ? static_cast<int>(kPathLength_NotSpecified) : 2;
+            }
+        }
+
+        // Correct Values:
+        if (attCertType == kAttCertType_DAC)
+        {
+            return IsExtensionBasicCAPresent() ? static_cast<int>(kPathLength_NotSpecified) : 0;
         }
         if (attCertType == kAttCertType_PAI)
         {
             return 0;
         }
-        return 0;
+        return 1;
     }
     bool IsExtensionBasicPathLenPresent()
     {
diff --git a/src/tools/chip-cert/gen_com_dut_test_vectors.py b/src/tools/chip-cert/gen_com_dut_test_vectors.py
index 0a5449d65173df..3fb099d81c0052 100755
--- a/src/tools/chip-cert/gen_com_dut_test_vectors.py
+++ b/src/tools/chip-cert/gen_com_dut_test_vectors.py
@@ -15,7 +15,8 @@
 VID_NOT_PRESENT = 0xFFFF
 PID_NOT_PRESENT = 0x0000
 
-VALID_IN_PAST = "2021-06-28 14:23:43"
+VALID_IN_PAST = "2020-06-28 14:23:43"
+VALID_NOW = "2022-09-28 14:23:43"
 VALID_IN_FUTURE = "2031-06-28 14:23:43"
 
 
@@ -164,19 +165,19 @@ class CertType(Enum):
         "is_success_case": 'false',
     },
     {
-        "description": "Certificate Key Usage extension diginalSignature field is wrong (not present for DAC and present for PAI",
+        "description": "Certificate Key Usage extension diginalSignature field is wrong (not present for DAC and present for PAI, which is OK as optional)",
         "test_folder": 'ext_key_usage_dig_sig_wrong',
         "error_flag": 'ext-key-usage-dig-sig',
         "is_success_case": 'false',
     },
     {
-        "description": "Certificate Key Usage extension keyCertSign field is wrong (present for DAC and not present for PAI",
+        "description": "Certificate Key Usage extension keyCertSign field is wrong (present for DAC and not present for PAI)",
         "test_folder": 'ext_key_usage_key_cert_sign_wrong',
         "error_flag": 'ext-key-usage-key-cert-sign',
         "is_success_case": 'false',
     },
     {
-        "description": "Certificate Key Usage extension cRLSign field is wrong (present for DAC and not present for PAI",
+        "description": "Certificate Key Usage extension cRLSign field is wrong (present for DAC and not present for PAI)",
         "test_folder": 'ext_key_usage_crl_sign_wrong',
         "error_flag": 'ext-key-usage-crl-sign',
         "is_success_case": 'false',
@@ -261,13 +262,13 @@ class CertType(Enum):
         "description": 'Fallback VID and PID encoding example from spec: invalid, since substring following Mpid: is not exactly 4 uppercase hexadecimal digits',
         "common_name": 'ACME Matter Devel DAC 5CDA9899 Mvid:FFF1 Mpid:B1',
         "test_folder": 'vidpid_fallback_encoding_08',
-        "is_success_case": 'true',
+        "is_success_case": 'false',
     },
     {
         "description": 'Fallback VID and PID encoding example from spec: invalid, since substring following Mpid: is not exactly 4 uppercase hexadecimal digits',
         "common_name": 'ACME Matter Devel DAC 5CDA9899 Mpid: Mvid:FFF1',
         "test_folder": 'vidpid_fallback_encoding_09',
-        "is_success_case": 'true',
+        "is_success_case": 'false',
     },
     # More valid/invalid fallback encoding examples:
     {
@@ -463,7 +464,7 @@ class CertType(Enum):
         "description": 'The version_number field is missing.',
         "test_folder": 'version_number_missing',
         "error_flag": 'version-number-missing',
-        "is_success_case": 'true',
+        "is_success_case": 'false',
     },
     {
         "description": 'The version_number field matches the VID and PID used in a DeviceSoftwareVersionModel entry in the DCL matching the certification record associated with the product presenting this CD.',
@@ -496,13 +497,13 @@ class CertType(Enum):
         "is_success_case": 'true',
     },
     {
-        "description": 'The dac_origin_vendor_id fild is present and dac_origin_product_id fields is not present.',
+        "description": 'The dac_origin_vendor_id field is present and dac_origin_product_id fields is not present.',
         "test_folder": 'dac_origin_vid_present_pid_missing',
         "error_flag": 'dac-origin-vid-present',
         "is_success_case": 'false',
     },
     {
-        "description": 'The dac_origin_vendor_id fild is not present and dac_origin_product_id is present.',
+        "description": 'The dac_origin_vendor_id field is not present and dac_origin_product_id is present.',
         "test_folder": 'dac_origin_vid_missing_pid_present',
         "error_flag": 'dac-origin-pid-present',
         "is_success_case": 'false',
@@ -694,9 +695,9 @@ def make_certs_and_keys(self) -> None:
         vid_flag = ' -V 0x{:X}'.format(self.vid)
         pid_flag = ' -P 0x{:X}'.format(self.pid)
         if (len(self.valid_from) == 0):
-            valid_from_flag = ''
+            validity_flags = ' -l 4294967295 '
         else:
-            valid_from_flag = ' -f "' + self.valid_from + '"'
+            validity_flags = ' -f "' + self.valid_from + '" -l 730 '
 
         if self.cert_type == CertType.PAI:
             if (len(subject_name) == 0):
@@ -710,7 +711,7 @@ def make_certs_and_keys(self) -> None:
             return
 
         cmd = self.chipcert + ' gen-att-cert ' + type_flag + error_type_flag + ' -c "' + subject_name + '" -C ' + self.signer.cert_pem + ' -K ' + \
-            self.signer.key_pem + vid_flag + pid_flag + valid_from_flag + ' -l 4294967295 -o ' + self.own.cert_pem + ' -O ' + self.own.key_pem
+            self.signer.key_pem + vid_flag + pid_flag + validity_flags + ' -o ' + self.own.cert_pem + ' -O ' + self.own.key_pem
         subprocess.run(cmd, shell=True)
         cmd = 'openssl x509 -inform pem -in ' + self.own.cert_pem + \
             ' -out ' + self.own.cert_der + ' -outform DER'
@@ -760,7 +761,11 @@ def generate_test_case_vector_json(test_case_out_dir: str, test_cert: str, test_
     if "description" in test_case:
         json_dict["description"] = test_cert.upper() + " Test Vector: " + test_case["description"]
     if "is_success_case" in test_case:
-        json_dict["is_success_case"] = test_case["is_success_case"]
+        # These test cases are expected to fail when error injected in DAC but expected to pass when error injected in PAI
+        if (test_cert == 'pai') and (test_case["test_folder"] in ['ext_basic_pathlen0', 'vidpid_fallback_encoding_08', 'vidpid_fallback_encoding_09', 'ext_key_usage_dig_sig_wrong']):
+            json_dict["is_success_case"] = "true"
+        else:
+            json_dict["is_success_case"] = test_case["is_success_case"]
 
     # Out of all files we could add, find the ones that were present in test case, and embed them in hex
     files_available = {os.path.basename(path) for path in files_in_path}
@@ -809,25 +814,32 @@ def main():
             test_case_out_dir = args.outdir + '/struct_' + test_cert + '_' + test_case["test_folder"]
 
             if test_case["test_folder"] == 'valid_in_past':
-                valid_from = VALID_IN_PAST
+                if test_cert == 'dac':
+                    dac_valid_from = VALID_IN_PAST
+                    pai_valid_from = VALID_NOW
+                else:
+                    dac_valid_from = VALID_NOW
+                    pai_valid_from = VALID_IN_PAST
             elif test_case["test_folder"] == 'valid_in_future':
-                valid_from = VALID_IN_FUTURE
+                if test_cert == 'dac':
+                    dac_valid_from = VALID_IN_FUTURE
+                    pai_valid_from = VALID_NOW
+                else:
+                    dac_valid_from = VALID_NOW
+                    pai_valid_from = VALID_IN_FUTURE
             else:
-                valid_from = ''
+                dac_valid_from = ''
+                pai_valid_from = ''
 
             if test_cert == 'dac':
                 error_type_dac = test_case["error_flag"]
                 error_type_pai = 'no-error'
-                dac_valid_from = valid_from
-                pai_valid_from = ''
             else:
                 if test_case["error_flag"] == 'ext-skid-missing':
                     error_type_dac = 'ext-akid-missing'
                 else:
                     error_type_dac = 'no-error'
                 error_type_pai = test_case["error_flag"]
-                dac_valid_from = ''
-                pai_valid_from = valid_from
 
             vid = 0xFFF1
             pid = 0x8000
@@ -945,7 +957,13 @@ def main():
         generate_test_case_vector_json(test_case_out_dir, 'cd', test_case)
 
     # Test case: Generate {DAC, PAI, PAA} chain with random (invalid) PAA
-    test_case_out_dir = args.outdir + '/invalid_paa'
+    test_case = {
+        "description": 'Use Invalid PAA (Not Registered in the DCL).',
+        "test_folder": 'invalid_paa',
+        "error_flag": 'no-error',
+        "is_success_case": 'false',
+    }
+    test_case_out_dir = args.outdir + '/' + test_case["test_folder"]
     paapath = test_case_out_dir + '/paa-'
 
     if not os.path.exists(test_case_out_dir):
@@ -960,12 +978,12 @@ def main():
     pid = 0x8000
 
     # Generate PAI Cert/Key
-    builder = DevCertBuilder(CertType.PAI, 'no-error', paapath, test_case_out_dir,
+    builder = DevCertBuilder(CertType.PAI, test_case["error_flag"], paapath, test_case_out_dir,
                              chipcert, vid, PID_NOT_PRESENT, '', VALID_IN_PAST)
     builder.make_certs_and_keys()
 
     # Generate DAC Cert/Key
-    builder = DevCertBuilder(CertType.DAC, 'no-error', paapath, test_case_out_dir,
+    builder = DevCertBuilder(CertType.DAC, test_case["error_flag"], paapath, test_case_out_dir,
                              chipcert, vid, pid, '', VALID_IN_PAST)
     builder.make_certs_and_keys()
 
@@ -977,7 +995,7 @@ def main():
     subprocess.run(cmd, shell=True)
 
     # Generate Test Case Data Container in JSON Format
-    generate_test_case_vector_json(test_case_out_dir, test_cert, test_case)
+    generate_test_case_vector_json(test_case_out_dir, 'paa', test_case)
 
 
 if __name__ == '__main__':