From dcbf706682b85ce5e8d247f91dee8acdf11cc1a0 Mon Sep 17 00:00:00 2001 From: Nick Quarton <139178705+nquarton@users.noreply.github.com> Date: Thu, 14 Nov 2024 14:13:02 -0800 Subject: [PATCH] Reverting subject name in all certs to Caliptra 1.0 from Caliptra 1.x --- FROZEN_IMAGES.sha384sum | 4 ++-- libcaliptra/examples/generic/idev_csr_array.h | 20 +++++++++--------- runtime/src/dpe_platform.rs | 2 +- .../fmc_alias_cert_redacted.der | Bin 874 -> 874 bytes .../fmc_alias_cert_redacted.txt | 4 ++-- .../smoke_testdata/idevid_csr.der | Bin 444 -> 443 bytes .../smoke_testdata/idevid_csr.txt | 14 ++++++------ .../smoke_testdata/ldevid_cert.der | Bin 674 -> 675 bytes .../smoke_testdata/ldevid_cert.txt | 16 +++++++------- .../smoke_testdata/rt_alias_cert_redacted.der | Bin 770 -> 770 bytes .../smoke_testdata/rt_alias_cert_redacted.txt | 4 ++-- x509/build/build.rs | 8 +++---- x509/build/fmc_alias_cert_tbs.rs | 4 ++-- x509/build/init_dev_id_csr_tbs.rs | 2 +- x509/build/local_dev_id_cert_tbs.rs | 4 ++-- x509/build/rt_alias_cert_tbs.rs | 4 ++-- 16 files changed, 43 insertions(+), 43 deletions(-) diff --git a/FROZEN_IMAGES.sha384sum b/FROZEN_IMAGES.sha384sum index 8bda8fe0b6..8138d5d756 100644 --- a/FROZEN_IMAGES.sha384sum +++ b/FROZEN_IMAGES.sha384sum @@ -1,3 +1,3 @@ # WARNING: Do not update this file without the approval of the Caliptra TAC -9fe3c2a8031c31e7a9ce56e5b8b430414d74db9d04161512b90fb60d5df120cc3998c8881eea10b7c4e1c1bea4326b27 caliptra-rom-no-log.bin -f1a8736ab386897c62a173032910ed03566043b01305ceaab7d25614b86e86ef97dd90bf9cdf7aaa7eb470f9e155133b caliptra-rom-with-log.bin +129ee84ecdc1f80a9aab51883589b4eb80191bc726277fb31fab2bb2e99f54b3ad7dc80459914c9cd9749e5994614ccd caliptra-rom-no-log.bin +162eb324937462a1534406d43b9ba74b229d9347541f148eebc435f901e839e4c95af308f91b873f0bc67124cf35ecc1 caliptra-rom-with-log.bin diff --git a/libcaliptra/examples/generic/idev_csr_array.h b/libcaliptra/examples/generic/idev_csr_array.h index 1aa34bc31e..db9861b13b 100644 --- a/libcaliptra/examples/generic/idev_csr_array.h +++ b/libcaliptra/examples/generic/idev_csr_array.h @@ -2,11 +2,11 @@ // Generated from test/tests/caliptra_integration_tests/smoke_testdata/idev_csr.der #include -#define IDEV_CSR_LEN 444 +#define IDEV_CSR_LEN 443 uint8_t idev_csr_bytes[IDEV_CSR_LEN] = { - 0x30, 0x82, 0x01, 0xb8, 0x30, 0x82, 0x01, 0x3e, 0x02, 0x01, 0x00, 0x30, 0x69, 0x31, 0x1c, 0x30, + 0x30, 0x82, 0x01, 0xb7, 0x30, 0x82, 0x01, 0x3e, 0x02, 0x01, 0x00, 0x30, 0x69, 0x31, 0x1c, 0x30, 0x1a, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x13, 0x43, 0x61, 0x6c, 0x69, 0x70, 0x74, 0x72, 0x61, - 0x20, 0x31, 0x2e, 0x78, 0x20, 0x49, 0x44, 0x65, 0x76, 0x49, 0x44, 0x31, 0x49, 0x30, 0x47, 0x06, + 0x20, 0x31, 0x2e, 0x30, 0x20, 0x49, 0x44, 0x65, 0x76, 0x49, 0x44, 0x31, 0x49, 0x30, 0x47, 0x06, 0x03, 0x55, 0x04, 0x05, 0x13, 0x40, 0x38, 0x45, 0x33, 0x43, 0x31, 0x41, 0x30, 0x35, 0x38, 0x46, 0x37, 0x30, 0x34, 0x41, 0x31, 0x31, 0x38, 0x32, 0x31, 0x46, 0x37, 0x42, 0x34, 0x38, 0x44, 0x33, 0x34, 0x30, 0x41, 0x45, 0x46, 0x39, 0x39, 0x44, 0x44, 0x41, 0x42, 0x41, 0x44, 0x43, 0x31, 0x30, @@ -25,11 +25,11 @@ uint8_t idev_csr_bytes[IDEV_CSR_LEN] = { 0x04, 0x03, 0x02, 0x02, 0x04, 0x30, 0x1f, 0x06, 0x06, 0x67, 0x81, 0x05, 0x05, 0x04, 0x04, 0x04, 0x15, 0x30, 0x13, 0x04, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, - 0x03, 0x03, 0x03, 0x68, 0x00, 0x30, 0x65, 0x02, 0x31, 0x00, 0xed, 0x8e, 0x44, 0x4e, 0x3c, 0x7f, - 0x6f, 0x96, 0x4a, 0x5d, 0xcb, 0xe1, 0xea, 0x08, 0xa0, 0x57, 0xf5, 0xd7, 0xb5, 0x6d, 0xce, 0x72, - 0x9e, 0xb8, 0x8c, 0x88, 0x38, 0xf6, 0x50, 0x35, 0x90, 0xbd, 0x6b, 0x59, 0xdb, 0x29, 0x52, 0x13, - 0x2e, 0xfc, 0xa8, 0xb6, 0x8d, 0x8a, 0x33, 0xd3, 0x2a, 0xcf, 0x02, 0x30, 0x6d, 0x40, 0x6a, 0x1f, - 0x7c, 0x9e, 0x74, 0x8f, 0x28, 0xdc, 0x14, 0x73, 0xe0, 0x96, 0x92, 0xd8, 0x74, 0xfa, 0x30, 0x58, - 0x04, 0x54, 0x84, 0x77, 0xe9, 0x52, 0x3a, 0x0d, 0x63, 0xfa, 0xf3, 0x1a, 0x68, 0xc3, 0x88, 0x07, - 0x50, 0xa7, 0x5d, 0x6f, 0xf7, 0xa9, 0xda, 0x98, 0xf7, 0x8c, 0x48, 0x2a, + 0x03, 0x03, 0x03, 0x67, 0x00, 0x30, 0x64, 0x02, 0x30, 0x7c, 0x74, 0xfd, 0x28, 0xce, 0x0f, 0xf9, + 0xe9, 0xda, 0xef, 0x90, 0x84, 0xa5, 0xaf, 0xc0, 0x42, 0xd1, 0xe2, 0x08, 0x84, 0x67, 0xd6, 0x6a, + 0xe8, 0xdc, 0x46, 0xcc, 0x02, 0x1d, 0x80, 0xda, 0x37, 0x50, 0x91, 0xee, 0x75, 0x09, 0xed, 0x15, + 0x55, 0x0f, 0x31, 0x15, 0x23, 0xc9, 0xbb, 0xe6, 0xe1, 0x02, 0x30, 0x24, 0xfd, 0x1b, 0x5b, 0x47, + 0xcc, 0x14, 0x4a, 0x66, 0xa5, 0xbb, 0xe7, 0x04, 0x74, 0xf0, 0x21, 0x36, 0x37, 0xf4, 0x9e, 0x5d, + 0xcd, 0xa1, 0x42, 0xbf, 0xf6, 0x82, 0x5c, 0xa1, 0xf4, 0x51, 0x43, 0xe2, 0x97, 0xfc, 0x95, 0xce, + 0x56, 0xb1, 0x67, 0xe1, 0xbf, 0xe1, 0x26, 0x3a, 0xce, 0xa1, 0xf3, }; diff --git a/runtime/src/dpe_platform.rs b/runtime/src/dpe_platform.rs index daeee3ad2d..ab53d6122f 100644 --- a/runtime/src/dpe_platform.rs +++ b/runtime/src/dpe_platform.rs @@ -108,7 +108,7 @@ impl Platform for DpePlatform<'_> { &mut self, out: &mut [u8; MAX_ISSUER_NAME_SIZE], ) -> Result { - const CALIPTRA_CN: &[u8] = b"Caliptra 1.x Rt Alias"; + const CALIPTRA_CN: &[u8] = b"Caliptra 1.0 Rt Alias"; let mut issuer_writer = CertWriter::new(out, true); // Caliptra RDN SerialNumber field is always a Sha256 hash diff --git a/test/tests/caliptra_integration_tests/smoke_testdata/fmc_alias_cert_redacted.der b/test/tests/caliptra_integration_tests/smoke_testdata/fmc_alias_cert_redacted.der index 60649c75c60df8f4eff409ccc343618d05c1ff34..42eec06ea6733956bd1ca03be62f6337154e9ee8 100644 GIT binary patch delta 17 ZcmaFG_KIzSJEOrwk3L3&jn^kL0RTNV2A%)_ delta 17 ZcmaFG_KIzSJ7dK}k3PnVjn^kL0RTa62QB~r diff --git a/test/tests/caliptra_integration_tests/smoke_testdata/fmc_alias_cert_redacted.txt b/test/tests/caliptra_integration_tests/smoke_testdata/fmc_alias_cert_redacted.txt index a63df7f6df..4aede310cc 100644 --- a/test/tests/caliptra_integration_tests/smoke_testdata/fmc_alias_cert_redacted.txt +++ b/test/tests/caliptra_integration_tests/smoke_testdata/fmc_alias_cert_redacted.txt @@ -4,11 +4,11 @@ Certificate: Serial Number: 44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44 Signature Algorithm: ecdsa-with-SHA384 - Issuer: CN=Caliptra 1.x LDevID/serialNumber=21EEEF9A4C61D4B9E3D94BEA46F9A12AC6887CE2188559F40FF95777E8014889 + Issuer: CN=Caliptra 1.0 LDevID/serialNumber=21EEEF9A4C61D4B9E3D94BEA46F9A12AC6887CE2188559F40FF95777E8014889 Validity Not Before: Jan 1 00:00:00 2023 GMT Not After : Dec 31 23:59:59 9999 GMT - Subject: CN=Caliptra 1.x FMC Alias/serialNumber=DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD + Subject: CN=Caliptra 1.0 FMC Alias/serialNumber=DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD Subject Public Key Info: Public Key Algorithm: id-ecPublicKey Public-Key: (384 bit) diff --git a/test/tests/caliptra_integration_tests/smoke_testdata/idevid_csr.der b/test/tests/caliptra_integration_tests/smoke_testdata/idevid_csr.der index f5af843189b59f1401af3b3e48d4b9526aa93e50..78cb24f88e066bc4af0f95287699541bed13cd44 100644 GIT binary patch delta 150 zcmV;H0BQfc1G@txFoFTMFoFR-0s#OpX)zoy8U_PZ1Op5cLt$)baCCBEATcg5u_P}6 zXlDR0WCAdJbp0sK5BcfZ?~sJ0ufRgl;s}Ii)@tb7M$7^ofZ8`uk?wT~?G;rIF%=`p zyXN5nFeLpOTSv?kN@k_I=LB@{AvQPko?XqMLcjKcT%q()L*keGmCjbNXW_r$COXcc E^8rmj$N&HU delta 151 zcmV;I0BHZa1H1zyFoFTNFoFR-0s#OpX)zoy8U_PZ1Op5cLt$)baCCBEATcg@u_P}6 zX=ng2Wdbn(?T$oFJb!PNN?pt0>Ik4$_1Cp+&T^i(jEFe)P&JUfYgyYVQWGxxsJ4xY zGt(;10x)erY9D-_bdM<96m#H~lGt?mFjxdsgm>vuIt^p`^BQQwhzC%oU2pfP+L-r@ FNGiR|J&ynY diff --git a/test/tests/caliptra_integration_tests/smoke_testdata/idevid_csr.txt b/test/tests/caliptra_integration_tests/smoke_testdata/idevid_csr.txt index 7831436342..340d92ab9f 100644 --- a/test/tests/caliptra_integration_tests/smoke_testdata/idevid_csr.txt +++ b/test/tests/caliptra_integration_tests/smoke_testdata/idevid_csr.txt @@ -1,7 +1,7 @@ Certificate Request: Data: Version: 1 (0x0) - Subject: CN=Caliptra 1.x IDevID/serialNumber=8E3C1A058F704A11821F7B48D340AEF99DDABADC1090D74D057FECCF73294ED6 + Subject: CN=Caliptra 1.0 IDevID/serialNumber=8E3C1A058F704A11821F7B48D340AEF99DDABADC1090D74D057FECCF73294ED6 Subject Public Key Info: Public Key Algorithm: id-ecPublicKey Public-Key: (384 bit) @@ -25,9 +25,9 @@ Certificate Request: 0.................... Signature Algorithm: ecdsa-with-SHA384 Signature Value: - 30:65:02:31:00:ed:8e:44:4e:3c:7f:6f:96:4a:5d:cb:e1:ea: - 08:a0:57:f5:d7:b5:6d:ce:72:9e:b8:8c:88:38:f6:50:35:90: - bd:6b:59:db:29:52:13:2e:fc:a8:b6:8d:8a:33:d3:2a:cf:02: - 30:6d:40:6a:1f:7c:9e:74:8f:28:dc:14:73:e0:96:92:d8:74: - fa:30:58:04:54:84:77:e9:52:3a:0d:63:fa:f3:1a:68:c3:88: - 07:50:a7:5d:6f:f7:a9:da:98:f7:8c:48:2a + 30:64:02:30:7c:74:fd:28:ce:0f:f9:e9:da:ef:90:84:a5:af: + c0:42:d1:e2:08:84:67:d6:6a:e8:dc:46:cc:02:1d:80:da:37: + 50:91:ee:75:09:ed:15:55:0f:31:15:23:c9:bb:e6:e1:02:30: + 24:fd:1b:5b:47:cc:14:4a:66:a5:bb:e7:04:74:f0:21:36:37: + f4:9e:5d:cd:a1:42:bf:f6:82:5c:a1:f4:51:43:e2:97:fc:95: + ce:56:b1:67:e1:bf:e1:26:3a:ce:a1:f3 diff --git a/test/tests/caliptra_integration_tests/smoke_testdata/ldevid_cert.der b/test/tests/caliptra_integration_tests/smoke_testdata/ldevid_cert.der index cafa0278230ffdb62b8b7cbc52b6981152b08bc6..d7bee137f127d8a6c7d1ca24a43c05683f913af2 100644 GIT binary patch delta 130 zcmV-|0Db?W1)~K7FoFV~kpx2lFp)@(0Wh)GVgYJt05E0(F#wwm8IghZkf%d5VAvgL z#HC|WqsWubOcB1}p^ZnTwPScfKZ=F&G_ ksR3#(qZPkpt19J!eDCqNS-pN>&lSfiWa`f=dz=44(|=+*t^fc4 delta 129 zcmV-{0Dk|Y1)>E6FoFV}kpx2lc#%ks0eG?3VgYGr05D|&FefA<4|fW*sg>NJmf+1@ z`6&qNfPHjT1$rX6VhEO^dI%vsipC#2ao~+egR7im8Uir@t%{iH=Q9(#0=5$RB=4^D jTXR>JH-c8E>BzQ+*)4rTyuQtX(+`DO6;_U-2>I;J;%PXG diff --git a/test/tests/caliptra_integration_tests/smoke_testdata/ldevid_cert.txt b/test/tests/caliptra_integration_tests/smoke_testdata/ldevid_cert.txt index 30930111d4..1c301b51c3 100644 --- a/test/tests/caliptra_integration_tests/smoke_testdata/ldevid_cert.txt +++ b/test/tests/caliptra_integration_tests/smoke_testdata/ldevid_cert.txt @@ -4,11 +4,11 @@ Certificate: Serial Number: 25:ee:ef:9a:4c:61:d4:b9:e3:d9:4b:ea:46:f9:a1:2a:c6:88:7c:e2 Signature Algorithm: ecdsa-with-SHA384 - Issuer: CN=Caliptra 1.x IDevID/serialNumber=8E3C1A058F704A11821F7B48D340AEF99DDABADC1090D74D057FECCF73294ED6 + Issuer: CN=Caliptra 1.0 IDevID/serialNumber=8E3C1A058F704A11821F7B48D340AEF99DDABADC1090D74D057FECCF73294ED6 Validity Not Before: Jan 1 00:00:00 2023 GMT Not After : Dec 31 23:59:59 9999 GMT - Subject: CN=Caliptra 1.x LDevID/serialNumber=21EEEF9A4C61D4B9E3D94BEA46F9A12AC6887CE2188559F40FF95777E8014889 + Subject: CN=Caliptra 1.0 LDevID/serialNumber=21EEEF9A4C61D4B9E3D94BEA46F9A12AC6887CE2188559F40FF95777E8014889 Subject Public Key Info: Public Key Algorithm: id-ecPublicKey Public-Key: (384 bit) @@ -35,9 +35,9 @@ Certificate: 42:4F:3A:C7:45:DD:BD:50:15:05:7F:5B:F8:3E:9C:D6:48:10:B0:41 Signature Algorithm: ecdsa-with-SHA384 Signature Value: - 30:65:02:30:27:24:23:0f:77:0a:b4:a9:95:dc:a1:96:e0:cd: - 5d:f9:29:08:eb:80:7d:74:55:05:7a:22:b9:62:08:96:a2:7a: - 08:21:3d:8a:c6:1f:3c:71:e0:8d:48:83:ab:9c:64:1a:02:31: - 00:ad:8a:98:ea:e7:33:13:bb:02:b6:12:fa:24:ef:ae:f4:5b: - 73:57:97:37:82:56:a8:e9:c8:b6:87:d9:2d:7d:43:bc:be:cd: - 82:d3:0f:85:5a:15:56:8e:a2:08:f9:ec:ce + 30:66:02:31:00:9b:0e:19:91:81:f6:90:a7:43:34:60:d8:1d: + 69:c4:a5:63:52:a3:c8:93:cf:4c:11:be:e1:a1:8d:47:a6:b5: + 63:78:42:3f:8a:85:f2:34:b4:ab:5a:18:01:f6:e7:ff:92:02: + 31:00:e1:21:cf:21:fe:44:09:81:95:01:fd:29:ad:f5:29:a9: + 01:6a:2e:a3:15:bf:65:ab:2a:e5:82:7c:ef:f1:b8:59:bd:7e: + 60:cf:15:c7:2a:64:ea:cf:2b:7b:9b:ff:42:d3 diff --git a/test/tests/caliptra_integration_tests/smoke_testdata/rt_alias_cert_redacted.der b/test/tests/caliptra_integration_tests/smoke_testdata/rt_alias_cert_redacted.der index 9e6aeef81d8fda0bc4db3b15ce135f6437c3c472..58e1b6e1a3e5cafad3dd482fac42d521ab18c0d0 100644 GIT binary patch delta 24 gcmZo-Yhs(=&T63G=IcE1ZqUSe){F)lZ)q?A0AK+KBLDyZ delta 24 gcmZo-Yhs(=&RU`1=IcE1ZqUSe){GS!Z)q?A0A?`=vj6}9 diff --git a/test/tests/caliptra_integration_tests/smoke_testdata/rt_alias_cert_redacted.txt b/test/tests/caliptra_integration_tests/smoke_testdata/rt_alias_cert_redacted.txt index 52d55db979..72a5ca0c82 100644 --- a/test/tests/caliptra_integration_tests/smoke_testdata/rt_alias_cert_redacted.txt +++ b/test/tests/caliptra_integration_tests/smoke_testdata/rt_alias_cert_redacted.txt @@ -4,11 +4,11 @@ Certificate: Serial Number: 44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44 Signature Algorithm: ecdsa-with-SHA384 - Issuer: CN=Caliptra 1.x FMC Alias/serialNumber=DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD + Issuer: CN=Caliptra 1.0 FMC Alias/serialNumber=DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD Validity Not Before: Jan 1 00:00:00 2023 GMT Not After : Dec 31 23:59:59 9999 GMT - Subject: CN=Caliptra 1.x Rt Alias/serialNumber=DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD + Subject: CN=Caliptra 1.0 Rt Alias/serialNumber=DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD Subject Public Key Info: Public Key Algorithm: id-ecPublicKey Public-Key: (384 bit) diff --git a/x509/build/build.rs b/x509/build/build.rs index dc116c3505..aa728c6eaa 100644 --- a/x509/build/build.rs +++ b/x509/build/build.rs @@ -54,7 +54,7 @@ fn gen_init_devid_csr(out_dir: &str) { .add_basic_constraints_ext(true, 5) .add_key_usage_ext(usage) .add_ueid_ext(&[0xFF; 17]); - let template = bldr.tbs_template("Caliptra 1.x IDevID"); + let template = bldr.tbs_template("Caliptra 1.0 IDevID"); CodeGen::gen_code("InitDevIdCsrTbs", template, out_dir); } @@ -67,7 +67,7 @@ fn gen_local_devid_cert(out_dir: &str) { .add_basic_constraints_ext(true, 4) .add_key_usage_ext(usage) .add_ueid_ext(&[0xFF; 17]); - let template = bldr.tbs_template("Caliptra 1.x LDevID", "Caliptra 1.x IDevID"); + let template = bldr.tbs_template("Caliptra 1.0 LDevID", "Caliptra 1.0 IDevID"); CodeGen::gen_code("LocalDevIdCertTbs", template, out_dir); } @@ -98,7 +98,7 @@ fn gen_fmc_alias_cert(out_dir: &str) { }, }], ); - let template = bldr.tbs_template("Caliptra 1.x FMC Alias", "Caliptra 1.x LDevID"); + let template = bldr.tbs_template("Caliptra 1.0 FMC Alias", "Caliptra 1.0 LDevID"); CodeGen::gen_code("FmcAliasCertTbs", template, out_dir); } @@ -122,6 +122,6 @@ fn gen_rt_alias_cert(out_dir: &str) { digest: &[0xCD; 48], }, }]); - let template = bldr.tbs_template("Caliptra 1.x Rt Alias", "Caliptra 1.x FMC Alias"); + let template = bldr.tbs_template("Caliptra 1.0 Rt Alias", "Caliptra 1.0 FMC Alias"); CodeGen::gen_code("RtAliasCertTbs", template, out_dir); } diff --git a/x509/build/fmc_alias_cert_tbs.rs b/x509/build/fmc_alias_cert_tbs.rs index f8724c2441..f8c623efe6 100644 --- a/x509/build/fmc_alias_cert_tbs.rs +++ b/x509/build/fmc_alias_cert_tbs.rs @@ -77,7 +77,7 @@ impl FmcAliasCertTbs { 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 48u8, 10u8, 6u8, 8u8, 42u8, 134u8, 72u8, 206u8, 61u8, 4u8, 3u8, 3u8, 48u8, 105u8, 49u8, 28u8, 48u8, 26u8, 6u8, 3u8, 85u8, 4u8, 3u8, 12u8, 19u8, 67u8, 97u8, 108u8, 105u8, - 112u8, 116u8, 114u8, 97u8, 32u8, 49u8, 46u8, 120u8, 32u8, 76u8, 68u8, 101u8, 118u8, 73u8, + 112u8, 116u8, 114u8, 97u8, 32u8, 49u8, 46u8, 48u8, 32u8, 76u8, 68u8, 101u8, 118u8, 73u8, 68u8, 49u8, 73u8, 48u8, 71u8, 6u8, 3u8, 85u8, 4u8, 5u8, 19u8, 64u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, @@ -87,7 +87,7 @@ impl FmcAliasCertTbs { 95u8, 95u8, 95u8, 95u8, 24u8, 15u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 48u8, 108u8, 49u8, 31u8, 48u8, 29u8, 6u8, 3u8, 85u8, 4u8, 3u8, 12u8, 22u8, 67u8, 97u8, 108u8, 105u8, 112u8, 116u8, 114u8, 97u8, 32u8, 49u8, - 46u8, 120u8, 32u8, 70u8, 77u8, 67u8, 32u8, 65u8, 108u8, 105u8, 97u8, 115u8, 49u8, 73u8, + 46u8, 48u8, 32u8, 70u8, 77u8, 67u8, 32u8, 65u8, 108u8, 105u8, 97u8, 115u8, 49u8, 73u8, 48u8, 71u8, 6u8, 3u8, 85u8, 4u8, 5u8, 19u8, 64u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, diff --git a/x509/build/init_dev_id_csr_tbs.rs b/x509/build/init_dev_id_csr_tbs.rs index e4139c01ad..c989be7267 100644 --- a/x509/build/init_dev_id_csr_tbs.rs +++ b/x509/build/init_dev_id_csr_tbs.rs @@ -31,7 +31,7 @@ impl InitDevIdCsrTbs { const TBS_TEMPLATE: [u8; Self::TBS_TEMPLATE_LEN] = [ 48u8, 130u8, 1u8, 62u8, 2u8, 1u8, 0u8, 48u8, 105u8, 49u8, 28u8, 48u8, 26u8, 6u8, 3u8, 85u8, 4u8, 3u8, 12u8, 19u8, 67u8, 97u8, 108u8, 105u8, 112u8, 116u8, 114u8, 97u8, 32u8, 49u8, - 46u8, 120u8, 32u8, 73u8, 68u8, 101u8, 118u8, 73u8, 68u8, 49u8, 73u8, 48u8, 71u8, 6u8, 3u8, + 46u8, 48u8, 32u8, 73u8, 68u8, 101u8, 118u8, 73u8, 68u8, 49u8, 73u8, 48u8, 71u8, 6u8, 3u8, 85u8, 4u8, 5u8, 19u8, 64u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, diff --git a/x509/build/local_dev_id_cert_tbs.rs b/x509/build/local_dev_id_cert_tbs.rs index b9b0fcdf77..adb180a84c 100644 --- a/x509/build/local_dev_id_cert_tbs.rs +++ b/x509/build/local_dev_id_cert_tbs.rs @@ -57,7 +57,7 @@ impl LocalDevIdCertTbs { 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 48u8, 10u8, 6u8, 8u8, 42u8, 134u8, 72u8, 206u8, 61u8, 4u8, 3u8, 3u8, 48u8, 105u8, 49u8, 28u8, 48u8, 26u8, 6u8, 3u8, 85u8, 4u8, 3u8, 12u8, 19u8, 67u8, 97u8, 108u8, 105u8, 112u8, - 116u8, 114u8, 97u8, 32u8, 49u8, 46u8, 120u8, 32u8, 73u8, 68u8, 101u8, 118u8, 73u8, 68u8, + 116u8, 114u8, 97u8, 32u8, 49u8, 46u8, 48u8, 32u8, 73u8, 68u8, 101u8, 118u8, 73u8, 68u8, 49u8, 73u8, 48u8, 71u8, 6u8, 3u8, 85u8, 4u8, 5u8, 19u8, 64u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, @@ -67,7 +67,7 @@ impl LocalDevIdCertTbs { 95u8, 95u8, 95u8, 24u8, 15u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 48u8, 105u8, 49u8, 28u8, 48u8, 26u8, 6u8, 3u8, 85u8, 4u8, 3u8, 12u8, 19u8, 67u8, 97u8, 108u8, 105u8, 112u8, 116u8, 114u8, 97u8, 32u8, 49u8, 46u8, - 120u8, 32u8, 76u8, 68u8, 101u8, 118u8, 73u8, 68u8, 49u8, 73u8, 48u8, 71u8, 6u8, 3u8, 85u8, + 48u8, 32u8, 76u8, 68u8, 101u8, 118u8, 73u8, 68u8, 49u8, 73u8, 48u8, 71u8, 6u8, 3u8, 85u8, 4u8, 5u8, 19u8, 64u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, diff --git a/x509/build/rt_alias_cert_tbs.rs b/x509/build/rt_alias_cert_tbs.rs index 0e2b75eb2d..fb13855784 100644 --- a/x509/build/rt_alias_cert_tbs.rs +++ b/x509/build/rt_alias_cert_tbs.rs @@ -65,7 +65,7 @@ impl RtAliasCertTbs { 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 48u8, 10u8, 6u8, 8u8, 42u8, 134u8, 72u8, 206u8, 61u8, 4u8, 3u8, 3u8, 48u8, 108u8, 49u8, 31u8, 48u8, 29u8, 6u8, 3u8, 85u8, 4u8, 3u8, 12u8, 22u8, 67u8, 97u8, 108u8, 105u8, - 112u8, 116u8, 114u8, 97u8, 32u8, 49u8, 46u8, 120u8, 32u8, 70u8, 77u8, 67u8, 32u8, 65u8, + 112u8, 116u8, 114u8, 97u8, 32u8, 49u8, 46u8, 48u8, 32u8, 70u8, 77u8, 67u8, 32u8, 65u8, 108u8, 105u8, 97u8, 115u8, 49u8, 73u8, 48u8, 71u8, 6u8, 3u8, 85u8, 4u8, 5u8, 19u8, 64u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, @@ -75,7 +75,7 @@ impl RtAliasCertTbs { 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 24u8, 15u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 48u8, 107u8, 49u8, 30u8, 48u8, 28u8, 6u8, 3u8, 85u8, 4u8, 3u8, 12u8, 21u8, 67u8, 97u8, 108u8, 105u8, 112u8, 116u8, 114u8, - 97u8, 32u8, 49u8, 46u8, 120u8, 32u8, 82u8, 116u8, 32u8, 65u8, 108u8, 105u8, 97u8, 115u8, + 97u8, 32u8, 49u8, 46u8, 48u8, 32u8, 82u8, 116u8, 32u8, 65u8, 108u8, 105u8, 97u8, 115u8, 49u8, 73u8, 48u8, 71u8, 6u8, 3u8, 85u8, 4u8, 5u8, 19u8, 64u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8, 95u8,