Use apdu-app instead of apdu-dispatch

Cargo.toml

@@ -19,9 +19,10 @@ serde = { version = "1.0", default-features = false }
 serde-indexed = "0.1.0"
 serde_bytes = { version = "0.11.10", default-features = false, features=["alloc"] }
 generic-array = "0.14.3"
-ctap-types = "0.3"
+ctap-types = "0.3.1"
 ctaphid-dispatch = "0.1"
-apdu-dispatch = "0.1"
+apdu-app = "0.1"
+iso7816 = "0.1"
 
 trussed = "0.1.0"
 pretty_env_logger = { version = "0.4.0", optional = true }
@@ -99,13 +100,11 @@ ctaphid-dispatch = { git = "https://github.com/Nitrokey/ctaphid-dispatch", tag =
 #apdu-dispatch = { git = "https://github.com/Nitrokey/apdu-dispatch.git", branch="sz-multiple-apps" }
 
 # forked
-admin-app = { git = "https://github.com/Nitrokey/admin-app.git", tag = "v0.1.0-nitrokey.11" }
-fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", tag = "v0.1.1-nitrokey.18" }
-cbor-smol = { git = "https://github.com/Nitrokey/cbor-smol.git", tag = "v0.4.0-nitrokey.4"}
+admin-app = { git = "https://github.com/Nitrokey/admin-app.git", tag = "v0.1.0-nitrokey.16" }
+fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", tag = "v0.1.1-nitrokey.21" }
+cbor-smol = { git = "https://github.com/trussed-dev/cbor-smol.git", rev = "d499e527f1214b2998b844720f0d41a9d05be7e1" }
 
 # unreleased upstream changes
-apdu-dispatch = { git = "https://github.com/trussed-dev/apdu-dispatch.git", rev = "915fc237103fcecc29d0f0b73391f19abf6576de" }
-iso7816 = { git = "https://github.com/Nitrokey/iso7816.git", tag = "v0.1.1-nitrokey.1" }
 littlefs2 = { git = "https://github.com/sosthene-nitrokey/littlefs2.git", rev = "2b45a7559ff44260c6dd693e4cb61f54ae5efc53" }
 trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "b548d379dcbd67d29453d94847b7bc33ae92e673" }
 usbd-ctaphid = { git = "https://github.com/Nitrokey/usbd-ctaphid", tag = "v0.1.0-nitrokey.1" }

examples/usbip/main.rs

@@ -244,6 +244,7 @@ mod dispatch {
 #[cfg(feature = "ccid")]
 use apdu_dispatch::command::SIZE as ApduCommandSize;
 
+use admin_app::StatusBytes;
 use clap::Parser;
 use clap_num::maybe_hex;
 use trussed::backend::BackendId;
@@ -340,12 +341,12 @@ impl TryFrom<u8> for CustomStatus {
         match value {
             0 => Ok(Self::ReverseHotpSuccess),
             1 => Ok(Self::ReverseHotpError),
-            _ => Err(UnknownStatusError(value)),
+            _ => Err(UnknownStatusError),
         }
     }
 }
 
-pub struct UnknownStatusError(u8);
+pub struct UnknownStatusError;
 
 impl CustomStatus {}
 
@@ -427,6 +428,7 @@ pub struct AdminData {
     pub efs_blocks: u16,
     pub variant: Variant,
 }
