From d5abe17abcc60fc68c7aa7a0660205f14720ff1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sosth=C3=A8ne=20Gu=C3=A9don?= <sosthene@nitrokey.com>
Date: Wed, 8 Nov 2023 17:16:44 +0100
Subject: [PATCH 1/2] Prepare release 0.3.3

---
 CHANGELOG.md | 3 ++-
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6b2e1a..ca76c94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Changelog
 
-## Unreleased
+## [v0.3.3][] (2023-12-08)
 
 - Reject NFC requests ([#39][])
+- Put RSA feature behind a feature flag
 
 [#39]: https://github.com/Nitrokey/piv-authenticator/pull/39
 
diff --git a/Cargo.toml b/Cargo.toml
index 1df8af0..972c180 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "piv-authenticator"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["Nicolas Stalder <n@stalder.io>", "Nitrokey GmbH"]
 edition = "2021"
 license = "Apache-2.0 OR MIT"

From 1a5e7e54ba9839c547dbf0751c66d3733cdd29e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sosth=C3=A8ne=20Gu=C3=A9don?= <sosthene@nitrokey.com>
Date: Wed, 8 Nov 2023 17:23:09 +0100
Subject: [PATCH 2/2] Prepare release v0.3.3

---
 Cargo.toml        | 9 ++++++---
 examples/usbip.rs | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 972c180..b68170b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,8 @@ stoppable_thread = "0.2.1"
 expectrl = "0.6.0"
 
 # Examples
-trussed-usbip = { git = "https://github.com/trussed-dev/pc-usbip-runner", default-features = false, features = ["ccid"], rev = "f3a680ca4c9a1411838ae0774f1713f79d4c2979"}
+# usbip
+trussed-usbip = { version = "0.0.1", default-features = false, features = ["ccid"] }
 usbd-ccid = { version = "0.2.0", features = ["highspeed-usb"]}
 rand = "0.8.5"
 asn1 = "0.15.2"
@@ -74,11 +75,13 @@ log-warn = []
 log-error = []
 
 [patch.crates-io]
-trussed = { git = "https://github.com/trussed-dev/trussed" , rev = "55ea391367fce4bf5093ff2d3c79041d7aef0485" }
+trussed = { git = "https://github.com/nitrokey/trussed" , tag = "v0.1.0-nitrokey.11" }
 trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth.git", tag = "v0.2.2"}
 trussed-rsa-alloc = { git = "https://github.com/trussed-dev/trussed-rsa-backend.git", tag = "v0.1.0"}
 trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging", tag = "v0.1.0" }
-apdu-dispatch = { git = "https://github.com/trussed-dev/apdu-dispatch.git", rev = "915fc237103fcecc29d0f0b73391f19abf6576de" }
+apdu-dispatch = { git = "https://github.com/Nitrokey/apdu-dispatch", tag = "v0.1.2-nitrokey.2" }
+trussed-usbip = { git = "https://github.com/Nitrokey/pc-usbip-runner.git", tag = "v0.0.1-nitrokey.1" }
+usbd-ccid = { git = "https://github.com/Nitrokey/usbd-ccid", tag = "v0.2.0-nitrokey.1" }
 
 [profile.dev.package.rsa]
 opt-level = 2
diff --git a/examples/usbip.rs b/examples/usbip.rs
index 8e2f691..d9fe5a9 100644
--- a/examples/usbip.rs
+++ b/examples/usbip.rs
@@ -19,7 +19,7 @@ struct PivApp {
     piv: piv::Authenticator<VirtClient>,
 }
 
-impl trussed_usbip::Apps<VirtClient, Dispatch> for PivApp {
+impl trussed_usbip::Apps<'static, VirtClient, Dispatch> for PivApp {
     type Data = ();
     fn new<B: ClientBuilder<VirtClient, Dispatch>>(builder: &B, _data: ()) -> Self {
         PivApp {