Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,17 @@

-

[All Changes](https://github.com/trussed-dev/pc-usbip-runner/compare/v0.1.0...HEAD)
[All Changes](https://github.com/trussed-dev/pc-usbip-runner/compare/v0.2.0...HEAD)

## [v0.2.0](https://github.com/trussed-dev/pc-usbip-runner/releases/tag/v0.2.0) (2026-09-09)

- Update dependencies:
- `usb-device` v0.3
- `usbip-device` v0.2
- `usbd-ctaphid` v0.5
- `usbd-ccid` v0.5

[All Changes](https://github.com/trussed-dev/pc-usbip-runner/compare/v0.1.0...v0.2.0)

## [v0.1.0](https://github.com/trussed-dev/pc-usbip-runner/releases/tag/v0.1.0) (2026-06-22)

Expand Down
38 changes: 29 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "trussed-usbip"
version = "0.1.0"
version = "0.2.0"
description = "USBIP runner for trussed applications"
authors = ["The Trussed developers", "Nicolas Stalder <n@stalder.io>", "Conor Patrick <conor@solokeys.com>", "Szczepan Zalega <szczepan@nitrokey.com>"]
repository = "https://github.com/trussed-dev/pc-usbip-runner"
Expand All @@ -14,16 +14,16 @@ 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.2", default-features = false, features = ["log-all", "virt"] }
usb-device = { version = "0.2.7", default-features = false }
usbip-device = "0.1.5"
usb-device = { version = "0.3.2", default-features = false }
usbip-device = "0.2"

# ctaphid
ctaphid-dispatch = { version = "0.4", features = ["log-all"], optional = true }
usbd-ctaphid = { version = "0.4", features = ["log-all"], optional = true }
usbd-ctaphid = { version = "0.5", features = ["log-all"], optional = true }

# ccid
apdu-dispatch = { version = "0.4", optional = true }
usbd-ccid = { version = "0.4", features = ["log-all"], optional = true }
usbd-ccid = { version = "0.5", features = ["log-all"], optional = true }

[dev-dependencies]
clap = { version = "3.0.0", features = ["derive"] }
Expand Down
18 changes: 13 additions & 5 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -273,17 +273,25 @@ fn build_device<'a, B: UsbBus>(
bus_allocator: &'a UsbBusAllocator<B>,
options: &'a Options,
) -> UsbDevice<'a, B> {
let mut usb_builder = UsbDeviceBuilder::new(bus_allocator, options.vid_pid());
use usb_device::prelude::{LangID, StringDescriptors};

let mut strings = StringDescriptors::new(LangID::EN);
if let Some(manufacturer) = &options.manufacturer {
usb_builder = usb_builder.manufacturer(manufacturer);
strings = strings.manufacturer(manufacturer);
}
if let Some(product) = &options.product {
usb_builder = usb_builder.product(product);
strings = strings.product(product);
}
if let Some(serial_number) = &options.serial_number {
usb_builder = usb_builder.serial_number(serial_number);
strings = strings.serial_number(serial_number);
}
usb_builder.device_class(0x03).device_sub_class(0).build()

UsbDeviceBuilder::new(bus_allocator, options.vid_pid())
.strings(&[strings])
.expect("failed to set USB string descriptors")
.device_class(0x03)
.device_sub_class(0)
.build()
}

#[derive(Default)]
Expand Down
Loading