trussed/pc-usbip-runner
0
0
Fork 0
mirror of https://github.com/trussed-dev/pc-usbip-runner.git synced 2026-06-20 04:16:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation

Browse Source
This commit is contained in:
Sosthène Guédon
2023-06-20 16:25:25 +02:00
committed by Markus Meissner
parent ed63097d0b
commit 0a939a8c5a
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+3 -4
View File
@@ -49,7 +49,7 @@ dependencies = [
[[package]]
name = "apdu-dispatch"
version = "0.1.2"
source = "git+https://github.com/trussed-dev/apdu-dispatch?rev=6a2720d06930b715a7af9411a12c7fcf35d5995f#6a2720d06930b715a7af9411a12c7fcf35d5995f"
source = "git+https://github.com/sosthene-nitrokey/apdu-dispatch.git?rev=71ed5f7efadc621f43c5cad47#71ed5f7efadc621f43c5cad4786c9195c205c995"
dependencies = [
"delog",
"heapless",
@@ -687,8 +687,7 @@ dependencies = [
[[package]]
name = "iso7816"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7e6ac743d509349b7865595ce90bbfcfbe59f42b8ec0db9e76ec361ace3f652"
source = "git+https://github.com/sosthene-nitrokey/iso7816.git?rev=eee84fbb58f77d84f23c0fc793dac5ffe232aa5c#eee84fbb58f77d84f23c0fc793dac5ffe232aa5c"
dependencies = [
"delog",
"heapless",
@@ -1446,7 +1445,7 @@ dependencies = [
"ctaphid-dispatch",
"delog",
"fido-authenticator",
"interchange 0.2.2",
"interchange 0.3.0",
"log",
"pretty_env_logger",
"trussed",
Cargo.toml
+3 -2
View File
@@ -5,7 +5,7 @@ authors = ["Nicolas Stalder <n@stalder.io>", "Conor Patrick <conor@solokeys.com>
edition = "2021"
[dependencies]
interchange = "0.2.0"
interchange = "0.3.0"
log = { version = "0.4.14", default-features = false }
trussed = { version = "0.1", features = ["log-all", "virt"] }
usb-device = { version = "0.2.7", default-features = false }
@@ -45,5 +45,6 @@ trussed = { git = "https://github.com/trussed-dev/trussed", rev = "51477a4c5d22b
usbd-ctaphid = { git = "https://github.com/trussed-dev/usbd-ctaphid", rev = "9dd79aeeb927ab7fdb882fdca8f9324f64d1292c" }
usbd-ccid = { git = "https://github.com/sosthene-nitrokey/usbd-ccid", rev = "7e1f11bd125651382d4b403226327de5df5f86b6" }
ctaphid-dispatch = { git = "https://github.com/sosthene-nitrokey/ctaphid-dispatch", rev = "461a5d6519e844758de97f929481f9f03d8d2869" }
apdu-dispatch = { git = "https://github.com/trussed-dev/apdu-dispatch", rev = "6a2720d06930b715a7af9411a12c7fcf35d5995f" }
apdu-dispatch = { git = "https://github.com/sosthene-nitrokey/apdu-dispatch.git", rev = "71ed5f7efadc621f43c5cad47" }
iso7816 = { git = "https://github.com/sosthene-nitrokey/iso7816.git", rev = "eee84fbb58f77d84f23c0fc793dac5ffe232aa5c" }
src/ccid.rs
+3 -2
View File
@@ -1,11 +1,12 @@
use apdu_dispatch::dispatch::ApduDispatch;
use apdu_dispatch::interchanges::Data;
use usb_device::bus::{UsbBus, UsbBusAllocator};
use usbd_ccid::Ccid;
pub fn setup<'bus, 'pipe, B: UsbBus>(
bus_allocator: &'bus UsbBusAllocator<B>,
contact: &'pipe apdu_dispatch::interchanges::Channel,
contactless: &'pipe apdu_dispatch::interchanges::Channel,
contact: &'pipe interchange::Channel<Data, Data>,
contactless: &'pipe interchange::Channel<Data, Data>,
) -> (Ccid<'bus, 'pipe, B, 3072>, ApduDispatch<'pipe>) {
let (ccid_rq, ccid_rp) = contact.split().unwrap();
let ccid = Ccid::new(bus_allocator, ccid_rq, None);