Merge pull request #18040 from mrc0mmand/cryptenroll-unused-variable

cryptenroll: drop an unused variable
github: add the missing tpm2 optional dependency
2026-03-06 05:04:45 +01:00 · 2020-12-21 09:21:22 +09:00 · 2020-12-20 22:27:36 +01:00 · 2020-12-20 22:21:35 +01:00 · 2020-12-20 22:15:52 +01:00
4 changed files with 6 additions and 1 deletions
--- 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
--- 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;
--- 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
--- 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() {
Author	SHA1	Message	Date
Yu Watanabe	94d982bb6a	Merge pull request #18040 from mrc0mmand/cryptenroll-unused-variable cryptenroll: drop an unused variable	2020-12-21 09:21:22 +09:00
Frantisek Sumsal	a3abdea13a	github: add the missing tpm2 optional dependency	2020-12-20 22:27:36 +01:00
Frantisek Sumsal	fedc14c5a1	travis: add missing optional build dependencies	2020-12-20 22:21:35 +01:00
Frantisek Sumsal	84fa67f0ef	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.	2020-12-20 22:15:52 +01:00