Updating frozen ci ROM 1.1.0 to 1.1.1

nquarton · Jan 13, 2025 · b557bdf · b557bdf
1 parent 8730762
commit b557bdf
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 10 deletions.
diff --git a/builder/src/lib.rs b/builder/src/lib.rs
@@ -408,13 +408,13 @@ pub fn rom_for_fw_integration_tests() -> io::Result<Cow<'static, [u8]>> {
         CiRomVersion::Rom1_1 => {
             if rom_from_env == &firmware::ROM {
                 Ok(
-                    include_bytes!("../../rom/ci_frozen_rom/1.1/caliptra-rom-1.1.0-51ff0a8.bin")
+                    include_bytes!("../../rom/ci_frozen_rom/1.1/caliptra-rom-1.1.1-d6713db.bin")
                         .as_slice()
                         .into(),
                 )
             } else if rom_from_env == &firmware::ROM_WITH_UART {
                 Ok(include_bytes!(
-                    "../../rom/ci_frozen_rom/1.1/caliptra-rom-with-log-1.1.0-51ff0a8.bin"
+                    "../../rom/ci_frozen_rom/1.1/caliptra-rom-with-log-1.1.1-d6713db.bin"
                 )
                 .as_slice()
                 .into())

diff --git a/fmc/tests/fmc_integration_tests/test_rtalias.rs b/fmc/tests/fmc_integration_tests/test_rtalias.rs
@@ -92,7 +92,7 @@ fn test_fht_info() {
     let fht = FirmwareHandoffTable::try_ref_from_bytes(data.as_bytes()).unwrap();
     assert_eq!(fht.ldevid_tbs_size, 552);
     match get_ci_rom_version() {
-        CiRomVersion::Rom1_0 | CiRomVersion::Rom1_1 => assert_eq!(fht.fmcalias_tbs_size, 786),
+        CiRomVersion::Rom1_0 => assert_eq!(fht.fmcalias_tbs_size, 786),
         _ => assert_eq!(fht.fmcalias_tbs_size, 753),
     };
     assert_eq!(fht.ldevid_tbs_addr, 0x50003C00);

diff --git a/rom/ci_frozen_rom/1.1/caliptra-rom-1.1.0-51ff0a8.bin b/rom/ci_frozen_rom/1.1/caliptra-rom-1.1.0-51ff0a8.bin
diff --git a/rom/ci_frozen_rom/1.1/caliptra-rom-1.1.1-d6713db.bin b/rom/ci_frozen_rom/1.1/caliptra-rom-1.1.1-d6713db.bin
diff --git a/rom/ci_frozen_rom/1.1/caliptra-rom-with-log-1.1.0-51ff0a8.bin b/rom/ci_frozen_rom/1.1/caliptra-rom-with-log-1.1.0-51ff0a8.bin
diff --git a/rom/ci_frozen_rom/1.1/caliptra-rom-with-log-1.1.1-d6713db.bin b/rom/ci_frozen_rom/1.1/caliptra-rom-with-log-1.1.1-d6713db.bin
diff --git a/test/tests/caliptra_integration_tests/smoke_test.rs b/test/tests/caliptra_integration_tests/smoke_test.rs
@@ -54,7 +54,10 @@ const ROM_1_1_TEST_PARAMS: RomTestParams = RomTestParams {
     fmc_alias_cert_redacted_der: include_bytes!(
         "smoke_testdata/rom-1.1/fmc_alias_cert_redacted.der"
     ),
-    ..ROM_1_0_TEST_PARAMS
+    tcb_info_vendor: None,
+    tcb_device_info_model: None,
+    tcb_fmc_info_model: None,
+    tcb_info_flags: Some(0x00000001),
 };
 const ROM_LATEST_TEST_PARAMS: RomTestParams = RomTestParams {
     testdata_path: "tests/caliptra_integration_tests/smoke_testdata/rom-latest",
@@ -64,10 +67,7 @@ const ROM_LATEST_TEST_PARAMS: RomTestParams = RomTestParams {
     fmc_alias_cert_redacted_der: include_bytes!(
         "smoke_testdata/rom-latest/fmc_alias_cert_redacted.der"
     ),
-    tcb_info_vendor: None,
-    tcb_device_info_model: None,
-    tcb_fmc_info_model: None,
-    tcb_info_flags: Some(0x00000001),
+    ..ROM_1_1_TEST_PARAMS
 };
 
 fn get_rom_test_params() -> RomTestParams<'static> {

diff --git a/test/tests/caliptra_integration_tests/smoke_testdata/rom-1.1/fmc_alias_cert_redacted.der b/test/tests/caliptra_integration_tests/smoke_testdata/rom-1.1/fmc_alias_cert_redacted.der
diff --git a/test/tests/caliptra_integration_tests/smoke_testdata/rom-1.1/fmc_alias_cert_redacted.txt b/test/tests/caliptra_integration_tests/smoke_testdata/rom-1.1/fmc_alias_cert_redacted.txt
@@ -30,7 +30,7 @@ Certificate:
             2.23.133.5.4.4: 
                 0....................
             2.23.133.5.4.5: 
-                DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+                DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
             X509v3 Subject Key Identifier: 
                 44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44:44
             X509v3 Authority Key Identifier: 

diff --git a/test/tests/fips_test_suite/common.rs b/test/tests/fips_test_suite/common.rs
@@ -61,6 +61,11 @@ const ROM_EXP_1_1_0: RomExpVals = RomExpVals {
     ..ROM_EXP_1_0_3
 };
 
+const ROM_EXP_1_1_1: RomExpVals = RomExpVals {
+    rom_version: 0x841, // 1.1.1
+    ..ROM_EXP_1_1_0
+};
+
 const ROM_EXP_1_2_0: RomExpVals = RomExpVals {
     rom_version: 0x880, // 1.2.0
     ..ROM_EXP_1_1_0
@@ -123,7 +128,7 @@ impl RomExpVals {
         } else {
             match get_ci_rom_version() {
                 CiRomVersion::Rom1_0 => ROM_EXP_1_0_3,
-                CiRomVersion::Rom1_1 => ROM_EXP_1_1_0,
+                CiRomVersion::Rom1_1 => ROM_EXP_1_1_1,
                 _ => ROM_EXP_CURRENT,
             }
         }