From ca11d3e5c15fb7e9b5c1845ea2d0cf5cdf8eb158 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Sun, 4 Feb 2024 15:07:04 -0500
Subject: [PATCH] Revendor dependencies for ELN

---
 fido-device-onboard.spec          |  7 +++++--
 fix-aws-nitro-enclaves-cose.patch | 25 +++++++++++++++++++++++++
 fix-devmapper-version.patch       | 13 -------------
 sources                           |  2 +-
 4 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 fix-aws-nitro-enclaves-cose.patch
 delete mode 100644 fix-devmapper-version.patch

diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec
index 6da5df7..20bac96 100644
--- a/fido-device-onboard.spec
+++ b/fido-device-onboard.spec
@@ -14,10 +14,12 @@ Source0:        %{url}/archive/v%{version}/%{name}-rs-%{version}.tar.gz
 Source1:        %{name}-rs-%{version}-vendor-patched.tar.xz
 Patch0:         0001-hack-drop-shadow.patch
 Patch1:         0001-fix-drop-unused-sha-crypt-dep.patch
-Patch2:         fix-devmapper-version.patch
 Patch3:         0001-fix-relabel-devcreds-before-onboarding.patch
 Patch4:         fdo-bump-devicemapper-libcryptosetup.patch
 
+# fixes for vendored dependencies
+Patch100:       fix-aws-nitro-enclaves-cose.patch
+
 # Because nobody cares
 ExcludeArch: %{ix86}
 
@@ -45,8 +47,9 @@ BuildRequires:  tpm2-tss-devel
 %patch -P4 -p1
 
 %if 0%{?rhel}
-%patch -P2 -p1
 %cargo_prep -V 1
+# patch vendored dependencies
+%patch -P100 -p1
 %else
 %cargo_prep
 %generate_buildrequires
diff --git a/fix-aws-nitro-enclaves-cose.patch b/fix-aws-nitro-enclaves-cose.patch
new file mode 100644
index 0000000..6fa09e4
--- /dev/null
+++ b/fix-aws-nitro-enclaves-cose.patch
@@ -0,0 +1,25 @@
+Backport of https://github.com/awslabs/aws-nitro-enclaves-cose/pull/66
+
+diff --git a/vendor/aws-nitro-enclaves-cose/.cargo-checksum.json b/vendor/aws-nitro-enclaves-cose/.cargo-checksum.json
+index dd788a8..1035b7b 100644
+--- a/vendor/aws-nitro-enclaves-cose/.cargo-checksum.json
++++ b/vendor/aws-nitro-enclaves-cose/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{"CHANGELOG.md":"182c816f6cdcf13b370be9e712a0e7cf5b7c6b6612dc81c3b3d477abfca58e86","CODE_OF_CONDUCT.md":"34b6c98d5c23127ae6769e95e483e5bf6d3704ae1f0d3ae4e69d15f4ede118b6","CONTRIBUTING.md":"b050a75d5f6d2236ed40ad91dc53c4a4b30da184f9298f6f18507beae5fd7cb7","Cargo.toml":"d3ba98a34c9dcbff42da7e04d123b1687840738851e0630035e1f6e620a6fd98","LICENSE":"09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b","NOTICE":"d4290ed64c2edd0fce1d84e3f9dfb2881240fe534def76b8cd29ed6af683e287","README.md":"b16c142f4056384bb274fa7c9d0c2d73faf573cc2123a0bf4825970f88a67fc4","src/crypto/mod.rs":"a509e065cd0c3ed4c05484af9a7c45397ebf2a8b3f0d22578410f22484ffc33c","src/crypto/openssl_pkey.rs":"e9344a26ba101925a8e1c82960ff3d20a3df603be43132671bb15846ee96e829","src/crypto/tpm.rs":"2f8ec59523020319a4f63ca1e4bf3a4ae20c3acf8ca8ffd38e53ccd99611af3f","src/encrypt.rs":"ba89d5f221f0e4379d6f67dd946a00b183639b00bcf6918a4d3c441c4328894d","src/error.rs":"48fd4b84f9b4a7f5fc7ac52c2ce792d258c257908609270bf7751938082e19b7","src/header_map.rs":"88b3d7575ea4fd8eaaf4497a9d3c27ff43ec4da0213994aecf1ec9b5b89553c0","src/lib.rs":"8dbe7fe8206cfc76f46324c25418b37d0daf1ce23fc8b3219e1d89043c8e00de","src/sign.rs":"5a45658fa820ac9b5285c0987b66a58eb4f5b4373ab1aa07a73240848de098b2"},"package":"4e2fe3e862758ef5bb5d89868141ab28781d96347522b60eb6abeaf7f9acd4bc"}
+\ No newline at end of file
++{"files":{},"package":"4e2fe3e862758ef5bb5d89868141ab28781d96347522b60eb6abeaf7f9acd4bc"}
+diff --git a/vendor/aws-nitro-enclaves-cose/src/sign.rs b/vendor/aws-nitro-enclaves-cose/src/sign.rs
+index 6426ac0..93f59ec 100644
+--- a/vendor/aws-nitro-enclaves-cose/src/sign.rs
++++ b/vendor/aws-nitro-enclaves-cose/src/sign.rs
+@@ -135,8 +135,10 @@ pub struct SigStructure(
+     #[serde(skip_serializing_if = "Option::is_none")]
+     Option<ByteBuf>,
+     /// external_aad : bstr,
++    #[serde(default)]
+     ByteBuf,
+     /// payload : bstr
++    #[serde(default)]
+     ByteBuf,
+ );
+ 
diff --git a/fix-devmapper-version.patch b/fix-devmapper-version.patch
deleted file mode 100644
index 38062c0..0000000
--- a/fix-devmapper-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/client-linuxapp/Cargo.toml b/client-linuxapp/Cargo.toml
-index 423fec5..f4e3ad4 100644
---- a/client-linuxapp/Cargo.toml
-+++ b/client-linuxapp/Cargo.toml
-@@ -19,7 +19,7 @@ uuid = "1.3"
- thiserror = "1"
- libcryptsetup-rs = { version = "0.8.0", features = ["mutex"] }
- secrecy = "0.8"
--devicemapper = "0.33"
-+devicemapper = "0.32.3"
- openssl = "0.10.55"
- 
- fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
diff --git a/sources b/sources
index 59c0aa7..93e56a4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (fido-device-onboard-rs-0.4.12.tar.gz) = e1b5cfc2ed06977264526b67c8ae3bb8b38c557a0bbb5c9585fac5f334ee134ed921dd712678e842bc93340b8533c773902c27d354956ef169801c2260eddb4f
-SHA512 (fido-device-onboard-rs-0.4.12-vendor-patched.tar.xz) = ed406baab1af32226e9a793b8ee251f3f7735f821632a6065d49c6536bca1402bf879060d75d8df3f77cf88f4d9717779a3cbfd90dc72bb5b0b3cd827a3833cd
+SHA512 (fido-device-onboard-rs-0.4.12-vendor-patched.tar.xz) = 83ab9ab2398552955abf24377cec0da802ceb6928b9e2eff1719985d028a841f5de997939cb79f573523eb903b6e406cd1fb36dcb51f4b2e489175742313e68e