diff options
author | Dan Streetman <ddstreet@ieee.org> | 2022-12-06 13:07:34 -0500 |
---|---|---|
committer | Dan Streetman <ddstreet@ieee.org> | 2023-02-01 12:51:17 -0500 |
commit | 23e9ccc24ae0e7d3f3f609c69dbde171f1c55302 (patch) | |
tree | 122aa8d07ab25058f8f0bb530349be55705ce6c9 /src/cryptsetup | |
parent | 68d084cee56e2686fb840106de20e267482183be (diff) | |
download | systemd-23e9ccc24ae0e7d3f3f609c69dbde171f1c55302.tar.gz |
tpm2: use Tpm2Context* instead of ESYS_CONTEXT*
This is needed for later patches that use Tpm2Handle, which requires access
to the Tpm2Context.
Diffstat (limited to 'src/cryptsetup')
-rw-r--r-- | src/cryptsetup/cryptsetup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 845667eabe..e776605501 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -848,7 +848,7 @@ static int measure_volume_key( _cleanup_strv_free_ char **l = NULL; if (strv_isempty(arg_tpm2_measure_banks)) { - r = tpm2_get_good_pcr_banks_strv(c->esys_context, UINT32_C(1) << arg_tpm2_measure_pcr, &l); + r = tpm2_get_good_pcr_banks_strv(c, UINT32_C(1) << arg_tpm2_measure_pcr, &l); if (r < 0) return r; } @@ -871,7 +871,7 @@ static int measure_volume_key( if (!s) return log_oom(); - r = tpm2_extend_bytes(c->esys_context, l ?: arg_tpm2_measure_banks, arg_tpm2_measure_pcr, s, SIZE_MAX, volume_key, volume_key_size); + r = tpm2_extend_bytes(c, l ?: arg_tpm2_measure_banks, arg_tpm2_measure_pcr, s, SIZE_MAX, volume_key, volume_key_size); if (r < 0) return r; |