shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-09 13:57:42 +03:00
Code

Merge pull request #29737 from glance-/tpm2-openssl

Browse Source 
tpm2: fix build failure without openssl
This commit is contained in:
Luca Boccassi 2023-10-27 23:21:44 +01:00 committed by GitHub
commit f456fa23b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_test.sh vendored
View File

@ -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"

2
src/resolve/resolved-dnstls-gnutls.c
View File

@ -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"

2
src/shared/tpm2-util.c
View File

@ -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,