From e7efb14bdf45914cef45729ead6093de2e5aac51 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 2 Mar 2022 19:51:16 +0800 Subject: [PATCH] add a bypass for Renode to skip the signature check - bypass causes warnings to be emitted in compilation - stark visual change on boot screen ("jail bars" instead of gray on bottom half) - root keys are locked out permanently from readout - devboot canary set --- loader/Cargo.toml | 1 + loader/src/secboot.rs | 17 +++++++++++++++++ xtask/src/main.rs | 44 ++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-) diff --git a/loader/Cargo.toml b/loader/Cargo.toml index 837057a33..c9d0e6279 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -30,6 +30,7 @@ lazy_static = "1.4.0" [features] debug-print = [] earlyprintk = [] +renode-bypass = [] #default = ["debug-print"] default = [] diff --git a/loader/src/secboot.rs b/loader/src/secboot.rs index 42eb52195..48d24d2fc 100644 --- a/loader/src/secboot.rs +++ b/loader/src/secboot.rs @@ -270,6 +270,23 @@ pub fn validate_xous_img(xous_img_offset: *const u32) -> bool { }; gfx.init(100_000_000); + #[cfg(feature = "renode-bypass")] + { + let (_top, bottom) = gfx.fb.split_at_mut(gfx.fb.len() / 2); + for (i, word) in bottom.iter_mut().enumerate() { + *word = 0xff00_ff00; + } + gfx.flush(); + gfx.msg("RENODE BYPASS SELECTED\n\r", &mut cursor); + gfx.msg("THIS IS A SECURITY VIOLATION\n\r", &mut cursor); + gfx.msg("ALL SIGCHECKS SKIPPED\n\r", &mut cursor); + let mut keyrom = Keyrom::new(); + keyrom.lock(); + gfx.set_devboot(); + gfx.flush(); + return true; + // this will emit a warning -- we want that. this is not a natural or intended normal code exit! + } // insert a pattern of alternating 0101/1010 to create a "gray effect" on the bottom half of the fb // note that the gray has "stripes" every 32 bits but it's visually easier to look at than stripes every other bit let (_top, bottom) = gfx.fb.split_at_mut(gfx.fb.len() / 2); diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 324360e7d..0235bfb4b 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -179,7 +179,7 @@ fn main() -> Result<(), Box> { pkgs.push(app); } generate_app_menus(&apps); - renode_image(false, &hw_pkgs, &[])? + renode_image(false, &hw_pkgs, &[], None)? }, Some("renode-test") => { let mut args = env::args(); @@ -195,7 +195,7 @@ fn main() -> Result<(), Box> { pkgs.push(app); } generate_app_menus(&apps); - renode_image(false, &cbtest_pkgs, &[])? + renode_image(false, &cbtest_pkgs, &[], None)? }, Some("libstd-test") => { let mut args = env::args(); @@ -206,15 +206,16 @@ fn main() -> Result<(), Box> { for program in &args { extra_packages.push(program.as_str()); } - renode_image(false, &pkgs, extra_packages.as_slice())?; + renode_image(false, &pkgs, extra_packages.as_slice(), + Some(&["--features", "renode-bypass"]))?; } Some("renode-aes-test") => { generate_app_menus(&Vec::::new()); - renode_image(false, &aestest_pkgs, &[])? + renode_image(false, &aestest_pkgs, &[], None)? }, Some("renode-image-debug") => { generate_app_menus(&vec!["ball".to_string()]); - renode_image(true, &hw_pkgs, &[])? + renode_image(true, &hw_pkgs, &[], None)? }, Some("pddb-ci") => { generate_app_menus(&Vec::::new()); @@ -265,7 +266,7 @@ fn main() -> Result<(), Box> { build_hw_image(false, Some("./precursors/soc.svd".to_string()), &pkgs, - lkey, kkey, None, &[])? + lkey, kkey, None, &[], None)? } Some("hw-image") => { let mut pkgs = vec![]; @@ -280,7 +281,8 @@ fn main() -> Result<(), Box> { app_strs.push(app.to_string()); } generate_app_menus(&app_strs); - build_hw_image(false, env::args().nth(2), &pkgs, lkey, kkey, None, &[])? + build_hw_image(false, env::args().nth(2), + &pkgs, lkey, kkey, None, &[], None)? } Some("gfx-dev") => { run(true, &gfx_dev_pkgs, Some(&["--features", "graphics-server/testing"]))? @@ -292,7 +294,7 @@ fn main() -> Result<(), Box> { lkey, kkey, None, - &[], + &[], None, )?, Some("pddb-hosted") => run(false, &pddb_dev_pkgs, None)?, Some("benchmark") => build_hw_image( @@ -302,7 +304,7 @@ fn main() -> Result<(), Box> { lkey, kkey, None, - &[], + &[], None, )?, Some("minimal") => build_hw_image( false, @@ -311,7 +313,7 @@ fn main() -> Result<(), Box> { lkey, kkey, None, - &[], + &[], None, )?, Some("cbtest") => build_hw_image( false, @@ -320,7 +322,7 @@ fn main() -> Result<(), Box> { lkey, kkey, None, - &[], + &[], None, )?, Some("trng-test") => { generate_app_menus(&Vec::::new()); @@ -331,7 +333,7 @@ fn main() -> Result<(), Box> { lkey, kkey, Some(&["--features", "urandomtest"]), - &[], + &[], None, )?}, Some("ro-test") => { generate_app_menus(&Vec::::new()); @@ -342,7 +344,7 @@ fn main() -> Result<(), Box> { lkey, kkey, Some(&["--features", "ringosctest"]), - &[], + &[], None, )?}, Some("av-test") => { generate_app_menus(&Vec::::new()); @@ -353,10 +355,11 @@ fn main() -> Result<(), Box> { lkey, kkey, Some(&["--features", "avalanchetest"]), - &[], + &[], None, )?}, Some("sr-test") => { - build_hw_image(false, env::args().nth(2), &sr_pkgs, lkey, kkey, None, &[])? + build_hw_image(false, env::args().nth(2), + &sr_pkgs, lkey, kkey, None, &[], None)? } Some("burn-kernel") => update_usb(true, false, false, false)?, Some("burn-loader") => update_usb(false, true, false, false)?, @@ -540,6 +543,7 @@ fn build_hw_image( kkey: Option, extra_args: Option<&[&str]>, extra_packages: &[&str], + loader_features: Option<&[&str]>, ) -> Result<(), DynError> { let svd_file = match svd { Some(s) => s, @@ -577,7 +581,7 @@ fn build_hw_image( debug, Some(KERNEL_TARGET), Some("loader".into()), - None, None, + None, loader_features, )?; loader.push(PathBuf::from("loader")); @@ -686,7 +690,12 @@ fn sign_loader(in_path: Pathbuf, out_path: Pathbuf) -> Result<(), DynError> { }*/ -fn renode_image(debug: bool, packages: &[&str], extra_packages: &[&str]) -> Result<(), DynError> { +fn renode_image( + debug: bool, + packages: &[&str], + extra_packages: &[&str], + loader_features: Option<&[&str]>, +) -> Result<(), DynError> { // Regenerate the Platform file let status = Command::new(cargo()) .current_dir(project_root()) @@ -712,6 +721,7 @@ fn renode_image(debug: bool, packages: &[&str], extra_packages: &[&str]) -> Resu None, None, extra_packages, + loader_features, ) }