diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-09-13 10:52:43 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-09-13 14:48:23 +0200 |
| commit | 2b92a67261934d5788613385279157eb1c9fd110 (patch) | |
| tree | 95bb5d819d43ec9beac1a6bee6fab5c8fcc6fbd2 /src/cryptsetup/cryptsetup.c | |
| parent | 3f9992d82e0bc601bb33ad7b19a1722c4478c542 (diff) | |
| download | systemd-2b92a67261934d5788613385279157eb1c9fd110.tar.gz | |
tpm2: support RSA primary keys as fallback if TPM2 devices don't support ECC
Previously, we hardcoded use of ECC as primary keys, since they are much
faster (i.e. saving multiple seconds) to do TPM2 operations with. Alas,
not all TPM2 chips appear to support ECC. Bummer.
Let's hence add a fallback logic: if we can't create an ECC primary key,
use an RSA key, and store that fact away.
AFIU the security guarantees should be roughly the same, it's just that
RSA primary keys is so much slower to work with than ECC.
The primary key algorithm is used is stored in the JSON header of LUKS
disks, in a new field. If the field is absent we assume to use ECC, to
provide full compatibility with old systemd versions.
The primary key algorithm is stored in a new field in the credentials
file format (in fact, a previously unused zero space is used), too.
Hopefully, this should ensure that TPM2 support will "just work" on more
systems.
Fixes: #20361
Diffstat (limited to 'src/cryptsetup/cryptsetup.c')
| -rw-r--r-- | src/cryptsetup/cryptsetup.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index fdd57def86..ceaf10e647 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -1248,6 +1248,7 @@ static int attach_luks_or_plain_or_bitlk_by_tpm2( arg_tpm2_device, arg_tpm2_pcr_mask == UINT32_MAX ? TPM2_PCR_MASK_DEFAULT : arg_tpm2_pcr_mask, UINT16_MAX, + 0, key_file, arg_keyfile_size, arg_keyfile_offset, key_data, key_data_size, NULL, 0, /* we don't know the policy hash */ @@ -1284,7 +1285,7 @@ static int attach_luks_or_plain_or_bitlk_by_tpm2( for (;;) { uint32_t pcr_mask; - uint16_t pcr_bank; + uint16_t pcr_bank, primary_alg; r = find_tpm2_auto_data( cd, @@ -1292,6 +1293,7 @@ static int attach_luks_or_plain_or_bitlk_by_tpm2( token, /* search for the token with this index, or any later index than this */ &pcr_mask, &pcr_bank, + &primary_alg, &blob, &blob_size, &policy_hash, &policy_hash_size, &keyslot, @@ -1314,6 +1316,7 @@ static int attach_luks_or_plain_or_bitlk_by_tpm2( arg_tpm2_device, pcr_mask, pcr_bank, + primary_alg, NULL, 0, 0, /* no key file */ blob, blob_size, policy_hash, policy_hash_size, |