diff --git a/libs/bao1x-hal/src/sigcheck.rs b/libs/bao1x-hal/src/sigcheck.rs index f140ed57a..2f8b557f5 100644 --- a/libs/bao1x-hal/src/sigcheck.rs +++ b/libs/bao1x-hal/src/sigcheck.rs @@ -123,10 +123,44 @@ pub fn validate_image( return Err(String::from("Partition has invalid function code")); } + let one_way_counters = OneWayCounter::new(); + + // It is safe to check the anti-rollback counter before the signature because the + // anti-rollback field is part of the signed data. Thus even if the anti-rollback data + // is forged, it should be caught due to a failing signature check later on. + let claimed_function: FunctionCode = + sig.sealed_data.function_code.try_into().unwrap_or(FunctionCode::Invalid); + let arb_offset = claimed_function.to_anti_rollback_counter(); + match arb_offset { + Some(arb) => { + let arb_value = one_way_counters.get(arb).expect("Can't read anti-rollback value"); + csprng.as_deref_mut().map(|rng| rng.random_delay()); + bollard!(die_no_std, 4); + if arb_value > sig.sealed_data.anti_rollback { + return Err(String::from("Anti-rollback code too old, refusing image")); + } + bollard!(die_no_std, 4); + if arb_value < sig.sealed_data.anti_rollback { + csprng.as_deref_mut().map(|rng| rng.random_delay()); + if sig.sealed_data.anti_rollback >= crate::acram::ONEWAY_MAX_VALUE { + return Err(String::from("Proposed anti-rollback value out of range")); + } + // increment anti-rollback counter to match the current value of the signed image + bollard!(die_no_std, 4); + while one_way_counters.get(arb).unwrap() < sig.sealed_data.anti_rollback { + bollard!(die_no_std, 4); + // safety: anti-rollback counter argument is from a set of constants in bao1x_api that + // are pre-validated. + unsafe { one_way_counters.inc(arb).ok() }; + } + } + } + _ => return Err(String::from("Invalid anti-rollback code, aborting")), + } + bollard!(die_no_std, 4); // crate::println!("Signature: {:x?}", sig.signature); - let one_way_counters = OneWayCounter::new(); let mut passing_key: Option = None; let mut passing_key2: Option = None; csprng.as_deref_mut().map(|rng| rng.random_delay());