Updating RT & FMC version numbers for rt-1.2.2 release

Author: nquarton

builder/src/version.rs

@@ -6,11 +6,11 @@ pub const ROM_VERSION_PATCH: u16 = 0;
 
 pub const FMC_VERSION_MAJOR: u16 = 1;
 pub const FMC_VERSION_MINOR: u16 = 2;
-pub const FMC_VERSION_PATCH: u16 = 1;
+pub const FMC_VERSION_PATCH: u16 = 2;
 
 pub const RUNTIME_VERSION_MAJOR: u32 = 1;
 pub const RUNTIME_VERSION_MINOR: u32 = 2;
-pub const RUNTIME_VERSION_PATCH: u32 = 1;
+pub const RUNTIME_VERSION_PATCH: u32 = 2;
 
 // ROM Version - 16 bits
 // Major - 5 bits [15:11]

builder/test_data/default_image_options.toml

@@ -5,9 +5,9 @@
 # NOTE: Only the first keys in the vendor config are populated. The keys are
 # copied from image/fake-keys/src/lib.rs.
 
-fmc_version = 0x881
+fmc_version = 0x882
 fmc_svn = 0x0
-app_version = 0x1020001
+app_version = 0x1020002
 app_svn = 0x0
 
 [vendor_config]

test/tests/fips_test_suite/common.rs

@@ -99,7 +99,12 @@ const RT_EXP_1_2_1: RtExpVals = RtExpVals {
     fw_version: 0x0102_0001, // 1.2.1
 };
 
-const RT_EXP_CURRENT: RtExpVals = RtExpVals { ..RT_EXP_1_2_1 };
+const RT_EXP_1_2_2: RtExpVals = RtExpVals {
+    fmc_version: 0x882,      // 1.2.2
+    fw_version: 0x0102_0002, // 1.2.2
+};
+
+const RT_EXP_CURRENT: RtExpVals = RtExpVals { ..RT_EXP_1_2_2 };
 
 // === Getter implementations ===
 // TODO: These could be improved
@@ -156,6 +161,7 @@ impl RtExpVals {
                 "1_1_0" => RT_EXP_1_1_0,
                 "1_2_0" => RT_EXP_1_2_0,
                 "1_2_1" => RT_EXP_1_2_1,
+                "1_2_2" => RT_EXP_1_2_2,
                 _ => panic!(
                     "FIPS Test: Unknown version for expected Runtime values ({})",
                     version