Skip to content

refactor: hide low-level OP-TEE dependencies #311

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
ivila merged 1 commit into from
Jul 30, 2026
Merged

refactor: hide low-level OP-TEE dependencies #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion ci/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ if [ "$STD" ]; then
./test_secure_db_abstraction.sh
else
./test_mnist_rs.sh
./test_build_with_optee_utee_sys.sh
fi

./test_hello_world.sh
Expand Down
3 changes: 0 additions & 3 deletions crates/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ syn = { version = "2.0.117", features = ["full"] }
proc-macro2 = "1.0.106"
libc = "0.2.184"
rand = "0.10"
once_cell = "1.21.4"
serde = { version = "1.0.228" }
serde_json = { version = "1.0.149" }
log = "0.4.29"
Expand All @@ -72,8 +71,6 @@ mockall = "0.15.0"
rustls = { version = "0.23.37", default-features = false }
rustls-rustcrypto = "0.0.2-alpha"
getrandom = { version = "0.2.17", default-features = false }
base64ct = "1.8.3"
ed25519-dalek = "2.2.0"
bincode = "1.3.3"
anyhow = "1.0.103"
hashbrown = "0.15.5"
3 changes: 2 additions & 1 deletion crates/optee-teec/src/extension.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ impl<'a, 'b> PluginParameters<'a, 'b> {
/// Returns a mutable reference to the inout buffer.
///
/// # Safety
/// The caller is responsible for updating `out_len` (via [`set_out_len`])
/// The caller is responsible for updating `out_len` (via
/// [`set_out_len`](Self::set_out_len))
/// after writing to the buffer.
pub unsafe fn get_buffer_mut(&mut self) -> &mut [u8] {
self.buf
Expand Down
105 changes: 54 additions & 51 deletions crates/optee-utee-build/src/code_generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ impl HeaderFileGenerator {
let utee_type_name_codes = property_value_utee_type_codes(&prop.value);
let utee_value_conv_codes = property_value_as_utee_value_codes(&var_name, &prop.value);
ext_property_codes.push(quote! {
optee_utee_sys::user_ta_property {
optee_utee::raw::user_ta_property {
name: #prop_name_codes.as_ptr(),
prop_type: #utee_type_name_codes,
value: #utee_value_conv_codes,
Expand All @@ -133,64 +133,64 @@ impl HeaderFileGenerator {
let property_len = ORIGIN_PROPERTY_LEN + conf.ext_properties.len();
let no_mangle_attribute = no_mangle_attribute_codes();
self.code.extend(quote! {
const IS_SINGLE_INSTANCE: bool = (TA_FLAGS & optee_utee_sys::TA_FLAG_SINGLE_INSTANCE) != 0;
const IS_MULTI_SESSION: bool = (TA_FLAGS & optee_utee_sys::TA_FLAG_MULTI_SESSION) != 0;
const IS_KEEP_ALIVE: bool = (TA_FLAGS & optee_utee_sys::TA_FLAG_INSTANCE_KEEP_ALIVE) != 0;
const IS_KEEP_CRASHED: bool = (TA_FLAGS & optee_utee_sys::TA_FLAG_INSTANCE_KEEP_CRASHED) != 0;
const IS_SINGLE_INSTANCE: bool = (TA_FLAGS & optee_utee::raw::TA_FLAG_SINGLE_INSTANCE) != 0;
const IS_MULTI_SESSION: bool = (TA_FLAGS & optee_utee::raw::TA_FLAG_MULTI_SESSION) != 0;
const IS_KEEP_ALIVE: bool = (TA_FLAGS & optee_utee::raw::TA_FLAG_INSTANCE_KEEP_ALIVE) != 0;
const IS_KEEP_CRASHED: bool = (TA_FLAGS & optee_utee::raw::TA_FLAG_INSTANCE_KEEP_CRASHED) != 0;
const TA_ENDIAN: u32 = 0;
const DONT_CLOSE_HANDLE_ON_CORRUPT_OBJECT: bool = (TA_FLAGS & optee_utee_sys::TA_FLAG_DONT_CLOSE_HANDLE_ON_CORRUPT_OBJECT) != 0;
const DONT_CLOSE_HANDLE_ON_CORRUPT_OBJECT: bool = (TA_FLAGS & optee_utee::raw::TA_FLAG_DONT_CLOSE_HANDLE_ON_CORRUPT_OBJECT) != 0;
#no_mangle_attribute
pub static ta_num_props: usize = #property_len;
#no_mangle_attribute
pub static ta_props: [optee_utee_sys::user_ta_property; #property_len] = [
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_SINGLE_INSTANCE,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
pub static ta_props: [optee_utee::raw::user_ta_property; #property_len] = [
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_SINGLE_INSTANCE,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
value: &IS_SINGLE_INSTANCE as *const bool as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_MULTI_SESSION,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_MULTI_SESSION,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
value: &IS_MULTI_SESSION as *const bool as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_KEEP_ALIVE,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_KEEP_ALIVE,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
value: &IS_KEEP_ALIVE as *const bool as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_KEEP_CRASHED,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_KEEP_CRASHED,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
value: &IS_KEEP_CRASHED as *const bool as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_DATA_SIZE,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_DATA_SIZE,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
value: &TA_DATA_SIZE as *const u32 as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_STACK_SIZE,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_STACK_SIZE,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
value: &TA_STACK_SIZE as *const u32 as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_VERSION,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_STRING,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_VERSION,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_STRING,
value: TA_VERSION as *const [u8] as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_DESCRIPTION,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_STRING,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_DESCRIPTION,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_STRING,
value: TA_DESCRIPTION as *const [u8] as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_ENDIAN,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_ENDIAN,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
value: &TA_ENDIAN as *const u32 as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_DOES_NOT_CLOSE_HANDLE_ON_CORRUPT_OBJECT,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_DOES_NOT_CLOSE_HANDLE_ON_CORRUPT_OBJECT,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
value: &DONT_CLOSE_HANDLE_ON_CORRUPT_OBJECT as *const bool as _,
},
#(#ext_property_codes),*
Expand All @@ -207,7 +207,7 @@ impl HeaderFileGenerator {
self.code.extend(quote! {
#no_mangle_attribute
#ta_head_session_attribute
pub static ta_head: optee_utee_sys::ta_head = optee_utee_sys::ta_head {
pub static ta_head: optee_utee::raw::ta_head = optee_utee::raw::ta_head {
uuid: #uuid_value_codes,
stack_size: #stack_size,
flags: TA_FLAGS,
Expand Down Expand Up @@ -246,7 +246,7 @@ fn property_value_data_codes(value: &PropertyValue) -> Result<proc_macro2::Token
fn uuid_to_tee_uuid_value_codes(uuid: &uuid::Uuid) -> Result<proc_macro2::TokenStream, Error> {
let (time_low, time_mid, time_hi_and_version, clock_seq_and_node) = uuid.as_fields();
Ok(quote! {
optee_utee_sys::TEE_UUID {
optee_utee::raw::TEE_UUID {
timeLow: #time_low,
timeMid: #time_mid,
timeHiAndVersion: #time_hi_and_version,
Expand All @@ -261,7 +261,7 @@ fn identity_to_tee_identity_value_codes(
) -> Result<proc_macro2::TokenStream, Error> {
let tee_uuid_codes = uuid_to_tee_uuid_value_codes(uuid)?;
Ok(quote! {
optee_utee_sys::TEE_Identity {
optee_utee::raw::TEE_Identity {
login: #login,
uuid: #tee_uuid_codes,
}
Expand All @@ -273,10 +273,10 @@ fn property_value_rust_type_declaration_codes(value: &PropertyValue) -> proc_mac
PropertyValue::U32(_) => "u32",
PropertyValue::U64(_) => "u64",
PropertyValue::Bool(_) => "bool",
PropertyValue::Uuid(_) => "optee_utee_sys::TEE_UUID",
PropertyValue::Uuid(_) => "optee_utee::raw::TEE_UUID",
PropertyValue::Str(_) => "&[u8]",
PropertyValue::BinaryBlock(_) => "&[u8]",
PropertyValue::Identity(..) => "optee_utee_sys::TEE_Identity",
PropertyValue::Identity(..) => "optee_utee::raw::TEE_Identity",
})
.unwrap()
}
Expand All @@ -291,12 +291,15 @@ fn property_value_as_utee_value_codes(
PropertyValue::U64(_) => format!("&{} as *const u64 as *mut _", var_name),
PropertyValue::Bool(_) => format!("&{} as *const bool as *mut _", var_name),
PropertyValue::Uuid(_) => {
format!("&{} as *const optee_utee_sys::TEE_UUID as *mut _", var_name)
format!(
"&{} as *const optee_utee::raw::TEE_UUID as *mut _",
var_name
)
}
PropertyValue::Str(_) => format!("{} as *const [u8] as *mut _", var_name),
PropertyValue::BinaryBlock(_) => format!("{} as *const [u8] as *mut _", var_name),
PropertyValue::Identity(..) => format!(
"&{} as *const optee_utee_sys::TEE_Identity as *mut _",
"&{} as *const optee_utee::raw::TEE_Identity as *mut _",
var_name
),
}
Expand All @@ -307,16 +310,16 @@ fn property_value_as_utee_value_codes(

fn property_value_utee_type_codes(value: &PropertyValue) -> proc_macro2::TokenStream {
proc_macro2::TokenStream::from_str(match value {
PropertyValue::U32(_) => "optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_U32",
PropertyValue::U64(_) => "optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_U64",
PropertyValue::Bool(_) => "optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL",
PropertyValue::Uuid(_) => "optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_UUID",
PropertyValue::Str(_) => "optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_STRING",
PropertyValue::U32(_) => "optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_U32",
PropertyValue::U64(_) => "optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_U64",
PropertyValue::Bool(_) => "optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL",
PropertyValue::Uuid(_) => "optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_UUID",
PropertyValue::Str(_) => "optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_STRING",
PropertyValue::BinaryBlock(_) => {
"optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BINARY_BLOCK"
"optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BINARY_BLOCK"
}
PropertyValue::Identity(..) => {
"optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_IDENTITY"
"optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_IDENTITY"
}
})
.unwrap()
Expand Down
76 changes: 38 additions & 38 deletions crates/optee-utee-build/test_files/test_result.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,75 +34,75 @@ pub static trace_ext_prefix: &[u8] = b"TA\0";
pub unsafe extern "C" fn tahead_get_trace_level() -> c_int {
unsafe { trace_level }
}
const IS_SINGLE_INSTANCE: bool = (TA_FLAGS & optee_utee_sys::TA_FLAG_SINGLE_INSTANCE)
const IS_SINGLE_INSTANCE: bool = (TA_FLAGS & optee_utee::raw::TA_FLAG_SINGLE_INSTANCE)
!= 0;
const IS_MULTI_SESSION: bool = (TA_FLAGS & optee_utee_sys::TA_FLAG_MULTI_SESSION) != 0;
const IS_KEEP_ALIVE: bool = (TA_FLAGS & optee_utee_sys::TA_FLAG_INSTANCE_KEEP_ALIVE)
const IS_MULTI_SESSION: bool = (TA_FLAGS & optee_utee::raw::TA_FLAG_MULTI_SESSION) != 0;
const IS_KEEP_ALIVE: bool = (TA_FLAGS & optee_utee::raw::TA_FLAG_INSTANCE_KEEP_ALIVE)
!= 0;
const IS_KEEP_CRASHED: bool = (TA_FLAGS & optee_utee_sys::TA_FLAG_INSTANCE_KEEP_CRASHED)
const IS_KEEP_CRASHED: bool = (TA_FLAGS & optee_utee::raw::TA_FLAG_INSTANCE_KEEP_CRASHED)
!= 0;
const TA_ENDIAN: u32 = 0;
const DONT_CLOSE_HANDLE_ON_CORRUPT_OBJECT: bool = (TA_FLAGS
& optee_utee_sys::TA_FLAG_DONT_CLOSE_HANDLE_ON_CORRUPT_OBJECT) != 0;
& optee_utee::raw::TA_FLAG_DONT_CLOSE_HANDLE_ON_CORRUPT_OBJECT) != 0;
#[unsafe(no_mangle)]
pub static ta_num_props: usize = 10usize;
#[unsafe(no_mangle)]
pub static ta_props: [optee_utee_sys::user_ta_property; 10usize] = [
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_SINGLE_INSTANCE,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
pub static ta_props: [optee_utee::raw::user_ta_property; 10usize] = [
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_SINGLE_INSTANCE,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
value: &IS_SINGLE_INSTANCE as *const bool as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_MULTI_SESSION,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_MULTI_SESSION,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
value: &IS_MULTI_SESSION as *const bool as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_KEEP_ALIVE,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_KEEP_ALIVE,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
value: &IS_KEEP_ALIVE as *const bool as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_KEEP_CRASHED,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_KEEP_CRASHED,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
value: &IS_KEEP_CRASHED as *const bool as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_DATA_SIZE,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_DATA_SIZE,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
value: &TA_DATA_SIZE as *const u32 as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_STACK_SIZE,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_STACK_SIZE,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
value: &TA_STACK_SIZE as *const u32 as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_VERSION,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_STRING,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_VERSION,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_STRING,
value: TA_VERSION as *const [u8] as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_DESCRIPTION,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_STRING,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_DESCRIPTION,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_STRING,
value: TA_DESCRIPTION as *const [u8] as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_ENDIAN,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_ENDIAN,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_U32,
value: &TA_ENDIAN as *const u32 as _,
},
optee_utee_sys::user_ta_property {
name: optee_utee_sys::TA_PROP_STR_DOES_NOT_CLOSE_HANDLE_ON_CORRUPT_OBJECT,
prop_type: optee_utee_sys::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
optee_utee::raw::user_ta_property {
name: optee_utee::raw::TA_PROP_STR_DOES_NOT_CLOSE_HANDLE_ON_CORRUPT_OBJECT,
prop_type: optee_utee::raw::user_ta_prop_type::USER_TA_PROP_TYPE_BOOL,
value: &DONT_CLOSE_HANDLE_ON_CORRUPT_OBJECT as *const bool as _,
},
];
#[unsafe(no_mangle)]
#[unsafe(link_section = ".ta_head")]
pub static ta_head: optee_utee_sys::ta_head = optee_utee_sys::ta_head {
uuid: optee_utee_sys::TEE_UUID {
pub static ta_head: optee_utee::raw::ta_head = optee_utee::raw::ta_head {
uuid: optee_utee::raw::TEE_UUID {
timeLow: 642817260u32,
timeMid: 18987u16,
timeHiAndVersion: 18741u16,
Expand Down
Loading
Loading