From 84fa67f0ef091c736dc880ae8c4a8ee2b9fe7445 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sun, 20 Dec 2020 22:15:52 +0100
Subject: [PATCH 1/3] cryptenroll: drop an unused variable

Fixes following warning/error w/ clang:
../src/cryptenroll/cryptenroll-tpm2.c:64:64: error: unused variable 'a' [-Werror,-Wunused-variable]
        _cleanup_(json_variant_unrefp) JsonVariant *v = NULL, *a = NULL;
                                                               ^
1 error generated.
---
 src/cryptenroll/cryptenroll-tpm2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cryptenroll/cryptenroll-tpm2.c b/src/cryptenroll/cryptenroll-tpm2.c
index 211f8f9874..49c5beb82d 100644
--- a/src/cryptenroll/cryptenroll-tpm2.c
+++ b/src/cryptenroll/cryptenroll-tpm2.c
@@ -61,7 +61,7 @@ int enroll_tpm2(struct crypt_device *cd,
                 uint32_t pcr_mask) {
 
         _cleanup_(erase_and_freep) void *secret = NULL, *secret2 = NULL;
-        _cleanup_(json_variant_unrefp) JsonVariant *v = NULL, *a = NULL;
+        _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
         _cleanup_(erase_and_freep) char *base64_encoded = NULL;
         size_t secret_size, secret2_size, blob_size, hash_size;
         _cleanup_free_ void *blob = NULL, *hash = NULL;

From fedc14c5a10fb9c186bc812adff6b95fd1802742 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sun, 20 Dec 2020 22:21:35 +0100
Subject: [PATCH 2/3] travis: add missing optional build dependencies

---
 travis-ci/managers/debian.sh | 3 +++
 travis-ci/managers/fedora.sh | 1 +
 2 files changed, 4 insertions(+)

diff --git a/travis-ci/managers/debian.sh b/travis-ci/managers/debian.sh
index 558a55a0a1..ad6306744c 100755
--- a/travis-ci/managers/debian.sh
+++ b/travis-ci/managers/debian.sh
@@ -19,9 +19,12 @@ ADDITIONAL_DEPS=(
     clang
     fdisk
     libfdisk-dev
+    libfido2-dev
     libp11-kit-dev
     libpwquality-dev
+    libqrencode-dev
     libssl-dev
+    libtss2-dev
     libzstd-dev
     perl
     python3-libevdev
diff --git a/travis-ci/managers/fedora.sh b/travis-ci/managers/fedora.sh
index 463696a32e..cff3f63c18 100755
--- a/travis-ci/managers/fedora.sh
+++ b/travis-ci/managers/fedora.sh
@@ -33,6 +33,7 @@ ADDITIONAL_DEPS=(
     perl
     python3-evdev
     python3-pyparsing
+    tpm2-tss-devel
 )
 
 info() {

From a3abdea13aaeac477473b8d56fc60f6fd9cfbb87 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sun, 20 Dec 2020 22:27:36 +0100
Subject: [PATCH 3/3] github: add the missing tpm2 optional dependency

---
 .github/workflows/ubuntu-build-check.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ubuntu-build-check.sh b/.github/workflows/ubuntu-build-check.sh
index d4f1106538..c652280bc3 100755
--- a/.github/workflows/ubuntu-build-check.sh
+++ b/.github/workflows/ubuntu-build-check.sh
@@ -37,6 +37,7 @@ PACKAGES=(
     libpwquality-dev
     libqrencode-dev
     libssl-dev
+    libtss2-dev
     libxkbcommon-dev
     libxtables-dev
     libzstd-dev