From 8d36e78e932b52ae62639bd3fb10ec5c0bae4aed Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin@nitrokey.com>
Date: Mon, 21 Oct 2024 12:25:19 +0200
Subject: [PATCH] Update apdu-dispatch to v0.3.0

---
 Cargo.lock        | 21 ++++++++++++++++-----
 Cargo.toml        |  3 +--
 examples/dummy.rs |  2 +-
 src/lib.rs        |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 97832ec..04ec009 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -34,10 +34,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "apdu-dispatch"
-version = "0.1.2"
-source = "git+https://github.com/trussed-dev/apdu-dispatch.git?rev=b72d5eb9f4d7a3f107a78a2f0e41f3c403f4c7a4#b72d5eb9f4d7a3f107a78a2f0e41f3c403f4c7a4"
+name = "apdu-app"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce391931a2cc4597eaf0d464db9d4d5e1939ccc8dd6eda0f86cda117e914c02d"
 dependencies = [
+ "iso7816",
+]
+
+[[package]]
+name = "apdu-dispatch"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4063bce5a221fcef21017ead889f26468dbee476649d6a2181b0931197082904"
+dependencies = [
+ "apdu-app",
  "delog",
  "heapless",
  "interchange 0.3.0",
@@ -704,9 +715,9 @@ dependencies = [
 
 [[package]]
 name = "iso7816"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7e6ac743d509349b7865595ce90bbfcfbe59f42b8ec0db9e76ec361ace3f652"
+checksum = "c75f5d3f2d959c5d37b382ed9b5a32d0a0e6112ab6ac9eb8fce82359db6f2367"
 dependencies = [
  "delog",
  "heapless",
diff --git a/Cargo.toml b/Cargo.toml
index 3189906..9022d2b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ ctaphid-dispatch = { version = "0.1", features = ["log-all"], optional = true }
 usbd-ctaphid = { version = "0.1", features = ["log-all"], optional = true }
 
 # ccid
-apdu-dispatch = { version = "0.1.2", optional = true }
+apdu-dispatch = { version = "0.3", optional = true }
 usbd-ccid = { version = "0.3", features = ["log-all"], optional = true }
 
 [dev-dependencies]
@@ -37,4 +37,3 @@ trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "51e68500d
 usbd-ctaphid = { git = "https://github.com/trussed-dev/usbd-ctaphid", rev = "e9cbf904f548979685c4c06d75479b75e3695160" }
 usbd-ccid = { git = "https://github.com/trussed-dev/usbd-ccid", tag = "0.3.0" }
 ctaphid-dispatch = { git = "https://github.com/trussed-dev/ctaphid-dispatch", rev = "57cb3317878a8593847595319aa03ef17c29ec5b" }
-apdu-dispatch = { git = "https://github.com/trussed-dev/apdu-dispatch.git", rev = "b72d5eb9f4d7a3f107a78a2f0e41f3c403f4c7a4" }
diff --git a/examples/dummy.rs b/examples/dummy.rs
index 3a44190..25a0738 100644
--- a/examples/dummy.rs
+++ b/examples/dummy.rs
@@ -112,7 +112,7 @@ impl<'a, S: StoreProvider> trussed_usbip::Apps<'a, S, CoreOnly>
     #[cfg(feature = "ccid")]
     fn with_ccid_apps<T>(
         &mut self,
-        f: impl FnOnce(&mut [&mut dyn apdu_dispatch::app::App<ApduCommandSize, ApduCommandSize>]) -> T,
+        f: impl FnOnce(&mut [&mut dyn apdu_dispatch::app::App<ApduCommandSize>]) -> T,
     ) -> T {
         f(&mut [])
     }
diff --git a/src/lib.rs b/src/lib.rs
index dac3615..3eecdcb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -63,7 +63,7 @@ pub trait Apps<'interrupt, S: StoreProvider, D: Dispatch> {
     #[cfg(feature = "ccid")]
     fn with_ccid_apps<T>(
         &mut self,
-        f: impl FnOnce(&mut [&mut dyn apdu_dispatch::app::App<7609, 7609>]) -> T,
+        f: impl FnOnce(&mut [&mut dyn apdu_dispatch::app::App<7609>]) -> T,
     ) -> T;
 }