From 3b50c6ab227bba973da2e6ca33a0a5012fde7146 Mon Sep 17 00:00:00 2001 From: Nick Quarton <139178705+nquarton@users.noreply.github.com> Date: Mon, 2 Dec 2024 09:05:14 -0800 Subject: [PATCH] Updating ROM version to 1.2.0 (#1818) --- FROZEN_IMAGES.sha384sum | 4 ++-- builder/src/version.rs | 2 +- test/tests/fips_test_suite/common.rs | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/FROZEN_IMAGES.sha384sum b/FROZEN_IMAGES.sha384sum index 8138d5d756..149f78dccc 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 -129ee84ecdc1f80a9aab51883589b4eb80191bc726277fb31fab2bb2e99f54b3ad7dc80459914c9cd9749e5994614ccd caliptra-rom-no-log.bin -162eb324937462a1534406d43b9ba74b229d9347541f148eebc435f901e839e4c95af308f91b873f0bc67124cf35ecc1 caliptra-rom-with-log.bin +df4a72ee4a88d12d7216f8d23c6567b479694dec959e7332d69094098d312ea2dbf35de1117db156635ad41a78bf3c14 caliptra-rom-no-log.bin +02db1204eea812bee28904ce877ec7604746169fa7bfa82471cf10af239852466c1a16b2d5b3b9ad26b4ccfe2ca0a1b5 caliptra-rom-with-log.bin diff --git a/builder/src/version.rs b/builder/src/version.rs index 36d57e2d12..bb881ab230 100755 --- a/builder/src/version.rs +++ b/builder/src/version.rs @@ -1,7 +1,7 @@ // Licensed under the Apache-2.0 license pub const ROM_VERSION_MAJOR: u16 = 1; -pub const ROM_VERSION_MINOR: u16 = 1; +pub const ROM_VERSION_MINOR: u16 = 2; pub const ROM_VERSION_PATCH: u16 = 0; pub const FMC_VERSION_MAJOR: u16 = 1; diff --git a/test/tests/fips_test_suite/common.rs b/test/tests/fips_test_suite/common.rs index ab6d76c8dd..c91c71198a 100755 --- a/test/tests/fips_test_suite/common.rs +++ b/test/tests/fips_test_suite/common.rs @@ -61,7 +61,12 @@ const ROM_EXP_1_1_0: RomExpVals = RomExpVals { ..ROM_EXP_1_0_3 }; -const ROM_EXP_CURRENT: RomExpVals = RomExpVals { ..ROM_EXP_1_1_0 }; +const ROM_EXP_1_2_0: RomExpVals = RomExpVals { + rom_version: 0x880, // 1.2.0 + ..ROM_EXP_1_1_0 +}; + +const ROM_EXP_CURRENT: RomExpVals = RomExpVals { ..ROM_EXP_1_2_0 }; // === RUNTIME === pub struct RtExpVals {