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" 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 -#include "io-util.h" +#include "iovec-util.h" #include "resolved-dns-stream.h" #include "resolved-dnstls.h" #include "resolved-manager.h" 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,