diff --git a/crates/Cargo.toml b/crates/Cargo.toml index d81ef010..f3383fa8 100644 --- a/crates/Cargo.toml +++ b/crates/Cargo.toml @@ -49,17 +49,31 @@ optee-utee = { version = "0.9.0", path = "optee-utee" } optee-utee-macros = { version = "0.9.0", path = "optee-utee-macros" } optee-utee-sys = { version = "0.9.0", path = "optee-utee-sys" } -bitflags = "2.11.0" +bitflags = "2.13.1" num_enum = { version = "0.7.6", default-features = false } 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"] } -proc-macro2 = "1.0.92" -libc = "0.2" +hex = { version = "0.4.3", default-features = false, features = ["alloc"] } +quote = "1.0.46" +syn = { version = "2.0.117", features = ["full"] } +proc-macro2 = "1.0.106" +libc = "0.2.184" rand = "0.10" -once_cell = "1.20.2" +once_cell = "1.21.4" serde = { version = "1.0.228" } serde_json = { version = "1.0.149" } log = "0.4.29" document-features = "0.2.12" +ctest = "0.5.1" +cc = "1.2.67" +prettyplease = "0.2.37" +libc_alloc = "1.0.7" +strum = { version = "0.28", default-features = false } +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" diff --git a/crates/optee-teec-systest/Cargo.toml b/crates/optee-teec-systest/Cargo.toml index a75d457b..d055da2e 100644 --- a/crates/optee-teec-systest/Cargo.toml +++ b/crates/optee-teec-systest/Cargo.toml @@ -29,4 +29,4 @@ publish = false optee-teec-sys.workspace = true [build-dependencies] -ctest = "0.5" +ctest = { workspace = true } diff --git a/crates/optee-utee-build/Cargo.toml b/crates/optee-utee-build/Cargo.toml index 2bb2ec39..1933eea8 100644 --- a/crates/optee-utee-build/Cargo.toml +++ b/crates/optee-utee-build/Cargo.toml @@ -28,5 +28,5 @@ edition.workspace = true quote.workspace = true proc-macro2.workspace = true syn.workspace = true -prettyplease = "0.2.25" +prettyplease = { workspace = true } uuid.workspace = true diff --git a/crates/optee-utee-sys/Cargo.toml b/crates/optee-utee-sys/Cargo.toml index 3a0de86b..3e6d330c 100644 --- a/crates/optee-utee-sys/Cargo.toml +++ b/crates/optee-utee-sys/Cargo.toml @@ -26,7 +26,7 @@ edition.workspace = true links = "utee" [dependencies] -mockall = { version = "0.14.0", optional = true } +mockall = { workspace = true, optional = true } document-features.workspace = true [features] diff --git a/crates/optee-utee-systest/Cargo.toml b/crates/optee-utee-systest/Cargo.toml index 4ce7d671..a9631909 100644 --- a/crates/optee-utee-systest/Cargo.toml +++ b/crates/optee-utee-systest/Cargo.toml @@ -28,5 +28,5 @@ edition.workspace = true optee-utee-sys.workspace = true [build-dependencies] -ctest = "0.5" -cc = "1.2.19" +ctest = { workspace = true } +cc = { workspace = true } diff --git a/crates/optee-utee/Cargo.toml b/crates/optee-utee/Cargo.toml index d6b5dea8..842249ea 100644 --- a/crates/optee-utee/Cargo.toml +++ b/crates/optee-utee/Cargo.toml @@ -30,8 +30,8 @@ optee-utee-macros.workspace = true bitflags.workspace = true uuid.workspace = true hex.workspace = true -libc_alloc = "1.0.5" -strum = { version = "0.28", default-features = false, features = ["derive"] } +libc_alloc = { workspace = true } +strum = { workspace = true, default-features = false, features = ["derive"] } document-features.workspace = true num_enum.workspace = true diff --git a/crates/rustls_provider/Cargo.toml b/crates/rustls_provider/Cargo.toml index 4caf4b6c..1916d7fc 100644 --- a/crates/rustls_provider/Cargo.toml +++ b/crates/rustls_provider/Cargo.toml @@ -27,8 +27,8 @@ publish = false [dependencies] optee-utee.workspace = true -rustls = { version = "0.23.12", default-features = false, features = ["std"] } -rustls-rustcrypto = "0.0.2-alpha" -getrandom = "0.2" -base64ct = "1.8.3" -ed25519-dalek = "2.2.0" +rustls = { workspace = true, default-features = false, features = ["std"] } +rustls-rustcrypto = { workspace = true } +getrandom = { workspace = true } +base64ct = { workspace = true } +ed25519-dalek = { workspace = true } diff --git a/crates/secure_db/Cargo.toml b/crates/secure_db/Cargo.toml index 993c59b9..e63f22d1 100644 --- a/crates/secure_db/Cargo.toml +++ b/crates/secure_db/Cargo.toml @@ -28,7 +28,7 @@ publish = false optee-utee-sys.workspace = true optee-utee.workspace = true -bincode = "1.3.3" -anyhow = "1.0" +bincode = { workspace = true } +anyhow = { workspace = true } serde = { workspace = true, features = ["derive"] } -hashbrown = { version = "0.15.4", features = ["serde"] } +hashbrown = { workspace = true, features = ["serde"] } diff --git a/examples/ca/Cargo.lock b/examples/ca/Cargo.lock index 3b5fda38..f82f72c8 100644 --- a/examples/ca/Cargo.lock +++ b/examples/ca/Cargo.lock @@ -26,18 +26,6 @@ dependencies = [ "proto", ] -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aligned" version = "0.4.3" @@ -319,9 +307,9 @@ checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901" [[package]] name = "clap" -version = "4.6.1" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" +checksum = "dd059f9da4f5c36b3787f65d38ccaab1cc315f07b01f89abc8359ee6a8205011" dependencies = [ "clap_builder", "clap_derive", @@ -329,9 +317,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.0" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" +checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b" dependencies = [ "anstream", "anstyle", @@ -442,6 +430,17 @@ dependencies = [ "proto", ] +[[package]] +name = "displaydoc" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "document-features" version = "0.2.12" @@ -709,14 +708,107 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +[[package]] +name = "icu_collections" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +dependencies = [ + "displaydoc", + "potential_utf", + "utf8_iter", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" + +[[package]] +name = "icu_properties" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" + +[[package]] +name = "icu_provider" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + [[package]] name = "idna" -version = "0.5.0" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", ] [[package]] @@ -855,6 +947,12 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" +[[package]] +name = "litemap" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" + [[package]] name = "litrs" version = "1.0.0" @@ -913,12 +1011,12 @@ dependencies = [ [[package]] name = "metrics" -version = "0.23.1" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3045b4193fbdc5b5681f32f11070da9be3609f189a79f3390706d42587f46bb5" +checksum = "89550ee9f79e88fef3119de263694973a8adb26c21d75322164fb8c493039fe2" dependencies = [ - "ahash", "portable-atomic", + "rapidhash", ] [[package]] @@ -951,9 +1049,9 @@ dependencies = [ [[package]] name = "mobc" -version = "0.8.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "316a7d198b51958a0ab57248bf5f42d8409551203cb3c821d5925819a8d5415f" +checksum = "4ee4c321f7581ff6d3b02c1fd05dc0b1f17c05f23c8532d1af9413890ab5fab5" dependencies = [ "async-trait", "futures-channel", @@ -1215,6 +1313,15 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" +[[package]] +name = "potential_utf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +dependencies = [ + "zerovec", +] + [[package]] name = "ppv-lite86" version = "0.2.21" @@ -1383,6 +1490,15 @@ dependencies = [ "proto", ] +[[package]] +name = "rapidhash" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da7e78a036ce858e8d55b7e7dc8ba3a88b78350fd2155d3591bbd966b58589e" +dependencies = [ + "rustversion", +] + [[package]] name = "rav1e" version = "0.8.1" @@ -1696,18 +1812,18 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664" dependencies = [ "heck", "proc-macro2", @@ -1741,6 +1857,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "syslog_plugin" version = "0.4.0" @@ -1848,20 +1975,15 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.12.0" +name = "tinystr" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tls_client-rs" version = "0.4.0" @@ -1955,27 +2077,12 @@ dependencies = [ "proto", ] -[[package]] -name = "unicode-bidi" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" - [[package]] name = "unicode-ident" version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" -[[package]] -name = "unicode-normalization" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" -dependencies = [ - "tinyvec", -] - [[package]] name = "untrusted" version = "0.9.0" @@ -2013,13 +2120,14 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -2028,6 +2136,12 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e" +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -2236,12 +2350,41 @@ version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" +[[package]] +name = "writeable" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" + [[package]] name = "y4m" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448" +[[package]] +name = "yoke" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.8.54" @@ -2262,12 +2405,66 @@ dependencies = [ "syn", ] +[[package]] +name = "zerofrom" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zeroize" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" +[[package]] +name = "zerotrie" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zmij" version = "1.0.22" diff --git a/examples/ca/Cargo.toml b/examples/ca/Cargo.toml index 65cefdbb..7fdeb265 100644 --- a/examples/ca/Cargo.toml +++ b/examples/ca/Cargo.toml @@ -19,6 +19,29 @@ resolver = "2" members = ["*-rs", "*-rs-plugin"] +[workspace.dependencies] +proto = { path = "../ta/proto" } +optee-teec = { path = "../../crates/optee-teec" } +optee-teec-build = { path = "../../crates/optee-teec-build" } +libc = "0.2.186" +r2d2 = "0.8.10" +clap = "4.6.2" +anyhow = "1.0.103" +hex = "0.4.3" +mobc = "0.9.0" +tokio = "1.52.3" +strum = "0.28.0" +url = "2.5.8" +serde_json = "1.0.150" +rand = "0.9.5" +rust-mnist = "0.2.0" +bytemuck = "1.25.1" +image = "0.25.10" +tiny_http = "0.12.0" +ureq = "3.3.0" +flate2 = "1.1.9" +uuid = "1.23" + [profile.release] lto = true strip = true diff --git a/examples/ca/acipher-rs/Cargo.toml b/examples/ca/acipher-rs/Cargo.toml index d0189b9c..64f86f99 100644 --- a/examples/ca/acipher-rs/Cargo.toml +++ b/examples/ca/acipher-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/aes-rs/Cargo.toml b/examples/ca/aes-rs/Cargo.toml index 238f6a11..9577ddf9 100644 --- a/examples/ca/aes-rs/Cargo.toml +++ b/examples/ca/aes-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/authentication-rs/Cargo.toml b/examples/ca/authentication-rs/Cargo.toml index 3582b01e..052cb8b3 100644 --- a/examples/ca/authentication-rs/Cargo.toml +++ b/examples/ca/authentication-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/big_int-rs/Cargo.toml b/examples/ca/big_int-rs/Cargo.toml index bbeb77f5..817abbb1 100644 --- a/examples/ca/big_int-rs/Cargo.toml +++ b/examples/ca/big_int-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/build_with_optee_utee_sys-rs/Cargo.toml b/examples/ca/build_with_optee_utee_sys-rs/Cargo.toml index 95565df4..66b77730 100644 --- a/examples/ca/build_with_optee_utee_sys-rs/Cargo.toml +++ b/examples/ca/build_with_optee_utee_sys-rs/Cargo.toml @@ -25,6 +25,5 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } - +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/client_pool-rs/Cargo.toml b/examples/ca/client_pool-rs/Cargo.toml index f3118d5c..e10b00d4 100644 --- a/examples/ca/client_pool-rs/Cargo.toml +++ b/examples/ca/client_pool-rs/Cargo.toml @@ -25,12 +25,12 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } -r2d2 = "0.8.10" -clap = { version = "4.5.32", features = ["derive"] } -anyhow = "1.0.97" -hex = "0.4.3" -mobc = "0.8.5" -tokio = { version = "1.44.1", features = ["rt-multi-thread", "sync"] } -strum = { version = "0.27.1", features = ["derive"] } +proto = { workspace = true } +optee-teec = { workspace = true } +r2d2 = { workspace = true } +clap = { workspace = true, features = ["derive"] } +anyhow = { workspace = true } +hex = { workspace = true } +mobc = { workspace = true } +tokio = { workspace = true, features = ["rt-multi-thread", "sync"] } +strum = { workspace = true, features = ["derive"] } diff --git a/examples/ca/diffie_hellman-rs/Cargo.toml b/examples/ca/diffie_hellman-rs/Cargo.toml index a4c1e716..287c71d7 100644 --- a/examples/ca/diffie_hellman-rs/Cargo.toml +++ b/examples/ca/diffie_hellman-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/digest-rs/Cargo.toml b/examples/ca/digest-rs/Cargo.toml index ef4154d0..02b855ba 100644 --- a/examples/ca/digest-rs/Cargo.toml +++ b/examples/ca/digest-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/error_handling-rs/Cargo.toml b/examples/ca/error_handling-rs/Cargo.toml index e59cfd48..f37fadf0 100644 --- a/examples/ca/error_handling-rs/Cargo.toml +++ b/examples/ca/error_handling-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "A test of Teaclave SDK's error handling capabilities" edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/hello_world-rs/Cargo.toml b/examples/ca/hello_world-rs/Cargo.toml index e7e27ead..a00ebb67 100644 --- a/examples/ca/hello_world-rs/Cargo.toml +++ b/examples/ca/hello_world-rs/Cargo.toml @@ -25,11 +25,11 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } [package.metadata.optee.ca] arch = "aarch64" debug = false -optee-client-export = { aarch64 = "/opt/teaclave/optee/optee_client/export_arm64", arm = "/opt/teaclave/optee/optee_client/export_arm32" } \ No newline at end of file +optee-client-export = { aarch64 = "/opt/teaclave/optee/optee_client/export_arm64", arm = "/opt/teaclave/optee/optee_client/export_arm32" } diff --git a/examples/ca/hotp-rs/Cargo.toml b/examples/ca/hotp-rs/Cargo.toml index ead76cf4..abb50117 100644 --- a/examples/ca/hotp-rs/Cargo.toml +++ b/examples/ca/hotp-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/inter_ta-rs/Cargo.toml b/examples/ca/inter_ta-rs/Cargo.toml index df24970a..9c19f163 100644 --- a/examples/ca/inter_ta-rs/Cargo.toml +++ b/examples/ca/inter_ta-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/message_passing_interface-rs/Cargo.toml b/examples/ca/message_passing_interface-rs/Cargo.toml index b3147058..04bc12a3 100644 --- a/examples/ca/message_passing_interface-rs/Cargo.toml +++ b/examples/ca/message_passing_interface-rs/Cargo.toml @@ -27,7 +27,7 @@ edition = "2018" [dependencies] # url 2.5.4 requires rustc 1.82, temporarily downgrade it. Remove the limitation # once we upgrade our STD rustc. -url = "=2.5.0" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } -serde_json = "1.0" +url = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } +serde_json = { workspace = true } diff --git a/examples/ca/mnist-rs/Cargo.toml b/examples/ca/mnist-rs/Cargo.toml index b4c0d9bd..4be87532 100644 --- a/examples/ca/mnist-rs/Cargo.toml +++ b/examples/ca/mnist-rs/Cargo.toml @@ -26,15 +26,15 @@ edition = "2021" publish = false [dependencies] -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } -clap = { version = "4.5.31", features = ["derive"] } -rand = "0.9.0" -rust-mnist = "0.2.0" -bytemuck = { version = "1.21.0", features = ["min_const_generics"] } -serde_json = "1.0.139" -image = "0.25.5" -tiny_http = "0.12.0" -anyhow = "1.0.97" -ureq = "3.0.8" -flate2 = "1.1.0" +proto = { workspace = true } +optee-teec = { workspace = true } +clap = { workspace = true, features = ["derive"] } +rand = { workspace = true } +rust-mnist = { workspace = true } +bytemuck = { workspace = true, features = ["min_const_generics"] } +serde_json = { workspace = true } +image = { workspace = true } +tiny_http = { workspace = true } +anyhow = { workspace = true } +ureq = { workspace = true } +flate2 = { workspace = true } diff --git a/examples/ca/property-rs/Cargo.toml b/examples/ca/property-rs/Cargo.toml index be581700..977c72c6 100644 --- a/examples/ca/property-rs/Cargo.toml +++ b/examples/ca/property-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/random-rs/Cargo.toml b/examples/ca/random-rs/Cargo.toml index 165f5846..b37597a9 100644 --- a/examples/ca/random-rs/Cargo.toml +++ b/examples/ca/random-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/secure_db_abstraction-rs/Cargo.toml b/examples/ca/secure_db_abstraction-rs/Cargo.toml index 43d547a9..c5620da6 100644 --- a/examples/ca/secure_db_abstraction-rs/Cargo.toml +++ b/examples/ca/secure_db_abstraction-rs/Cargo.toml @@ -25,5 +25,5 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/secure_storage-rs/Cargo.toml b/examples/ca/secure_storage-rs/Cargo.toml index d080564b..0cbe2656 100644 --- a/examples/ca/secure_storage-rs/Cargo.toml +++ b/examples/ca/secure_storage-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/serde-rs/Cargo.toml b/examples/ca/serde-rs/Cargo.toml index d023c648..156802da 100644 --- a/examples/ca/serde-rs/Cargo.toml +++ b/examples/ca/serde-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -serde_json = "1.0" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +serde_json = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/signature_verification-rs/Cargo.toml b/examples/ca/signature_verification-rs/Cargo.toml index 8da278e6..4ffeb3f9 100644 --- a/examples/ca/signature_verification-rs/Cargo.toml +++ b/examples/ca/signature_verification-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/supp_plugin-rs-plugin/Cargo.toml b/examples/ca/supp_plugin-rs-plugin/Cargo.toml index 317ba59b..943ab83f 100644 --- a/examples/ca/supp_plugin-rs-plugin/Cargo.toml +++ b/examples/ca/supp_plugin-rs-plugin/Cargo.toml @@ -25,15 +25,15 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec", features = ["macros"] } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true, features = ["macros"] } [build-dependencies] -optee-teec-build = { path = "../../../crates/optee-teec-build" } -uuid = { version = "1.23" } -proto = { path = "../../ta/proto" } -anyhow = "1.0" +optee-teec-build = { workspace = true } +uuid = { workspace = true } +proto = { workspace = true } +anyhow = { workspace = true } [lib] crate-type = ["cdylib"] diff --git a/examples/ca/supp_plugin-rs/Cargo.toml b/examples/ca/supp_plugin-rs/Cargo.toml index d0dadc5a..a6ae8099 100644 --- a/examples/ca/supp_plugin-rs/Cargo.toml +++ b/examples/ca/supp_plugin-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/tcp_client-rs/Cargo.toml b/examples/ca/tcp_client-rs/Cargo.toml index 1664e70a..15c49a61 100644 --- a/examples/ca/tcp_client-rs/Cargo.toml +++ b/examples/ca/tcp_client-rs/Cargo.toml @@ -25,7 +25,7 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } -tiny_http = "0.12.0" +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } +tiny_http = { workspace = true } diff --git a/examples/ca/time-rs/Cargo.toml b/examples/ca/time-rs/Cargo.toml index 4c3683b1..0896298f 100644 --- a/examples/ca/time-rs/Cargo.toml +++ b/examples/ca/time-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/tls_client-rs/Cargo.toml b/examples/ca/tls_client-rs/Cargo.toml index 6437277f..e471d59f 100644 --- a/examples/ca/tls_client-rs/Cargo.toml +++ b/examples/ca/tls_client-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/tls_server-rs/Cargo.toml b/examples/ca/tls_server-rs/Cargo.toml index cd4fe4eb..fe68962f 100644 --- a/examples/ca/tls_server-rs/Cargo.toml +++ b/examples/ca/tls_server-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ca/udp_socket-rs/Cargo.toml b/examples/ca/udp_socket-rs/Cargo.toml index 13e3026c..72e685cd 100644 --- a/examples/ca/udp_socket-rs/Cargo.toml +++ b/examples/ca/udp_socket-rs/Cargo.toml @@ -25,6 +25,6 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -libc = "0.2.48" -proto = { path = "../../ta/proto" } -optee-teec = { path = "../../../crates/optee-teec" } +libc = { workspace = true } +proto = { workspace = true } +optee-teec = { workspace = true } diff --git a/examples/ta/Cargo.lock b/examples/ta/Cargo.lock index 36132b15..4bbb30f9 100644 --- a/examples/ta/Cargo.lock +++ b/examples/ta/Cargo.lock @@ -146,9 +146,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.13.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" +checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" [[package]] name = "block-buffer" diff --git a/examples/ta/Cargo.toml b/examples/ta/Cargo.toml index 00e17fa0..6e669047 100644 --- a/examples/ta/Cargo.toml +++ b/examples/ta/Cargo.toml @@ -61,12 +61,22 @@ proto = { path = "proto" } optee-utee-sys = { path = "../../crates/optee-utee-sys" } optee-utee = { path = "../../crates/optee-utee", features = ["unwind_stubs"] } optee-utee-build = { path = "../../crates/optee-utee-build" } -bytemuck = { version = "1.21.0", features = ["min_const_generics"] } +rustls_provider = { path = "../../crates/rustls_provider" } +secure_db = { path = "../../crates/secure_db" } +common = { path = "mnist-rs/common" } +bytemuck = { version = "1.25.1", features = ["min_const_generics"] } burn = { version = "0.17", default-features = false, features = ["ndarray", "autodiff"] } spin = "0.9.8" -serde = { version = "1.0.218", default-features = false, features = ["derive"] } -serde_json = { version = "1.0.139", default-features = false, features = ["alloc"] } - +serde = { version = "1.0.228", default-features = false } +serde_json = { version = "1.0.150", default-features = false } +hex = { version = "0.4.3", default-features = false } +cfg_block = "0.2.0" +rustls = { version = "0.23.41", default-features = false } +webpki-roots = "1.0.4" +anyhow = "1.0.103" +getrandom = { version = "0.2.17", default-features = false } +lazy_static = "1.5.0" +num_enum = { version = "0.7.6", default-features = false } [profile.release] panic = "abort" lto = true diff --git a/examples/ta/acipher-rs/Cargo.toml b/examples/ta/acipher-rs/Cargo.toml index 736ed1bc..423a9f5a 100644 --- a/examples/ta/acipher-rs/Cargo.toml +++ b/examples/ta/acipher-rs/Cargo.toml @@ -25,17 +25,17 @@ description = "An example of Rust OP-TEE TrustZone SDK." edition = "2018" [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [features] default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/aes-rs/Cargo.toml b/examples/ta/aes-rs/Cargo.toml index 4ef2b7df..128d3065 100644 --- a/examples/ta/aes-rs/Cargo.toml +++ b/examples/ta/aes-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/authentication-rs/Cargo.toml b/examples/ta/authentication-rs/Cargo.toml index 6365d6b0..1675359c 100644 --- a/examples/ta/authentication-rs/Cargo.toml +++ b/examples/ta/authentication-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/big_int-rs/Cargo.toml b/examples/ta/big_int-rs/Cargo.toml index 88158446..cc40c721 100644 --- a/examples/ta/big_int-rs/Cargo.toml +++ b/examples/ta/big_int-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/build_with_optee_utee_sys-rs/Cargo.toml b/examples/ta/build_with_optee_utee_sys-rs/Cargo.toml index 1e4d9f69..f0defa65 100644 --- a/examples/ta/build_with_optee_utee_sys-rs/Cargo.toml +++ b/examples/ta/build_with_optee_utee_sys-rs/Cargo.toml @@ -29,14 +29,14 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys", features = ["no_link"] } +proto = { workspace = true } +optee-utee-build = { workspace = true } +optee-utee-sys = { workspace = true, features = ["no_link"] } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/client_pool-rs/Cargo.toml b/examples/ta/client_pool-rs/Cargo.toml index 1e23a467..f920a525 100644 --- a/examples/ta/client_pool-rs/Cargo.toml +++ b/examples/ta/client_pool-rs/Cargo.toml @@ -29,14 +29,14 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee", features = ["unwind_stubs"] } -hex = { version = "0.4.3", default-features = false } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true, features = ["unwind_stubs"] } +hex = { workspace = true, default-features = false } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/diffie_hellman-rs/Cargo.toml b/examples/ta/diffie_hellman-rs/Cargo.toml index 772006ed..60c1ca04 100644 --- a/examples/ta/diffie_hellman-rs/Cargo.toml +++ b/examples/ta/diffie_hellman-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/digest-rs/Cargo.toml b/examples/ta/digest-rs/Cargo.toml index 6334ac47..ab030f21 100644 --- a/examples/ta/digest-rs/Cargo.toml +++ b/examples/ta/digest-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/error_handling-rs/Cargo.toml b/examples/ta/error_handling-rs/Cargo.toml index 137ce843..b293f7d8 100644 --- a/examples/ta/error_handling-rs/Cargo.toml +++ b/examples/ta/error_handling-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/hello_world-rs/Cargo.toml b/examples/ta/hello_world-rs/Cargo.toml index 1b3ad891..d6169c3b 100644 --- a/examples/ta/hello_world-rs/Cargo.toml +++ b/examples/ta/hello_world-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/hotp-rs/Cargo.toml b/examples/ta/hotp-rs/Cargo.toml index d6e6767c..0603d2e7 100644 --- a/examples/ta/hotp-rs/Cargo.toml +++ b/examples/ta/hotp-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/inter_ta-rs/Cargo.toml b/examples/ta/inter_ta-rs/Cargo.toml index a1706def..5ee8062f 100644 --- a/examples/ta/inter_ta-rs/Cargo.toml +++ b/examples/ta/inter_ta-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/message_passing_interface-rs/Cargo.toml b/examples/ta/message_passing_interface-rs/Cargo.toml index c3bf706d..93d95a18 100644 --- a/examples/ta/message_passing_interface-rs/Cargo.toml +++ b/examples/ta/message_passing_interface-rs/Cargo.toml @@ -29,14 +29,14 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee", features = ["unwind_stubs"] } -serde_json = { version = "1.0", default-features = false, features = ["alloc"] } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true, features = ["unwind_stubs"] } +serde_json = { workspace = true, default-features = false, features = ["alloc"] } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/mnist-rs/inference/Cargo.toml b/examples/ta/mnist-rs/inference/Cargo.toml index a472f267..25713495 100644 --- a/examples/ta/mnist-rs/inference/Cargo.toml +++ b/examples/ta/mnist-rs/inference/Cargo.toml @@ -26,7 +26,7 @@ repository.workspace = true edition.workspace = true [dependencies] -common = { path = "../common" } +common = { workspace = true } proto = { workspace = true } optee-utee-sys = { workspace = true } optee-utee = { workspace = true } @@ -40,4 +40,4 @@ proto = { workspace = true } optee-utee-build = { workspace = true } [package.metadata.optee.ta] -uuid-path = "uuid.txt" \ No newline at end of file +uuid-path = "uuid.txt" diff --git a/examples/ta/mnist-rs/train/Cargo.toml b/examples/ta/mnist-rs/train/Cargo.toml index 287368e2..2c950960 100644 --- a/examples/ta/mnist-rs/train/Cargo.toml +++ b/examples/ta/mnist-rs/train/Cargo.toml @@ -26,7 +26,7 @@ repository.workspace = true edition.workspace = true [dependencies] -common = { path = "../common" } +common = { workspace = true } proto = { workspace = true } optee-utee-sys = { workspace = true } optee-utee = { workspace = true } @@ -40,4 +40,4 @@ proto = { workspace = true } optee-utee-build = { workspace = true } [package.metadata.optee.ta] -uuid-path = "uuid.txt" \ No newline at end of file +uuid-path = "uuid.txt" diff --git a/examples/ta/property-rs/Cargo.toml b/examples/ta/property-rs/Cargo.toml index 4775ba92..180f504a 100644 --- a/examples/ta/property-rs/Cargo.toml +++ b/examples/ta/property-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee", features = ["unwind_stubs"] } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true, features = ["unwind_stubs"] } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/proto/Cargo.toml b/examples/ta/proto/Cargo.toml index 5da8decb..467deb19 100644 --- a/examples/ta/proto/Cargo.toml +++ b/examples/ta/proto/Cargo.toml @@ -25,5 +25,5 @@ description = "Shared protocols for the Teaclave TrustZone SDK examples." edition = "2021" [dependencies] -num_enum = { version = "0.7.3", default-features = false } -serde = { version = "1.0.218", default-features = false, features = ["alloc", "derive"] } +num_enum = { workspace = true, default-features = false } +serde = { workspace = true, default-features = false, features = ["alloc", "derive"] } diff --git a/examples/ta/random-rs/Cargo.toml b/examples/ta/random-rs/Cargo.toml index 5019e257..0dbe568d 100644 --- a/examples/ta/random-rs/Cargo.toml +++ b/examples/ta/random-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/secure_db_abstraction-rs/Cargo.toml b/examples/ta/secure_db_abstraction-rs/Cargo.toml index 9c5e656c..2f83c089 100644 --- a/examples/ta/secure_db_abstraction-rs/Cargo.toml +++ b/examples/ta/secure_db_abstraction-rs/Cargo.toml @@ -29,17 +29,17 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys", features = ["std"] } -optee-utee = { path = "../../../crates/optee-utee", features = ["std"] } -secure_db = { path = "../../../crates/secure_db" } +proto = { workspace = true } +optee-utee-sys = { workspace = true, features = ["std"] } +optee-utee = { workspace = true, features = ["std"] } +secure_db = { workspace = true } -anyhow = "1.0" -serde = { version = "1.0", features = ["derive"] } +anyhow = { workspace = true } +serde = { workspace = true, features = ["derive"] } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/secure_storage-rs/Cargo.toml b/examples/ta/secure_storage-rs/Cargo.toml index c9635670..a3622e55 100644 --- a/examples/ta/secure_storage-rs/Cargo.toml +++ b/examples/ta/secure_storage-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/serde-rs/Cargo.toml b/examples/ta/serde-rs/Cargo.toml index 9b424fe7..04ed73e0 100644 --- a/examples/ta/serde-rs/Cargo.toml +++ b/examples/ta/serde-rs/Cargo.toml @@ -29,15 +29,15 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee", features = ["unwind_stubs"] } -serde = { version = "1.0", default-features = false, features = ["derive"] } -serde_json = { version = "1.0", default-features = false, features = ["alloc"] } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true, features = ["unwind_stubs"] } +serde = { workspace = true, default-features = false, features = ["derive"] } +serde_json = { workspace = true, default-features = false, features = ["alloc"] } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/signature_verification-rs/Cargo.toml b/examples/ta/signature_verification-rs/Cargo.toml index 5781344d..b4d04588 100644 --- a/examples/ta/signature_verification-rs/Cargo.toml +++ b/examples/ta/signature_verification-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/supp_plugin-rs/Cargo.toml b/examples/ta/supp_plugin-rs/Cargo.toml index b24e9671..b29dd8ed 100644 --- a/examples/ta/supp_plugin-rs/Cargo.toml +++ b/examples/ta/supp_plugin-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] -uuid-path = "ta_uuid.txt" \ No newline at end of file +uuid-path = "ta_uuid.txt" diff --git a/examples/ta/tcp_client-rs/Cargo.toml b/examples/ta/tcp_client-rs/Cargo.toml index 7049bc8d..513b523e 100644 --- a/examples/ta/tcp_client-rs/Cargo.toml +++ b/examples/ta/tcp_client-rs/Cargo.toml @@ -29,14 +29,14 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee", features = ["unwind_stubs"] } -cfg_block = "0.2.0" +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true, features = ["unwind_stubs"] } +cfg_block = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/tcp_client-rs/src/main.rs b/examples/ta/tcp_client-rs/src/main.rs index 6c1f9205..996271ae 100644 --- a/examples/ta/tcp_client-rs/src/main.rs +++ b/examples/ta/tcp_client-rs/src/main.rs @@ -31,7 +31,7 @@ cfg_block::cfg_block! { use std::io::{Read, Write}; } else { extern crate alloc; - use optee_utee::net::{StdCompatConnect, StdCompatWrite, StdCompatRead}; + use optee_utee::net::{StdCompatConnect, StdCompatRead, StdCompatWrite}; use alloc::vec::Vec; use alloc::string::String; } diff --git a/examples/ta/time-rs/Cargo.toml b/examples/ta/time-rs/Cargo.toml index 3b116c23..fd9e3c83 100644 --- a/examples/ta/time-rs/Cargo.toml +++ b/examples/ta/time-rs/Cargo.toml @@ -29,13 +29,13 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee" } +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/tls_client-rs/Cargo.toml b/examples/ta/tls_client-rs/Cargo.toml index 018ab943..5bff2230 100644 --- a/examples/ta/tls_client-rs/Cargo.toml +++ b/examples/ta/tls_client-rs/Cargo.toml @@ -29,21 +29,21 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys", features = ["std"] } -optee-utee = { path = "../../../crates/optee-utee", features = ["std"] } +proto = { workspace = true } +optee-utee-sys = { workspace = true, features = ["std"] } +optee-utee = { workspace = true, features = ["std"] } -rustls_provider = { path = "../../../crates/rustls_provider" } -rustls = { version = "0.23.12", default-features = false, features = ["std"] } -webpki-roots = "1" -anyhow = "1.0" +rustls_provider = { workspace = true } +rustls = { workspace = true, default-features = false, features = ["std"] } +webpki-roots = { workspace = true } +anyhow = { workspace = true } # Add getrandom and enable its custom feature, see more details in main.rs -getrandom = { version = "0.2", default-features = false, features = ["custom"] } +getrandom = { workspace = true, default-features = false, features = ["custom"] } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/tls_server-rs/Cargo.toml b/examples/ta/tls_server-rs/Cargo.toml index a0bf8f25..56d4817f 100644 --- a/examples/ta/tls_server-rs/Cargo.toml +++ b/examples/ta/tls_server-rs/Cargo.toml @@ -29,21 +29,21 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys", features = ["std"] } -optee-utee = { path = "../../../crates/optee-utee", features = ["std"] } +proto = { workspace = true } +optee-utee-sys = { workspace = true, features = ["std"] } +optee-utee = { workspace = true, features = ["std"] } -rustls_provider = { path = "../../../crates/rustls_provider" } -rustls = { version = "0.23.12", default-features = false, features = ["std"] } -lazy_static = { version = "1.4.0", features=["spin_no_std"] } -anyhow = "1.0" +rustls_provider = { workspace = true } +rustls = { workspace = true, default-features = false, features = ["std"] } +lazy_static = { workspace = true, features=["spin_no_std"] } +anyhow = { workspace = true } # Add getrandom and enable its custom feature, see more details in main.rs -getrandom = { version = "0.2", default-features = false, features = ["custom"] } +getrandom = { workspace = true, default-features = false, features = ["custom"] } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/udp_socket-rs/Cargo.toml b/examples/ta/udp_socket-rs/Cargo.toml index 95a965ea..3941c923 100644 --- a/examples/ta/udp_socket-rs/Cargo.toml +++ b/examples/ta/udp_socket-rs/Cargo.toml @@ -29,14 +29,14 @@ default = [] std = ["optee-utee/std", "optee-utee-sys/std"] [dependencies] -proto = { path = "../proto" } -optee-utee-sys = { path = "../../../crates/optee-utee-sys" } -optee-utee = { path = "../../../crates/optee-utee", features = ["unwind_stubs"] } -cfg_block = "0.2.0" +proto = { workspace = true } +optee-utee-sys = { workspace = true } +optee-utee = { workspace = true, features = ["unwind_stubs"] } +cfg_block = { workspace = true } [build-dependencies] -proto = { path = "../proto" } -optee-utee-build = { path = "../../../crates/optee-utee-build" } +proto = { workspace = true } +optee-utee-build = { workspace = true } [package.metadata.optee.ta] uuid-path = "uuid.txt" diff --git a/examples/ta/udp_socket-rs/src/main.rs b/examples/ta/udp_socket-rs/src/main.rs index 39361e73..6674ea25 100644 --- a/examples/ta/udp_socket-rs/src/main.rs +++ b/examples/ta/udp_socket-rs/src/main.rs @@ -31,7 +31,7 @@ cfg_block::cfg_block! { use std::io::{Read, Write}; } else { extern crate alloc; - use optee_utee::net::{StdCompatConnect, StdCompatWrite, StdCompatRead}; + use optee_utee::net::{StdCompatConnect, StdCompatRead, StdCompatWrite}; use alloc::vec::Vec; use alloc::string::String; }