diff options
| author | Dan Streetman <ddstreet@ieee.org> | 2023-02-06 11:31:59 -0500 |
|---|---|---|
| committer | Dan Streetman <ddstreet@ieee.org> | 2023-03-09 10:46:19 -0500 |
| commit | c69bd0abdbd06ee89068227c67890358f5764c3d (patch) | |
| tree | ee678937f2d5ebd3d06e5fe4bb91ed1dd648678c /src/cryptsetup | |
| parent | aa07a4fa353d758562c4bec8c7d3b1d44b55e573 (diff) | |
| download | systemd-c69bd0abdbd06ee89068227c67890358f5764c3d.tar.gz | |
tpm2: add/rename functions to manage pcr selections
This renames some functions to match other to/from_string() naming,
and allows better management of TPML_PCR_SELECTION and TPMS_PCR_SELECTION
structs.
Diffstat (limited to 'src/cryptsetup')
| -rw-r--r-- | src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c index e8bc091191..b5d66e389d 100644 --- a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c +++ b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c @@ -205,13 +205,13 @@ _public_ void cryptsetup_token_dump( if (r < 0) return (void) crypt_log_debug_errno(cd, r, "Failed to parse " TOKEN_NAME " JSON fields: %m"); - r = pcr_mask_to_string(hash_pcr_mask, &hash_pcrs_str); - if (r < 0) - return (void) crypt_log_debug_errno(cd, r, "Cannot format PCR hash mask: %m"); + hash_pcrs_str = tpm2_pcr_mask_to_string(hash_pcr_mask); + if (!hash_pcrs_str) + return (void) crypt_log_debug_errno(cd, ENOMEM, "Cannot format PCR hash mask: %m"); - r = pcr_mask_to_string(pubkey_pcr_mask, &pubkey_pcrs_str); - if (r < 0) - return (void) crypt_log_debug_errno(cd, r, "Cannot format PCR hash mask: %m"); + pubkey_pcrs_str = tpm2_pcr_mask_to_string(pubkey_pcr_mask); + if (!pubkey_pcrs_str) + return (void) crypt_log_debug_errno(cd, ENOMEM, "Cannot format PCR hash mask: %m"); r = crypt_dump_buffer_to_hex_string(blob, blob_size, &blob_str); if (r < 0) |