fixup! Use apdu-app instead of apdu-dispatch

Cargo.toml

@@ -100,9 +100,12 @@ 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.11" }
+admin-app = { git = "https://github.com/Nitrokey/admin-app.git", branch = "apdu-app" }
+# fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", tag = "v0.1.1-nitrokey.18" }
+fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", branch = "apdu-app" }
+# cbor-smol = { git = "https://github.com/Nitrokey/cbor-smol.git", tag = "v0.4.0-nitrokey.4"}
+cbor-smol = { git = "https://github.com/trussed-dev/cbor-smol.git", rev = "d499e527f1214b2998b844720f0d41a9d05be7e1" }
 
 # unreleased upstream changes
 littlefs2 = { git = "https://github.com/sosthene-nitrokey/littlefs2.git", rev = "2b45a7559ff44260c6dd693e4cb61f54ae5efc53" }

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(