diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2021-08-07 12:06:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-07 12:06:00 +0100 |
| commit | e908236e054bd246f0bc764a0b1412da8172d741 (patch) | |
| tree | f2bbee903521bfe73332db1831fce201381e6325 /src/cryptsetup/cryptsetup-tokens | |
| parent | 3c79a56d53a722691c634a9d192dad9b58e182c9 (diff) | |
| parent | d340bdd1bd435e9f5524f4246feaf38511b2ff45 (diff) | |
| download | systemd-e908236e054bd246f0bc764a0b1412da8172d741.tar.gz | |
Merge pull request #20384 from keszybz/udev-code-modernization
Various minor refactorings (basic/log, udev, cryptsetup-tokens)
Diffstat (limited to 'src/cryptsetup/cryptsetup-tokens')
| -rw-r--r-- | src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c index 0baf21d36d..c7819b1a8d 100644 --- a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c +++ b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c @@ -134,7 +134,7 @@ _public_ void cryptsetup_token_dump( const char *json /* validated 'systemd-tpm2' token if cryptsetup_token_validate is defined */) { int r; - uint32_t i, pcr_mask; + uint32_t pcr_mask; uint16_t pcr_bank; size_t decoded_blob_size; _cleanup_free_ char *base64_blob = NULL, *hex_policy_hash = NULL, @@ -147,7 +147,7 @@ _public_ void cryptsetup_token_dump( if (r < 0) return (void) crypt_log_debug_errno(cd, r, "Failed to parse " TOKEN_NAME " metadata: %m."); - for (i = 0; i < TPM2_PCRS_MAX; i++) { + for (uint32_t i = 0; i < TPM2_PCRS_MAX; i++) { if ((pcr_mask & (UINT32_C(1) << i)) && ((r = strextendf_with_separator(&pcrs_str, ", ", "%" PRIu32, i)) < 0)) return (void) crypt_log_debug_errno(cd, r, "Can not dump " TOKEN_NAME " content: %m"); |