Merge pull request #266 from Nitrokey/interchange030

Bump all dependencies to their interchange 0.3.0 versions

Cargo.toml

@@ -17,11 +17,12 @@ ctap-types = { git = "https://github.com/Nitrokey/ctap-types", tag = "v0.1.2-nit
 fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", tag = "v0.1.1-nitrokey.4" }
 lpc55-hal = { git = "https://github.com/Nitrokey/lpc55-hal", tag = "v0.3.0-nitrokey.2" }
 trussed = { git = "https://github.com/Nitrokey/trussed", tag = "v0.1.0-nitrokey.11" }
-ctaphid-dispatch = { git = "https://github.com/Nitrokey/ctaphid-dispatch", tag = "v0.1.1-nitrokey.1" }
 
 # unreleased upstream changes
-interchange = { git = "https://github.com/trussed-dev/interchange" }
-usbd-ctaphid = { git = "https://github.com/trussed-dev/usbd-ctaphid" }
+usbd-ctaphid = { git = "https://github.com/trussed-dev/usbd-ctaphid", rev = "2f658fbe84e262037621b15cb867424c4a60b038" }
+usbd-ccid = { git = "https://github.com/trussed-dev/usbd-ccid", rev = "eeea54f85cfa69a43c676b63c030608830ea35ea" }
+ctaphid-dispatch = { git = "https://github.com/trussed-dev/ctaphid-dispatch", rev = "d9eb980da163b613fdf759f6092b7c3bdcc0a22c" }
+apdu-dispatch = { git = "https://github.com/trussed-dev/apdu-dispatch.git", rev = "b72d5eb9f4d7a3f107a78a2f0e41f3c403f4c7a4" }
 
 # unreleased crates
 secrets-app = { git = "https://github.com/Nitrokey/trussed-secrets-app", tag = "0.11.0" }
@@ -30,8 +31,8 @@ piv-authenticator = { git = "https://github.com/Nitrokey/piv-authenticator", tag
 trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth", tag = "v0.2.2" }
 trussed-rsa-alloc = { git = "https://github.com/Nitrokey/trussed-rsa-backend.git", tag = "v0.1.0"}
 trussed-staging = { git = "https://github.com/Nitrokey/trussed-staging.git", tag = "v0.1.0"}
-trussed-usbip = { git = "https://github.com/trussed-dev/pc-usbip-runner" }
 iso7816 = { git = "https://github.com/Nitrokey/iso7816.git", tag = "v0.1.1-nitrokey.1" }
+trussed-usbip = { git = "https://github.com/trussed-dev/pc-usbip-runner", rev = "083fca7693a9a910dd2337d8eaf9d50ccd1987d0" }
 
 [profile.release]
 codegen-units = 1

components/nfc-device/Cargo.toml

@@ -12,7 +12,7 @@ nb = "1"
 
 apdu-dispatch = "0.1"
 iso7816 = "0.1"
-interchange = "0.2.1"
+interchange = "0.3.0"
 
 [features]
 default = []

components/nfc-device/src/iso14443.rs

@@ -1,9 +1,8 @@
 use core::mem::MaybeUninit;
 
-use apdu_dispatch::interchanges;
+use apdu_dispatch::interchanges::{self, Requester};
 use embedded_time::duration::Milliseconds;
 use heapless::Vec;
-use interchange::Requester;
 
 use crate::traits::nfc;
 
@@ -99,14 +98,14 @@ pub struct Iso14443<DEV: nfc::Device> {
 
     buffer: interchanges::Data,
 
-    interchange: Requester<interchanges::Contactless>,
+    interchange: Requester<'static>,
 }
 
 impl<DEV> Iso14443<DEV>
 where
     DEV: nfc::Device,
 {
-    pub fn new(device: DEV, interchange: Requester<interchanges::Contactless>) -> Self {
+    pub fn new(device: DEV, interchange: Requester<'static>) -> Self {
         Self {
             device: device,
             state: Iso14443State::Receiving,
@@ -339,7 +338,7 @@ where
         let command = interchanges::Data::from_slice(&self.buffer);
         self.buffer.clear();
         if command.is_ok() {
-            if self.interchange.request(command.as_ref().unwrap()).is_ok() {
+            if self.interchange.request(command.unwrap()).is_ok() {
                 Ok(())
             } else {
                 // Would be better to try canceling and taking on this apdu.

runners/embedded/Cargo.toml

@@ -36,7 +36,7 @@ ctap-types = "0.1"
 
 ### trussed core
 trussed = "0.1"
-interchange = "0.2"
+interchange = "0.3"
 littlefs2 = { version = "0.4", features = ["c-stubs"] }
 
 ### usb machinery

runners/embedded/src/lib.rs

@@ -1,6 +1,6 @@
 #![no_std]
 
-use interchange::Interchange;
+use interchange::Channel;
 use littlefs2::fs::Filesystem;
 use soc::types::Soc as SocT;
 use types::Soc;
@@ -176,10 +176,15 @@ pub fn init_usb_nfc(
 ) -> types::usbnfc::UsbNfcInit {
     let config = <SocT as Soc>::INTERFACE_CONFIG;
 
+    use apdu_dispatch::interchanges::Channel as CcidChannel;
+    use ctaphid_dispatch::types::Channel as CtapChannel;
+    static CCID_CHANNEL: CcidChannel = Channel::new();
+    static NFC_CHANNEL: CcidChannel = Channel::new();
+    static CTAP_CHANNEL: CtapChannel = Channel::new();
     /* claim interchanges */
-    let (ccid_rq, ccid_rp) = apdu_dispatch::interchanges::Contact::claim().unwrap();
-    let (nfc_rq, nfc_rp) = apdu_dispatch::interchanges::Contactless::claim().unwrap();
-    let (ctaphid_rq, ctaphid_rp) = ctaphid_dispatch::types::HidInterchange::claim().unwrap();
+    let (ccid_rq, ccid_rp) = CCID_CHANNEL.split().unwrap();
+    let (nfc_rq, nfc_rp) = NFC_CHANNEL.split().unwrap();
+    let (ctaphid_rq, ctaphid_rp) = CTAP_CHANNEL.split().unwrap();
 
     /* initialize dispatchers */
     let apdu_dispatch = apdu_dispatch::dispatch::ApduDispatch::new(ccid_rp, nfc_rp);

runners/embedded/src/types.rs

@@ -128,8 +128,8 @@ pub type Trussed = trussed::Service<RunnerPlatform, Dispatch>;
 
 pub type Iso14443 = nfc_device::Iso14443<<SocT as Soc>::NfcDevice>;
 
-pub type ApduDispatch = apdu_dispatch::dispatch::ApduDispatch;
-pub type CtaphidDispatch = ctaphid_dispatch::dispatch::Dispatch;
+pub type ApduDispatch = apdu_dispatch::dispatch::ApduDispatch<'static>;
+pub type CtaphidDispatch = ctaphid_dispatch::dispatch::Dispatch<'static>;
 
 pub type Apps = apps::Apps<Runner>;
 

runners/embedded/src/types/usbnfc.rs

@@ -1,13 +1,9 @@
 use crate::soc::types::Soc as SocT;
 use crate::types::Soc;
 
-pub type CcidClass = usbd_ccid::Ccid<
-    'static,
-    <SocT as Soc>::UsbBus,
-    apdu_dispatch::interchanges::Contact,
-    { apdu_dispatch::interchanges::SIZE },
->;
-pub type CtapHidClass = usbd_ctaphid::CtapHid<'static, <SocT as Soc>::UsbBus>;
+pub type CcidClass =
+    usbd_ccid::Ccid<'static, 'static, <SocT as Soc>::UsbBus, { apdu_dispatch::interchanges::SIZE }>;
+pub type CtapHidClass = usbd_ctaphid::CtapHid<'static, 'static, <SocT as Soc>::UsbBus>;
 // pub type KeyboardClass = usbd_hid::hid_class::HIDClass<'static, <SocT as Soc>::UsbBus>;
 pub type SerialClass = usbd_serial::SerialPort<'static, <SocT as Soc>::UsbBus>;
 
@@ -40,7 +36,7 @@ impl UsbClasses {
 
 pub struct UsbNfcInit {
     pub usb_classes: Option<UsbClasses>,
-    pub apdu_dispatch: apdu_dispatch::dispatch::ApduDispatch,
-    pub ctaphid_dispatch: ctaphid_dispatch::dispatch::Dispatch,
+    pub apdu_dispatch: apdu_dispatch::dispatch::ApduDispatch<'static>,
+    pub ctaphid_dispatch: ctaphid_dispatch::dispatch::Dispatch<'static>,
     pub iso14443: Option<super::Iso14443>,
 }