Skip to content

Use new x509_cert::Certificate interface to lpc55_sign #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 21, 2023
Merged

Use new x509_cert::Certificate interface to lpc55_sign #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2895c6f
Use new x509_cert::Certificate interface to lpc55_sign
plotnick Apr 20, 2023
7d683b9
Drop branch on lpc55_support
plotnick Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hubtools/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ packed_struct = { version = "0.10", default-features = false, features = ["std"]
path-slash = { version = "0.1", default-features = false }
thiserror = { version = "1", default-features = false }
toml = { version = "0.7", default-features = false, features = ["parse"] }
x509-cert = { version = "0.2", default-features = false, features = ["std"] }
zerocopy = { version = "0.6", default-features = false }
zip = { version = "0.6", default-features = false, features = ["bzip2"] }

Expand Down
31 changes: 24 additions & 7 deletions hubtools/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use object::{Object, ObjectSection};
use packed_struct::PackedStruct;
use path_slash::PathBufExt;
use thiserror::Error;
use x509_cert::Certificate;
use zerocopy::{AsBytes, FromBytes};

use std::{
Expand Down Expand Up @@ -214,8 +215,8 @@ impl RawHubrisImage {

pub fn sign(
&mut self,
signing_certs: Vec<Vec<u8>>,
root_certs: Vec<Vec<u8>>,
signing_certs: Vec<Certificate>,
root_certs: Vec<Certificate>,
private_key: &str,
execution_address: u32,
) -> Result<(), Error> {
Expand Down Expand Up @@ -328,6 +329,9 @@ pub enum Error {

#[error("wrong chip: expected lpc55, got {0}")]
WrongChip(String),

#[error("certificates have unsupported {0}-bit public keys")]
UnsupportedKeySize(usize),
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -701,8 +705,8 @@ impl RawHubrisArchive {
/// changes back to the archive on disk.
pub fn sign(
&mut self,
signing_certs: Vec<Vec<u8>>,
root_certs: Vec<Vec<u8>>,
signing_certs: Vec<Certificate>,
root_certs: Vec<Certificate>,
private_key: &str,
execution_address: u32,
) -> Result<(), Error> {
Expand Down Expand Up @@ -745,9 +749,16 @@ impl RawHubrisArchive {
default_isp: lpc55_areas::DefaultIsp,
speed: lpc55_areas::BootSpeed,
boot_error_pin: lpc55_areas::BootErrorPin,
root_certs: Vec<Vec<u8>>,
root_certs: Vec<Certificate>,
) -> Result<(), Error> {
let rkth = lpc55_sign::signed_image::root_key_table_hash(root_certs)?;
let root_certs = lpc55_sign::signed_image::pad_roots(root_certs)?;
let use_rsa_4096 =
match lpc55_sign::signed_image::required_key_size(&root_certs)? {
Some(2048) | None => false,
Some(4096) => true,
Some(x) => return Err(Error::UnsupportedKeySize(x)),
};
let rkth = lpc55_sign::signed_image::root_key_table_hash(&root_certs)?;
let cmpa = lpc55_sign::signed_image::generate_cmpa(
dice,
enable_secure_boot,
Expand All @@ -757,6 +768,7 @@ impl RawHubrisArchive {
boot_error_pin,
rkth,
false,
use_rsa_4096,
)?;
if self.new_files.contains_key(CMPA_FILE)
|| self.extract_file(CMPA_FILE).is_ok()
Expand All @@ -776,8 +788,13 @@ impl RawHubrisArchive {
&mut self,
settings: lpc55_areas::DebugSettings,
revoke: [lpc55_areas::ROTKeyStatus; 4],
image_key_revoke: u16,
) -> Result<(), Error> {
let cfpa = lpc55_sign::signed_image::generate_cfpa(settings, revoke)?;
let cfpa = lpc55_sign::signed_image::generate_cfpa(
settings,
revoke,
image_key_revoke,
)?;
if self.new_files.contains_key(CFPA_FILE)
|| self.extract_file(CFPA_FILE).is_ok()
{
Expand Down