citadel/citadel-tools
5
0
Fork 0
forked from brl/citadel-tools
Code Pull Requests Activity

No need to use a loop device here

Browse Source
This commit is contained in:
Bruce Leidl 2019-01-03 10:49:09 -05:00
parent 58a58e234f
commit 140257208a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcitadel/src/verity.rs
View File

@ -32,16 +32,14 @@ pub fn generate_image_hashtree<P: AsRef<Path>>(image: P, metainfo: &MetaInfo) ->
pub fn verify_image<P: AsRef<Path>>(image: P, metainfo: &MetaInfo) -> Result<bool> { pub fn verify_image<P: AsRef<Path>>(image: P, metainfo: &MetaInfo) -> Result<bool> {
let arg_offset = format!("--hash-offset={}", metainfo.nblocks() * 4096); let arg_offset = format!("--hash-offset={}", metainfo.nblocks() * 4096);
let loopdev = create_image_loop_device(image.as_ref())?; let image = format!("{}", image.as_ref().display());
let status = Command::new(VERITYSETUP) let status = Command::new(VERITYSETUP)
.args(&[ arg_offset.as_str(), "verify", &loopdev, &loopdev, metainfo.verity_root()]) .args(&[ arg_offset.as_str(), "verify", image.as_str(), image.as_str(), metainfo.verity_root()])
.stderr(Stdio::inherit()) .stderr(Stdio::inherit())
.status()?; .status()?;
util::exec_cmdline(LOSETUP, format!("-d {}", loopdev))
.context("Error removing loop device created for verification")?;
Ok(status.success()) Ok(status.success())
} }