From 8faf830ea7db880400f9fc7663a34d8d22acacb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sosth=C3=A8ne=20Gu=C3=A9don?= Date: Fri, 29 Aug 2025 16:33:54 +0200 Subject: [PATCH] Update trussed for heapless 0.9 --- Cargo.toml | 6 +++--- extensions/chunked/Cargo.toml | 2 +- extensions/chunked/src/lib.rs | 6 +++--- extensions/chunked/src/utils.rs | 2 +- extensions/fs-info/src/lib.rs | 2 +- extensions/hkdf/src/lib.rs | 2 +- extensions/hpke/src/lib.rs | 2 +- extensions/manage/src/lib.rs | 2 +- extensions/wrap-key-to-file/Cargo.toml | 2 +- extensions/wrap-key-to-file/src/lib.rs | 6 +++--- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9ab72e4..71d6c8d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ trussed-fs-info = { version = "0.2.0", optional = true } [dev-dependencies] hex-literal = "0.4.0" hmac = "0.12.0" -trussed = { version = "0.1.0", default-features = false, features = ["aes256-cbc", "crypto-client", "filesystem-client", "hmac-sha256", "virt", "x255"] } +trussed = { version = "0.1.0", default-features = false, features = ["aes256-cbc", "hmac-sha256", "virt", "x255"] } [features] default = [] @@ -83,8 +83,8 @@ log-warn = [] log-error = [] [patch.crates-io] -trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "ac106d63ab5e19021b0e37f0efb4313f8168a110" } - +trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "43ed1efcb19dc9c8bee45d4a1d3ad7dee2bba5ae" } +trussed-core = { git = "https://github.com/trussed-dev/trussed.git", rev = "43ed1efcb19dc9c8bee45d4a1d3ad7dee2bba5ae"} trussed-chunked = { path = "extensions/chunked" } trussed-hkdf = { path = "extensions/hkdf" } trussed-hpke = { path = "extensions/hpke" } diff --git a/extensions/chunked/Cargo.toml b/extensions/chunked/Cargo.toml index b387e65..f00a803 100644 --- a/extensions/chunked/Cargo.toml +++ b/extensions/chunked/Cargo.toml @@ -13,4 +13,4 @@ license.workspace = true [dependencies] serde.workspace = true serde-byte-array.workspace = true -trussed-core = { workspace = true, features = ["filesystem-client"] } +trussed-core = { workspace = true, features = ["filesystem-client"]} diff --git a/extensions/chunked/src/lib.rs b/extensions/chunked/src/lib.rs index ad408bb..09a4c16 100644 --- a/extensions/chunked/src/lib.rs +++ b/extensions/chunked/src/lib.rs @@ -10,9 +10,9 @@ pub mod utils; use serde::{Deserialize, Serialize}; use serde_byte_array::ByteArray; use trussed_core::{ + client::FilesystemClient, serde_extensions::{Extension, ExtensionClient, ExtensionResult}, types::{KeyId, Location, Message, PathBuf, UserAttribute}, - FilesystemClient, }; pub const CHACHA8_STREAM_NONCE_LEN: usize = 8; @@ -57,8 +57,8 @@ pub mod request { use super::*; use serde::{Deserialize, Serialize}; use serde_byte_array::ByteArray; + use trussed_core::error::Error; use trussed_core::types::{KeyId, Location, Message, PathBuf, UserAttribute}; - use trussed_core::Error; #[derive(Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct ReadChunk {} @@ -263,8 +263,8 @@ pub mod request { pub mod reply { use super::*; use serde::{Deserialize, Serialize}; + use trussed_core::error::Error; use trussed_core::types::Message; - use trussed_core::Error; #[derive(Debug, PartialEq, Eq, Deserialize, Serialize)] pub struct ReadChunk { diff --git a/extensions/chunked/src/utils.rs b/extensions/chunked/src/utils.rs index 9c749be..5c19e53 100644 --- a/extensions/chunked/src/utils.rs +++ b/extensions/chunked/src/utils.rs @@ -3,9 +3,9 @@ use serde_byte_array::ByteArray; use trussed_core::{ + error::Error, syscall, try_syscall, types::{KeyId, Location, Message, PathBuf, UserAttribute}, - Error, }; use crate::{ChunkedClient, CHACHA8_STREAM_NONCE_LEN}; diff --git a/extensions/fs-info/src/lib.rs b/extensions/fs-info/src/lib.rs index 9170298..25dd9fd 100644 --- a/extensions/fs-info/src/lib.rs +++ b/extensions/fs-info/src/lib.rs @@ -7,9 +7,9 @@ use serde::{Deserialize, Serialize}; use trussed_core::{ + error::Error, serde_extensions::{Extension, ExtensionClient, ExtensionResult}, types::Location, - Error, }; pub struct FsInfoExtension; diff --git a/extensions/hkdf/src/lib.rs b/extensions/hkdf/src/lib.rs index a4310bd..9371b27 100644 --- a/extensions/hkdf/src/lib.rs +++ b/extensions/hkdf/src/lib.rs @@ -8,9 +8,9 @@ use serde::{Deserialize, Serialize}; use trussed_core::{ config::MAX_MEDIUM_DATA_LENGTH, + error::Error, serde_extensions::{Extension, ExtensionClient, ExtensionResult}, types::{Bytes, KeyId, Location, Message}, - Error, }; #[derive(Clone, Copy, Debug, Serialize, Deserialize)] diff --git a/extensions/hpke/src/lib.rs b/extensions/hpke/src/lib.rs index acb4c0f..e56c358 100644 --- a/extensions/hpke/src/lib.rs +++ b/extensions/hpke/src/lib.rs @@ -11,9 +11,9 @@ use serde::{Deserialize, Serialize}; use serde_byte_array::ByteArray; +use trussed_core::error::Error; use trussed_core::serde_extensions::{Extension, ExtensionClient, ExtensionResult}; use trussed_core::types::{KeyId, Location, Message, PathBuf, ShortData}; -use trussed_core::Error; #[derive(Deserialize, Serialize)] pub enum HpkeRequest { diff --git a/extensions/manage/src/lib.rs b/extensions/manage/src/lib.rs index 0dab704..e3b1f65 100644 --- a/extensions/manage/src/lib.rs +++ b/extensions/manage/src/lib.rs @@ -8,8 +8,8 @@ use littlefs2_core::{path, Path, PathBuf}; use serde::{Deserialize, Serialize}; use trussed_core::{ + error::Error, serde_extensions::{Extension, ExtensionClient, ExtensionResult}, - Error, }; pub struct ManageExtension; diff --git a/extensions/wrap-key-to-file/Cargo.toml b/extensions/wrap-key-to-file/Cargo.toml index 9bcb1f7..3a2f097 100644 --- a/extensions/wrap-key-to-file/Cargo.toml +++ b/extensions/wrap-key-to-file/Cargo.toml @@ -12,4 +12,4 @@ license.workspace = true [dependencies] serde.workspace = true -trussed-core = { workspace = true, features = ["filesystem-client"] } +trussed-core.workspace = true diff --git a/extensions/wrap-key-to-file/src/lib.rs b/extensions/wrap-key-to-file/src/lib.rs index 826f4e7..48548c1 100644 --- a/extensions/wrap-key-to-file/src/lib.rs +++ b/extensions/wrap-key-to-file/src/lib.rs @@ -7,9 +7,9 @@ use serde::{Deserialize, Serialize}; use trussed_core::{ + client::ClientError, serde_extensions::{Extension, ExtensionClient, ExtensionResult}, types::{Bytes, KeyId, Location, Mechanism, PathBuf}, - ClientError, }; #[derive(Debug, Default)] @@ -25,8 +25,8 @@ pub enum WrapKeyToFileRequest { pub mod request { use super::*; use serde::{Deserialize, Serialize}; + use trussed_core::error::Error; use trussed_core::types::{KeyId, Location, Mechanism, Message, PathBuf}; - use trussed_core::Error; #[derive(Debug, Deserialize, Serialize)] pub struct WrapKeyToFile { @@ -90,7 +90,7 @@ pub enum WrapKeyToFileReply { pub mod reply { use serde::{Deserialize, Serialize}; - use trussed_core::{types::KeyId, Error}; + use trussed_core::{error::Error, types::KeyId}; use super::*;