diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-09-25 07:41:07 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-09-25 08:03:19 +0900 |
| commit | 395c1d9a85dbae198dc29313151b7934727a4cbc (patch) | |
| tree | fbee8f93bbaf52eff3cfab5649c3a5ff99e3ff9e | |
| parent | e0f435f93580c84a93cc083a7fc23a5751ca8424 (diff) | |
| download | systemd-395c1d9a85dbae198dc29313151b7934727a4cbc.tar.gz | |
tpm2-util: fix build with -Dopenssl=false
Fixes #24800.
| -rw-r--r-- | src/shared/tpm2-util.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c index d4b0ff5117..16c907587c 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c @@ -802,6 +802,7 @@ static int tpm2_make_encryption_session( return 0; } +#if HAVE_OPENSSL static int openssl_pubkey_to_tpm2_pubkey(EVP_PKEY *input, TPM2B_PUBLIC *output) { #if OPENSSL_VERSION_MAJOR >= 3 _cleanup_(BN_freep) BIGNUM *n = NULL, *e = NULL; @@ -981,6 +982,7 @@ static int find_signature( return log_error_errno(SYNTHETIC_ERRNO(ENXIO), "Couldn't find signature for this PCR bank, PCR index and public key."); } +#endif static int tpm2_make_policy_session( ESYS_CONTEXT *c, @@ -1005,7 +1007,6 @@ static int tpm2_make_policy_session( }; _cleanup_(Esys_Freep) TPM2B_DIGEST *policy_digest = NULL; ESYS_TR session = ESYS_TR_NONE, pubkey_handle = ESYS_TR_NONE; - _cleanup_(EVP_PKEY_freep) EVP_PKEY *pk = NULL; TSS2_RC rc; int r; @@ -1045,6 +1046,8 @@ static int tpm2_make_policy_session( } } +#if HAVE_OPENSSL + _cleanup_(EVP_PKEY_freep) EVP_PKEY *pk = NULL; if (pubkey_size > 0) { /* If a pubkey is specified, load it to validate it, even if the PCR mask for this is actually zero, and we are thus not going to use it. */ _cleanup_fclose_ FILE *f = fmemopen((void*) pubkey, pubkey_size, "r"); @@ -1055,6 +1058,7 @@ static int tpm2_make_policy_session( if (!pk) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Failed to parse PEM public key."); } +#endif rc = sym_Esys_StartAuthSession( c, @@ -1073,6 +1077,7 @@ static int tpm2_make_policy_session( "Failed to open session in TPM: %s", sym_Tss2_RC_Decode(rc)); if (pubkey_pcr_mask != 0) { +#if HAVE_OPENSSL log_debug("Configuring public key based PCR policy."); /* First: load public key into the TPM */ @@ -1221,6 +1226,9 @@ static int tpm2_make_policy_session( "Failed to push Authorize policy into TPM: %s", sym_Tss2_RC_Decode(rc)); goto finish; } +#else + return log_debug_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "OpenSSL support is disabled."); +#endif } if (hash_pcr_mask != 0) { |