+
 impl AdminData {
     pub fn new(variant: Variant) -> Self {
         Self {
@@ -438,9 +440,18 @@ impl AdminData {
     }
 }
 
-pub type AdminStatus = [u8; 5];
-impl AdminData {
-    fn encode(&self) -> AdminStatus {
+impl StatusBytes for AdminData {
+    type Serialized = [u8; 5];
+
+    fn set_random_error(&mut self, _value: bool) {
+        unimplemented!();
+    }
+
+    fn get_random_error(&self) -> bool {
+        false
+    }
+
+    fn serialize(&self) -> Self::Serialized {
         let efs_blocks = self.efs_blocks.to_be_bytes();
         [
             self.init_status,
@@ -456,7 +467,7 @@ type FidoAuthApp = fido_authenticator::Authenticator<fido_authenticator::Conform
 type WebcryptApp = webcrypt::Webcrypt<VirtClient>;
 
 struct Apps {
-    admin: admin_app::App<VirtClient, Reboot, AdminStatus, ()>,
+    admin: admin_app::App<VirtClient, Reboot, AdminData, ()>,
     peeking_fido: PeekingBypass<'static, FidoAuthApp, WebcryptApp>,
 }
 
@@ -482,7 +493,8 @@ impl trussed_usbip::Apps<'static, VirtClient, dispatch::Dispatch> for Apps {
             [0; 16],
             0,
             "",
-            data.encode(),
+            data,
+            &[],
         );
 
         let webcrypt = webcrypt::Webcrypt::new_with_options(

src/lib/ctap_app.rs

@@ -1,35 +1,30 @@
 use crate::commands::WebcryptTrussedClient;
-use apdu_dispatch::app as apdu;
-use apdu_dispatch::app::Interface;
-use apdu_dispatch::app::Status;
-use apdu_dispatch::command::SIZE as APDU_SIZE;
-use apdu_dispatch::iso7816::{Aid, App};
 use ctap_types::ctap1::{authenticate, Request as Request1, Response as Response1};
 use ctap_types::ctap2::{get_assertion, Request, Response};
 use ctap_types::webauthn::PublicKeyCredentialDescriptor;
 use ctap_types::{ctap1, ctap2};
 use ctaphid_dispatch::app;
 use ctaphid_dispatch::app as ctaphid;
 use heapless_bytes::Bytes;
+use iso7816::{command::CommandView, Aid, App, Interface, Status};
 
 use crate::helpers::hash;
 use crate::transport::Webcrypt;
 use crate::types::RequestSource::RS_FIDO2;
 use crate::types::{CtapSignatureSize, RequestDetails, RequestSource};
 
 #[inline(never)]
-fn try_handle_ctap1<C>(
+fn try_handle_ctap1<C, const R: usize>(
     w: &mut Webcrypt<C>,
     data: &[u8],
-    response: &mut apdu_dispatch::response::Data,
+    response: &mut apdu_app::Data<R>,
 ) -> Result<(), Status>
 where
     C: WebcryptTrussedClient,
 {
     let ctap_response = {
-        let command =
-            apdu_dispatch::Command::try_from(data).map_err(|_| Status::IncorrectDataParameter)?;
-        let ctap_request = ctap1::Request::try_from(&command)?;
+        let command = CommandView::try_from(data).map_err(|_| Status::IncorrectDataParameter)?;
+        let ctap_request = ctap1::Request::try_from(command)?;
 
         match ctap_request {
             // Request1::Register(reg) => {
@@ -81,8 +76,11 @@ where
 }
 
 #[inline(never)]
-fn handle_ctap1<C>(w: &mut Webcrypt<C>, data: &[u8], response: &mut apdu_dispatch::response::Data)
-where
+fn handle_ctap1<C, const R: usize>(
+    w: &mut Webcrypt<C>,
+    data: &[u8],
+    response: &mut apdu_app::Data<R>,
+) where
     C: WebcryptTrussedClient,
 {
     info!("WC handle CTAP1");
@@ -101,10 +99,10 @@ where
 }
 
 #[inline(never)]
-fn try_handle_ctap2<C>(
+fn try_handle_ctap2<C, const R: usize>(
     w: &mut Webcrypt<C>,
     data: &[u8],
-    response: &mut apdu_dispatch::response::Data,
+    response: &mut apdu_app::Data<R>,
 ) -> Result<(), u8>
 where
     C: WebcryptTrussedClient,
@@ -218,10 +216,10 @@ where
 }
 
 #[inline(never)]
-fn handle_ctap2<C>(
+fn handle_ctap2<C, const R: usize>(
     authenticator: &mut Webcrypt<C>,
     data: &[u8],
-    response: &mut apdu_dispatch::response::Data,
+    response: &mut apdu_app::Data<R>,
 ) where
     C: WebcryptTrussedClient,
 {
@@ -268,8 +266,6 @@ where
     }
 }
 
-const SIZE: usize = APDU_SIZE;
-
 impl<C> App for Webcrypt<C>
 where
     C: WebcryptTrussedClient,
@@ -280,16 +276,16 @@ where
     }
 }
 
-impl<C> apdu::App<{ SIZE }, { SIZE }> for Webcrypt<C>
+impl<C, const R: usize> apdu_app::App<R> for Webcrypt<C>
 where
     C: WebcryptTrussedClient,
 {
     fn select(
         &mut self,
         _interface: Interface,
-        _apdu: &apdu::Command<{ SIZE }>,
-        reply: &mut apdu::Data<{ apdu_dispatch::response::SIZE }>,
-    ) -> apdu::Result {
+        _apdu: CommandView<'_>,
+        reply: &mut apdu_app::Data<R>,
+    ) -> apdu_app::Result {
         reply.extend_from_slice(b"U2F_V2").unwrap();
         Ok(())
     }
@@ -299,9 +295,9 @@ where
     fn call(
         &mut self,
         interface: Interface,
-        apdu: &apdu::Command<{ SIZE }>,
-        response: &mut apdu::Data<{ apdu_dispatch::response::SIZE }>,
-    ) -> apdu::Result {
+        apdu: CommandView<'_>,
+        response: &mut apdu_app::Data<R>,
+    ) -> apdu_app::Result {
         if interface != Interface::Contactless {
             return Err(Status::ConditionsOfUseNotSatisfied);
         }
@@ -316,7 +312,8 @@ where
                     // 0x10
                     Ok(ctaphid::Command::Cbor) => handle_ctap2(self, apdu.data(), response),
                     Ok(ctaphid::Command::Msg) => handle_ctap1(self, apdu.data(), response),
-                    Ok(ctaphid::Command::Deselect) => self.deselect(),
+                    // Ok(ctaphid::Command::Deselect) => self.deselect(),
+                    Ok(ctaphid::Command::Deselect) => apdu_app::App::<R>::deselect(self),
                     _ => {
                         info!("Unsupported ins for fido app {:02x}", instruction);
                         return Err(Status::InstructionNotSupportedOrInvalid);
@@ -328,7 +325,7 @@ where
     }
 
     #[cfg(feature = "apdu-peek")]
-    fn peek(&self, apdu: Option<&apdu_dispatch::app::Command<SIZE>>) -> bool {
+    fn peek(&self, apdu: Option<CommandView<'_>>) -> bool {
         match apdu {
             None => false,
             Some(apdu) => {