Update trussed for heapless 0.9

Author: sosthene-nitrokey

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" }

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

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 {

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};

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;

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)]

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 {

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;

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

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::*;