verifier: bump MEASUREMENT_CACHE_VERSION to invalidate stale RTMR0

kvinwang · kvinwang · commit c5eb9aacd80c · 2026-05-11T18:48:50.000-07:00
Cache entries written by an older verifier carry the pre-202505 RTMR[0]
expectation. Without bumping the version, deploying the new kms picks up
those stale entries and rejects 0.5.10 CVMs whose actual RTMR[0] now
matches the new computation.
diff --git a/verifier/src/verification.rs b/verifier/src/verification.rs
@@ -118,7 +118,10 @@ fn collect_rtmr_mismatch(
     }
 }
 
-const MEASUREMENT_CACHE_VERSION: u32 = 1;
+// Bump whenever expected RTMR computation changes so stale entries get ignored.
+// v2: edk2-stable202505 OVMF RTMR[0] layout (added 4 events, reshaped BootOrder
+// and Boot0000); the legacy 13-event log no longer matches any in-field image.
+const MEASUREMENT_CACHE_VERSION: u32 = 2;
 
 #[derive(Clone, Serialize, Deserialize)]
 struct CachedMeasurement {

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,10 @@ fn collect_rtmr_mismatch(`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
`121`		`-const MEASUREMENT_CACHE_VERSION: u32 = 1;`
	`121`	`+// Bump whenever expected RTMR computation changes so stale entries get ignored.`
	`122`	`+// v2: edk2-stable202505 OVMF RTMR[0] layout (added 4 events, reshaped BootOrder`
	`123`	`+// and Boot0000); the legacy 13-event log no longer matches any in-field image.`
	`124`	`+const MEASUREMENT_CACHE_VERSION: u32 = 2;`
`122`	`125`
`123`	`126`	`#[derive(Clone, Serialize, Deserialize)]`
`124`	`127`	`struct CachedMeasurement {`