crates: update dependencies

ivila · ivila · commit c7dc0627128b · 2026-04-02T11:31:44.000+08:00
diff --git a/crates/Cargo.toml b/crates/Cargo.toml
@@ -47,14 +47,14 @@ optee-utee = { version = "0.8.0", path = "optee-utee" }
 optee-utee-macros = { version = "0.8.0", path = "optee-utee-macros" }
 optee-utee-sys = { version = "0.8.0", path = "optee-utee-sys" }
 
-bitflags = "1.0.4"
-num_enum = "0.7.3"
+bitflags = "2.11.0"
+num_enum = "0.7.6"
 uuid = { version = "1.23", default-features = false }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
 quote = "1.0"
 syn = { version = "2.0", features = ["full"] }
-libc = "0.2.48" 
-rand = "0.8.5"
+libc = "0.2" 
+rand = "0.10"
 once_cell = "1.20.2"
-serde = { version = "1.0.215" }
-serde_json = { version = "1.0.133" }
+serde = { version = "1.0.228" }
+serde_json = { version = "1.0.149" }
diff --git a/crates/cargo-optee/Cargo.toml b/crates/cargo-optee/Cargo.toml
@@ -22,7 +22,7 @@ version.workspace = true
 authors.workspace = true
 license.workspace = true
 repository.workspace = true
-edition = "2021"
+edition.workspace = true
 
 [[bin]]
 name = "cargo-optee"
diff --git a/crates/optee-teec-macros/Cargo.toml b/crates/optee-teec-macros/Cargo.toml
@@ -22,7 +22,7 @@ version.workspace = true
 authors.workspace = true
 license.workspace = true
 repository.workspace = true
-edition = "2018"
+edition.workspace = true
 
 [lib]
 proc-macro = true
diff --git a/crates/optee-teec-sys/Cargo.toml b/crates/optee-teec-sys/Cargo.toml
@@ -22,7 +22,7 @@ version.workspace = true
 authors.workspace = true
 license.workspace = true
 repository.workspace = true
-edition = "2018"
+edition.workspace = true
 links = "teec"
 
 [dependencies]
diff --git a/crates/optee-teec-sys/src/tee_client_api.rs b/crates/optee-teec-sys/src/tee_client_api.rs
@@ -168,7 +168,7 @@ pub struct TEEC_Operation {
     pub imp: TEEC_Operation__Imp,
 }
 
-extern "C" {
+unsafe extern "C" {
     pub fn TEEC_InitializeContext(name: *const c_char, context: *mut TEEC_Context) -> TEEC_Result;
     pub fn TEEC_FinalizeContext(context: *mut TEEC_Context);
     pub fn TEEC_OpenSession(context: *mut TEEC_Context,
diff --git a/crates/optee-teec-systest/Cargo.toml b/crates/optee-teec-systest/Cargo.toml
@@ -22,7 +22,7 @@ version.workspace = true
 authors.workspace = true
 license.workspace = true
 repository.workspace = true
-edition = "2018"
+edition.workspace = true
 publish = false
 
 [dependencies]
diff --git a/crates/optee-teec/Cargo.toml b/crates/optee-teec/Cargo.toml
@@ -22,7 +22,7 @@ version.workspace = true
 authors.workspace = true
 license.workspace = true
 repository.workspace = true
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
 optee-teec-sys.workspace = true
diff --git a/crates/optee-utee-build/Cargo.toml b/crates/optee-utee-build/Cargo.toml
@@ -22,7 +22,7 @@ version.workspace = true
 authors.workspace = true
 license.workspace = true
 repository.workspace = true
-edition = "2018"
+edition.workspace = true
 
 [dependencies]
 quote.workspace = true
diff --git a/crates/optee-utee-systest/Cargo.toml b/crates/optee-utee-systest/Cargo.toml
@@ -26,7 +26,6 @@ edition.workspace = true
 
 [dependencies]
 optee-utee-sys.workspace = true
-libc.workspace = true
 
 [build-dependencies]
 ctest = "0.5"
diff --git a/crates/optee-utee/Cargo.toml b/crates/optee-utee/Cargo.toml
@@ -31,7 +31,7 @@ bitflags.workspace = true
 uuid.workspace = true
 hex.workspace = true
 libc_alloc = "1.0.5"
-strum_macros = "0.26"
+strum = { version = "0.28", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
 rand.workspace = true
diff --git a/crates/optee-utee/src/extension.rs b/crates/optee-utee/src/extension.rs
@@ -180,11 +180,12 @@ pub mod test_loadable_plugin {
     use super::*;
     use alloc::string::ToString;
     use optee_utee_sys::{mock_api, mock_utils::SERIAL_TEST_LOCK};
-    use rand::Rng;
-    use rand::distributions::Alphanumeric;
+    use rand::distr::Alphanumeric;
 
     fn generate_random_bytes(len: usize) -> Vec<u8> {
-        rand::thread_rng()
+        use rand::RngExt;
+
+        rand::rng()
             .sample_iter(&Alphanumeric)
             .take(len)
             .collect()
diff --git a/crates/optee-utee/src/identity.rs b/crates/optee-utee/src/identity.rs
@@ -17,7 +17,6 @@
 
 use crate::Uuid;
 use optee_utee_sys as raw;
-use strum_macros::Display;
 
 #[derive(Copy, Clone)]
 pub struct Identity {
@@ -49,7 +48,7 @@ impl From<raw::TEE_Identity> for Identity {
     }
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Display)]
+#[derive(Copy, Clone, PartialEq, Eq, strum::Display)]
 #[repr(u32)]
 pub enum LoginType {
     Public = raw::TEE_LOGIN_PUBLIC,
diff --git a/crates/rustls_provider/Cargo.toml b/crates/rustls_provider/Cargo.toml
@@ -30,7 +30,5 @@ optee-utee.workspace = true
 rustls = { version = "0.23.12", default-features = false, features = ["std"] }
 rustls-rustcrypto = "0.0.2-alpha"
 getrandom = "0.2" 
-
-# Pin these crates for compatibility with our Rustc version nightly-2024-05-15
-base64ct = "=1.6.0"
-ed25519-dalek = "=2.1.0"
+base64ct = "1.8.3"
+ed25519-dalek = "2.2.0"

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ pub struct TEEC_Operation {`
`168`	`168`	`pub imp: TEEC_Operation__Imp,`
`169`	`169`	`}`
`170`	`170`
`171`		`-extern "C" {`
	`171`	`+unsafe extern "C" {`
`172`	`172`	`pub fn TEEC_InitializeContext(name: const c_char, context: mut TEEC_Context) -> TEEC_Result;`
`173`	`173`	`pub fn TEEC_FinalizeContext(context: *mut TEEC_Context);`
`174`	`174`	`pub fn TEEC_OpenSession(context: *mut TEEC_Context,`