Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions litebox_runner_lvbs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ pub fn init(is_bsp: bool) -> &'static Platform {
.get()
.expect("init must publish the platform before any core uses it");
if is_bsp {
let shim = litebox_shim_optee::OpteeShimBuilder::new(platform, session_manager()).build();
let shim = litebox_shim_optee::OpteeShimBuilder::new(platform, session_manager())
.with_ta_signing_cert(TA_SIGNING_CERT_DER)
.build();
register_embedded_tas(&shim);
}
platform
Expand Down Expand Up @@ -823,7 +825,9 @@ fn open_session_new_instance(
client_identity: Option<litebox_common_optee::TeeIdentity>,
ta_req_info: &litebox_shim_optee::msg_handler::TaRequestInfo<PAGE_SIZE>,
) -> Result<(), OpteeSmcReturnCode> {
let shim = litebox_shim_optee::OpteeShimBuilder::new(platform, session_manager()).build();
let shim = litebox_shim_optee::OpteeShimBuilder::new(platform, session_manager())
.with_ta_signing_cert(TA_SIGNING_CERT_DER)
.build();
if shim.get_ta_bin(&ta_uuid).is_none() {
msg_args.session = 0;
msg_args.ret = TeeResult::ItemNotFound;
Expand Down Expand Up @@ -1413,6 +1417,7 @@ fn write_rpc_args_to_normal_world(
const LDELF_BINARY: &[u8] = &[0u8; 0];
const TA_BINARY: &[u8] = &[0u8; 0];
const TA_BINARIES: &[&[u8]] = &[TA_BINARY];
const TA_SIGNING_CERT_DER: &[u8] = &[0u8; 0];

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I think Angelina has a different way of sending the cert. But let us check in your PR and then Angelina can fix it up with her signing PR


/// Register a TA binary embedded in the runner image.
fn register_embedded_ta(
Expand Down
3 changes: 3 additions & 0 deletions litebox_shim_optee/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ zerocopy = { version = "0.8", default-features = false, features = ["derive"] }
zeroize = { version = "1.8", default-features = false, features = ["alloc"] }
p384 = { version = "0.13.1", default-features = false, features = ["arithmetic", "ecdsa"] }

[features]
idks-production = []

[lints]
workspace = true

Expand Down
Loading
Loading