From 3719106152c89c7a5bb76471e875809a119633c3 Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin@nitrokey.com>
Date: Tue, 2 May 2023 13:53:59 +0200
Subject: [PATCH 1/2] Update fido-authenticator

This patch updates fido-authenticator to fix overwriting existing
resident FIDO2 credentials.
---
 CHANGELOG.md | 6 ++++++
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7060dd23..0dbd785a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Unreleased
 
+### Bugfixes
+
+- Fix overwriting existing resident FIDO2 credentials ([#254][])
+
+[#254]: https://github.com/Nitrokey/nitrokey-3-firmware/issues/254
+
 ## v1.4.0-rc.1 (2023-04-27)
 
 ### Features
diff --git a/Cargo.lock b/Cargo.lock
index ef5a8d56..4638d4df 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1045,7 +1045,7 @@ dependencies = [
 [[package]]
 name = "fido-authenticator"
 version = "0.1.1"
-source = "git+https://github.com/Nitrokey/fido-authenticator.git?tag=v0.1.1-nitrokey.3#7f6a09347babb4bc629ff7668807f3d987fa534f"
+source = "git+https://github.com/Nitrokey/fido-authenticator.git?tag=v0.1.1-nitrokey.4#857899bff75331b2c9a419f95457f541440c3a0d"
 dependencies = [
  "apdu-dispatch",
  "ctap-types",
diff --git a/Cargo.toml b/Cargo.toml
index 08730e12..00d18e74 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ version = "1.4.0-rc.1"
 # forked
 admin-app = { git = "https://github.com/Nitrokey/admin-app", tag = "v0.1.0-nitrokey.2" }
 ctap-types = { git = "https://github.com/Nitrokey/ctap-types", tag = "v0.1.2-nitrokey.1" }
-fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", tag = "v0.1.1-nitrokey.3" }
+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" }
 

From c2181cc357cb49dcb57d6a62b1c3a0fc4ddea5d8 Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin@nitrokey.com>
Date: Tue, 2 May 2023 13:55:08 +0200
Subject: [PATCH 2/2] Release v1.4.0-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dbd785a..9037c604 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+## v1.4.0-rc.2 (2023-05-02)
+
 ### Bugfixes
 
 - Fix overwriting existing resident FIDO2 credentials ([#254][])
diff --git a/Cargo.lock b/Cargo.lock
index 4638d4df..42210671 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "apps"
-version = "1.4.0-rc.1"
+version = "1.4.0-rc.2"
 dependencies = [
  "admin-app",
  "apdu-dispatch",
@@ -936,7 +936,7 @@ dependencies = [
 
 [[package]]
 name = "embedded-runner-lib"
-version = "1.4.0-rc.1"
+version = "1.4.0-rc.2"
 dependencies = [
  "alloc-cortex-m",
  "apdu-dispatch",
@@ -3217,7 +3217,7 @@ dependencies = [
 
 [[package]]
 name = "usbip-runner"
-version = "1.4.0-rc.1"
+version = "1.4.0-rc.2"
 dependencies = [
  "apps",
  "cfg-if",
@@ -3235,7 +3235,7 @@ dependencies = [
 
 [[package]]
 name = "utils"
-version = "1.4.0-rc.1"
+version = "1.4.0-rc.2"
 dependencies = [
  "delog",
  "littlefs2",
diff --git a/Cargo.toml b/Cargo.toml
index 00d18e74..468a7727 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "1.4.0-rc.1"
+version = "1.4.0-rc.2"
 
 [patch.crates-io]
 # forked