From 5629d4e29fe9897e67136844c6393f271b945279 Mon Sep 17 00:00:00 2001
From: Anton Lundin <anton.lundin@intinor.se>
Date: Fri, 20 Oct 2023 15:46:07 +0200
Subject: [PATCH 1/3] tpm2: fix build failure without openssl

---
 src/shared/tpm2-util.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
index 70912930b8..b640de19c8 100644
--- a/src/shared/tpm2-util.c
+++ b/src/shared/tpm2-util.c
@@ -4487,6 +4487,7 @@ const char *tpm2_userspace_log_path(void) {
         return secure_getenv("SYSTEMD_MEASURE_LOG_USERSPACE") ?: "/run/log/systemd/tpm2-measure.log";
 }
 
+#if HAVE_OPENSSL
 static int tpm2_userspace_log_open(void) {
         _cleanup_close_ int fd = -EBADF;
         struct stat st;
@@ -4626,6 +4627,7 @@ static int tpm2_userspace_log(
 
         return 1;
 }
+#endif
 
 int tpm2_extend_bytes(
                 Tpm2Context *c,

From bb42782bff10797ca3aa1b0c28f0a8048d8b34c4 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Fri, 27 Oct 2023 13:52:21 +0100
Subject: [PATCH 2/3] resolved: fix build failure with gnutls

Follow-up for bd1ae178336a3d9143fe
---
 src/resolve/resolved-dnstls-gnutls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resolve/resolved-dnstls-gnutls.c b/src/resolve/resolved-dnstls-gnutls.c
index 61f38ef4b4..6ac026ee79 100644
--- a/src/resolve/resolved-dnstls-gnutls.c
+++ b/src/resolve/resolved-dnstls-gnutls.c
@@ -6,7 +6,7 @@
 
 #include <gnutls/socket.h>
 
-#include "io-util.h"
+#include "iovec-util.h"
 #include "resolved-dns-stream.h"
 #include "resolved-dnstls.h"
 #include "resolved-manager.h"

From 64ec2d073fe53c791b79312e5f154c17094cb5e3 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Fri, 27 Oct 2023 11:47:43 +0100
Subject: [PATCH 3/3] CI: add a build job with TPM but without OpenSSL

We keep introducing build failures with this combination due to the
high amount of changes, add a combination that covers it
---
 .github/workflows/build_test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh
index 176764246f..99dadd2228 100755
--- a/.github/workflows/build_test.sh
+++ b/.github/workflows/build_test.sh
@@ -8,7 +8,7 @@ fatal() { echo >&2 -e "\033[31;1m$1\033[0m"; exit 1; }
 success() { echo >&2 -e "\033[32;1m$1\033[0m"; }
 
 ARGS=(
-    "--optimization=0"
+    "--optimization=0 -Dopenssl=disabled -Dcryptolib=gcrypt -Ddns-over-tls=gnutls -Dtpm=true -Dtpm2=enabled"
     "--optimization=s"
     "--optimization=3 -Db_lto=true -Ddns-over-tls=false"
     "--optimization=3 -Db_lto=false -Dtpm2=disabled -Dlibfido2=disabled -Dp11kit=disabled"