From 560f40a44fd7e37afab5ed3910a46e3abab2ec23 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Fri, 5 Jun 2026 16:03:03 +0200 Subject: [PATCH 1/4] Update to trussed v0.2.0-rc.1 --- Cargo.lock | 31 ++++++++++++------------------- Cargo.toml | 8 +++----- examples/dummy.rs | 4 ++-- src/lib.rs | 2 +- 4 files changed, 18 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 001c9cd..32a11ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -324,9 +324,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "typenum", @@ -631,7 +631,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1edcd5a338e64688fbdcb7531a846cfd3476a54784dcb918a0844682bc7ada5" dependencies = [ "hash32 0.3.1", - "serde", "stable_deref_trait", ] @@ -847,12 +846,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "nb" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" - [[package]] name = "nom" version = "7.1.3" @@ -1341,9 +1334,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.6.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" @@ -1477,29 +1470,28 @@ dependencies = [ [[package]] name = "trussed" -version = "0.1.0" -source = "git+https://github.com/trussed-dev/trussed.git?rev=0f8df68be879acdde1f8cf428c11e5d29692a47b#0f8df68be879acdde1f8cf428c11e5d29692a47b" +version = "0.2.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "400475917c40f07716c84b201a363012f6c9b1acdb4b38a5ed05e227539cd05c" dependencies = [ + "aead", "aes", "bitflags 2.9.4", "cbc", "cbor-smol", - "cfg-if", - "chacha20", "chacha20poly1305", + "cipher", "cosey", "delog", "des", "flexiber", "generic-array", - "heapless 0.9.1", "heapless-bytes", "hex-literal", "hmac 0.12.1", "interchange", "littlefs2", "littlefs2-core", - "nb", "p256-cortex-m4", "postcard", "rand_chacha", @@ -1514,9 +1506,9 @@ dependencies = [ [[package]] name = "trussed-core" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac4d4507be66aa1a5ba6921bed58d37af1e0118772e0a4955df58aa3cb4f5e8" +checksum = "0f17331879d2f22b2fec393716fd1bd50b018bfbf070b96e4cd6ee552aa3f710" dependencies = [ "heapless-bytes", "littlefs2-core", @@ -1544,6 +1536,7 @@ dependencies = [ "rand_chacha", "rand_core", "trussed", + "trussed-core", "usb-device", "usbd-ccid", "usbd-ctaphid", diff --git a/Cargo.toml b/Cargo.toml index 14ee051..b78a8ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ littlefs2-core = "0.1" log = { version = "0.4.14", default-features = false } rand_chacha = { version = "0.3", default-features = false } rand_core = { version = "0.6", features = ["getrandom"] } -trussed = { version = "0.1", default-features = false, features = ["log-all", "virt"] } +trussed = { version = "=0.2.0-rc.1", default-features = false, features = ["log-all", "virt"] } usb-device = { version = "0.2.7", default-features = false } usbip-device = "0.1.5" @@ -29,12 +29,10 @@ delog = { version = "0.1.6", features = ["std-log"] } heapless-bytes = "0.5" littlefs2 = "0.7" pretty_env_logger = "0.4.0" -trussed = "0.1" +trussed = "=0.2.0-rc.1" +trussed-core = "0.2" [features] default = ["ctaphid", "ccid"] ctaphid = ["ctaphid-dispatch", "usbd-ctaphid"] ccid = ["apdu-dispatch", "usbd-ccid"] - -[patch.crates-io] -trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "0f8df68be879acdde1f8cf428c11e5d29692a47b" } diff --git a/examples/dummy.rs b/examples/dummy.rs index f698cf2..de7c6a4 100644 --- a/examples/dummy.rs +++ b/examples/dummy.rs @@ -21,12 +21,12 @@ use littlefs2::{ use littlefs2_core::{path, DynFilesystem}; use trussed::{ backend::{CoreOnly, NoId}, - client::Client, pipe::{ServiceEndpoint, TrussedChannel}, service::Service, - syscall, types::{CoreContext, NoData}, + Client, }; +use trussed_core::syscall; use trussed_usbip::{Platform, Store, Syscall}; /// USP/IP based virtualization a Trussed device. diff --git a/src/lib.rs b/src/lib.rs index f84c96e..203e5c2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -256,7 +256,7 @@ impl Builder { #[derive(Clone)] pub struct Syscall(Sender<()>); -impl trussed::client::Syscall for Syscall { +impl trussed::platform::Syscall for Syscall { fn syscall(&mut self) { log::debug!("syscall"); self.0.send(()).ok(); From ca193da35916f3760792da029d3d57e26ee7ac84 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Tue, 9 Jun 2026 10:48:47 +0200 Subject: [PATCH 2/4] Document all features on docs.rs --- Cargo.toml | 3 +++ src/lib.rs | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index b78a8ae..7ed8b08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,3 +36,6 @@ trussed-core = "0.2" default = ["ctaphid", "ccid"] ctaphid = ["ctaphid-dispatch", "usbd-ctaphid"] ccid = ["apdu-dispatch", "usbd-ccid"] + +[package.metadata.docs.rs] +all-features = true diff --git a/src/lib.rs b/src/lib.rs index 203e5c2..74d9db2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,5 @@ +#![cfg_attr(docsrs, feature(doc_cfg))] + #[cfg(feature = "ccid")] mod ccid; #[cfg(feature = "ctaphid")] From 93a6163af134d65ac868f4135fcab7e23dcf93ef Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Tue, 9 Jun 2026 10:50:51 +0200 Subject: [PATCH 3/4] ci: Add publishing check --- .github/workflows/cd-test.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/cd-test.yml diff --git a/.github/workflows/cd-test.yml b/.github/workflows/cd-test.yml new file mode 100644 index 0000000..87303ec --- /dev/null +++ b/.github/workflows/cd-test.yml @@ -0,0 +1,15 @@ +name: Continuous delivery - test + +on: + pull_request: + # opened, reopenened, synchronize are the default types for pull_request + # labeled, unlabeled ensure this check is also run if a label is added or removed + types: [opened, reopened, synchronize, labeled, unlabeled] + +jobs: + test-publish: + runs-on: ubuntu-latest + if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-publish-check') }} + steps: + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - run: cargo publish --dry-run --package trussed-usbip From 47ad52d7438ab76f585878dae1c779df4cb2a99d Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Tue, 9 Jun 2026 10:54:22 +0200 Subject: [PATCH 4/4] Release v0.1.0-rc.1 --- CHANGELOG.md | 11 +++++++++++ Cargo.lock | 2 +- Cargo.toml | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..7ca6a12 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,11 @@ +# Changelog + +## Unreleased + +- + +[All Changes](https://github.com/trussed-dev/pc-usbip-runner/compare/v0.1.0-rc.1...HEAD) + +## [v0.1.0-rc.1](https://github.com/trussed-dev/pc-usbip-runner/releases/tag/v0.1.0-rc.1) (2026-06-09) + +Initial release for `trussed` v0.2.0-rc.1. diff --git a/Cargo.lock b/Cargo.lock index 32a11ca..40afbf8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1520,7 +1520,7 @@ dependencies = [ [[package]] name = "trussed-usbip" -version = "0.0.1" +version = "0.1.0-rc.1" dependencies = [ "apdu-dispatch", "clap", diff --git a/Cargo.toml b/Cargo.toml index 7ed8b08..b105f60 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "trussed-usbip" -version = "0.0.1" -authors = ["Nicolas Stalder ", "Conor Patrick ", "Szczepan Zalega "] +version = "0.1.0-rc.1" +authors = ["The Trussed developers", "Nicolas Stalder ", "Conor Patrick ", "Szczepan Zalega "] edition = "2021" [dependencies]