Skip to content

chore(secure-storage): bump optee-utee crates to 0.8.0-rc.1 #35

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

Draft
TheButlah wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore(secure-storage): bump optee-utee crates to 0.8.0-rc.1 #35

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
117 changes: 47 additions & 70 deletions optee/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions optee/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,23 @@ rust-version = "1.91.1" # See rust-toolchain.toml

[workspace.dependencies]
anyhow = { version = "1.0.100", default-features = false }
optee-utee = "0.7.0"
optee-utee-build = "0.7.0"
optee-utee-sys = "0.7.0"
serde = { version = "1.0.228", default-features = false }
serde_json = { version = "1.0.145", default-features = false }
thiserror = { version = "2.0.17", default-features = false }
uuid = { version = "1.19.0", default-features = false }

[workspace.dependencies.optee-utee]
git = "https://github.com/apache/teaclave-trustzone-sdk"
tag = "v0.8.0-rc.1"

[workspace.dependencies.optee-utee-build]
git = "https://github.com/apache/teaclave-trustzone-sdk"
tag = "v0.8.0-rc.1"

[workspace.dependencies.optee-utee-sys]
git = "https://github.com/apache/teaclave-trustzone-sdk"
tag = "v0.8.0-rc.1"

# What we use when producing artifacts to distribute
[profile.artifact]
debug = false
Expand Down
2 changes: 1 addition & 1 deletion optee/secure-storage/ta/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ thiserror = { workspace = true, default-features = false }
uuid = { workspace = true, features = ["v5"] }

[build-dependencies]
optee-utee-build = "0.7.0"
optee-utee-build.workspace = true
orb-secure-storage-proto.path = "../proto"

[package.metadata.orb-optee]
Expand Down
2 changes: 1 addition & 1 deletion optee/secure-storage/ta/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ fn response_to_params<T: ResponseT>(
#[ta_create]
fn create() -> TeeResult<()> {
let ta_version = optee_utee::property::TaVersion.get().expect("infallible");
info!("TA version {}", ta_version);
msg!("TA version {}", ta_version);

Ok(())
}
Expand Down
9 changes: 9 additions & 0 deletions optee/secure-storage/ta/src/trace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#[repr(u8)]
pub enum TraceLevel {
Msg = 0,
Error = 1,
Info = 2,
Debug = 3,
Expand All @@ -20,6 +21,14 @@ impl TraceExt for optee_utee::trace::Trace {
}
}

#[macro_export]
macro_rules! msg {
($($arg:tt)*) => {{
<optee_utee::trace::Trace as $crate::trace::TraceExt>::set_level($crate::trace::TraceLevel::Msg);
optee_utee::trace_println!($($arg)*)
}};
}

#[macro_export]
macro_rules! error {
($($arg:tt)*) => {{
Expand Down
Loading