Remove default features for Trussed

trussed-dev · Dec 20, 2024 · f0e5aa5 · f0e5aa5
1 parent c030b82
commit f0e5aa5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,21 +19,22 @@ serde = { version = "1", default-features = false }
 serde-byte-array = "0.1.2"
 sha2 = { version = "0.10.6", default-features = false }
 subtle = { version = "2.4.1", default-features = false }
-trussed = { version = "0.1.0", features = ["serde-extensions"] }
+trussed = { version = "0.1.0", default-features = false, features = ["serde-extensions"] }
+trussed-core = { version = "0.1", features = ["serde-extensions"] }
 littlefs2-core = "0.1.0"
 
 [dev-dependencies]
 quickcheck = { version = "1.0.3", default-features = false }
 rand_core = { version = "0.6.4", default-features = false, features = ["getrandom"] }
 serde_test = "1.0.176"
-trussed = { version = "0.1.0", features = ["serde-extensions", "virt"] }
+trussed = { version = "0.1.0", default-features = false, features = ["crypto-client", "filesystem-client", "hmac-sha256", "serde-extensions", "virt"] }
 admin-app = { version = "0.1.0", features = ["migration-tests"] }
 serde_cbor = { version = "0.11.2", features = ["std"] }
 hex-literal = "0.4.1"
 
 [patch.crates-io]
-trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "046478b7a4f6e2315acf9112d98308379c2e3eee" }
-trussed-manage = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "manage-v0.1.0" }
-ctaphid-dispatch = { git = "https://github.com/trussed-dev/ctaphid-dispatch.git", rev = "57cb3317878a8593847595319aa03ef17c29ec5b" }
-admin-app = { git = "https://github.com/Nitrokey/admin-app.git", tag = "v0.1.0-nitrokey.18" }
-cbor-smol = { git = "https://github.com/Nitrokey/cbor-smol.git", tag = "v0.4.0-nitrokey.2" }
+trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "8a9bb9d79e40c2dcf026cf611302109f776bec83" }
+trussed-core = { git = "https://github.com/trussed-dev/trussed.git", rev = "8a9bb9d79e40c2dcf026cf611302109f776bec83" }
+trussed-manage = { git = "https://github.com/trussed-dev/trussed-staging.git", branch = "trussed-core" }
+ctaphid-dispatch = { git = "https://github.com/trussed-dev/ctaphid-dispatch.git", branch = "trussed-core" }
+admin-app = { git = "https://github.com/Nitrokey/admin-app.git", branch = "trussed-core" }
diff --git a/src/extension.rs b/src/extension.rs
@@ -7,7 +7,7 @@ pub mod reply;
 pub mod request;
 
 use serde::{Deserialize, Serialize};
-use trussed::{
+use trussed_core::{
     serde_extensions::{Extension, ExtensionClient, ExtensionResult},
     types::{KeyId, Message},
 };

diff --git a/src/extension/reply.rs b/src/extension/reply.rs
@@ -2,10 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 or MIT
 
 use serde::{Deserialize, Serialize};
-use trussed::{
-    error::{Error, Result},
-    types::KeyId,
-};
+use trussed_core::{types::KeyId, Error, Result};
 
 use super::AuthReply;
 

diff --git a/src/extension/request.rs b/src/extension/request.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 or MIT
 
 use serde::{Deserialize, Serialize};
-use trussed::types::{KeyId, Message};
+use trussed_core::types::{KeyId, Message};
 
 use super::AuthRequest;
 use crate::{Pin, PinId};

diff --git a/src/lib.rs b/src/lib.rs
@@ -26,7 +26,7 @@
 //! # Examples
 //!
 //! ```
-//! use trussed::{Bytes, syscall};
+//! use trussed_core::{types::Bytes, syscall};
 //! use trussed_auth::{AuthClient, PinId};
 //!
 //! #[repr(u8)]
@@ -69,7 +69,7 @@ use core::str::FromStr;
 
 use littlefs2_core::{path, Path, PathBuf};
 use serde::{Deserialize, Serialize};
-use trussed::{config::MAX_SHORT_DATA_LENGTH, types::Bytes};
+use trussed_core::{config::MAX_SHORT_DATA_LENGTH, types::Bytes};
 
 pub use backend::{AuthBackend, AuthContext, FilesystemLayout, MAX_HW_KEY_LEN};
 pub use extension::{
@@ -174,7 +174,7 @@ impl FromStr for PinId {
 #[cfg(test)]
 mod tests {
     use super::PinId;
-    use trussed::types::PathBuf;
+    use trussed_core::types::PathBuf;
 
     #[test]
     fn pin_id_path() {