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

Split signature verification into two steps: get pubkey, verify

Browse Source
This commit is contained in:
Bruce Leidl 2019-01-17 09:02:57 -05:00
parent 0f4b319ea1
commit ad29d58413
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libcitadel/src/header.rs
View File

@ -8,7 +8,7 @@ use failure::ResultExt;
use toml; use toml;
use blockdev::AlignedBuffer; use blockdev::AlignedBuffer;
use {BlockDev,Result,public_key_for_channel}; use {BlockDev,Result,public_key_for_channel,PublicKey};
/// Expected magic value in header /// Expected magic value in header
const MAGIC: &[u8] = b"SGOS"; const MAGIC: &[u8] = b"SGOS";
@ -226,16 +226,13 @@ impl ImageHeader {
Ok(()) Ok(())
} }
pub fn verify_signature(&self) -> Result<()> { pub fn public_key(&self) -> Result<Option<PublicKey>> {
let metainfo = self.metainfo()?; let metainfo = self.metainfo()?;
public_key_for_channel(metainfo.channel())
}
if let Some(pubkey) = public_key_for_channel(metainfo.channel())? { pub fn verify_signature(&self, pubkey: PublicKey) -> bool {
if !pubkey.verify(&self.metainfo_bytes(), &self.signature()) { pubkey.verify(&self.metainfo_bytes(), &self.signature())
bail!("Header signature verification failed");
}
return Ok(())
}
Err(format_err!("Cannot verify signature because no public key found for channel '{}'", metainfo.channel()))
} }
pub fn write_header<W: Write>(&self, mut writer: W) -> Result<()> { pub fn write_header<W: Write>(&self, mut writer: W) -> Result<()> {