From 142bea3b9fa30ecdab0c1fe6584a117fbd1ad269 Mon Sep 17 00:00:00 2001
From: ryan <ryan@distrust.co>
Date: Wed, 29 May 2024 16:15:17 -0400
Subject: [PATCH] keyfork-shard: verify QR code length correctly

---
 CHANGELOG.md                    | 5 +++++
 Cargo.lock                      | 4 ++--
 crates/keyfork-shard/Cargo.toml | 2 +-
 crates/keyfork-shard/src/lib.rs | 3 ++-
 crates/keyfork/Cargo.toml       | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6c4628..b841852 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Keyfork v0.2.1
+
+This release contains an emergency bugfix for Keyfork Shard, which previously
+would not be able to properly verify the length of remote shard QR codes.
+
 # Keyfork v0.2.0
 
 Some of the changes in this release are based on feedback from audits
diff --git a/Cargo.lock b/Cargo.lock
index f810780..1baeea4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1674,7 +1674,7 @@ dependencies = [
 
 [[package]]
 name = "keyfork"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "card-backend-pcsc",
  "clap",
@@ -1835,7 +1835,7 @@ dependencies = [
 
 [[package]]
 name = "keyfork-shard"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "aes-gcm",
  "anyhow",
diff --git a/crates/keyfork-shard/Cargo.toml b/crates/keyfork-shard/Cargo.toml
index 353ef5e..19495bb 100644
--- a/crates/keyfork-shard/Cargo.toml
+++ b/crates/keyfork-shard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "keyfork-shard"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 license = "AGPL-3.0-only"
 
diff --git a/crates/keyfork-shard/src/lib.rs b/crates/keyfork-shard/src/lib.rs
index d05fa3d..cd5bb30 100644
--- a/crates/keyfork-shard/src/lib.rs
+++ b/crates/keyfork-shard/src/lib.rs
@@ -483,7 +483,8 @@ pub fn remote_decrypt(w: &mut impl Write) -> Result<(), Box<dyn std::error::Erro
                     .expect(bug!("qrcode should contain base64 encoded data"));
                 assert_eq!(
                     decoded_data.len(),
-                    ENCRYPTED_LENGTH as usize,
+                    // Include length of public key
+                    ENCRYPTED_LENGTH as usize + 32,
                     bug!("invalid payload data")
                 );
                 let _ = pubkey_data.insert(decoded_data[..32].try_into().map_err(|_| InvalidData)?);
diff --git a/crates/keyfork/Cargo.toml b/crates/keyfork/Cargo.toml
index 7f321fc..382f2da 100644
--- a/crates/keyfork/Cargo.toml
+++ b/crates/keyfork/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "keyfork"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 license = "AGPL-3.0-only"