This is an automated email from the ASF dual-hosted git repository.
ivila pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/teaclave-trustzone-sdk.git
The following commit(s) were added to refs/heads/main by this push:
new 47e51fa utee: Enhancement for Object APIs
47e51fa is described below
commit 47e51fa9bb5f477290cc1650e73ac611de58d0d9
Author: Matthew Shyu <[email protected]>
AuthorDate: Fri Jun 5 17:10:15 2026 +0800
utee: Enhancement for Object APIs
* Fix fn get_next, this function can run without ObjectInfo, moving
the parameter to Option<&mut ObjectInfo>.
* Add PrivateRee and PrivateRpmb to ObjectStorageConstants.
These two are OPTEE storage extensions.
---
crates/optee-utee/src/object/enum_handle.rs | 12 ++++++++----
crates/optee-utee/src/object/object_define.rs | 2 ++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/crates/optee-utee/src/object/enum_handle.rs
b/crates/optee-utee/src/object/enum_handle.rs
index 8f13124..81a94df 100644
--- a/crates/optee-utee/src/object/enum_handle.rs
+++ b/crates/optee-utee/src/object/enum_handle.rs
@@ -69,16 +69,20 @@ impl ObjectEnumHandle {
/// Get the next object in an enumeration and returns information about the
/// object: type, size, identifier, etc.
- pub fn get_next<T>(
+ pub fn get_next(
&mut self,
- object_info: &mut ObjectInfo,
+ object_info: Option<&mut ObjectInfo>,
object_id: &mut [u8],
) -> Result<u32> {
- let mut object_id_len: usize = 0;
+ let mut object_id_len = object_id.len();
+ let object_info = match object_info {
+ Some(a) => &mut a.raw,
+ None => core::ptr::null_mut(),
+ };
match unsafe {
raw::TEE_GetNextPersistentObject(
*self.raw,
- &mut object_info.raw,
+ object_info,
object_id.as_mut_ptr() as _,
&mut object_id_len,
)
diff --git a/crates/optee-utee/src/object/object_define.rs
b/crates/optee-utee/src/object/object_define.rs
index 88eac28..8069170 100644
--- a/crates/optee-utee/src/object/object_define.rs
+++ b/crates/optee-utee/src/object/object_define.rs
@@ -42,6 +42,8 @@ impl From<Whence> for raw::TEE_Whence {
#[repr(u32)]
pub enum ObjectStorageConstants {
Private = 0x00000001,
+ PrivateRee = 0x80000000,
+ PrivateRpmb = 0x80000100,
IllegalValue = 0x7FFFFFFF,
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
