summaryrefslogtreecommitdiffstats
path: root/src/cryptenroll/cryptenroll-fido2.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2024-02-19 18:06:34 +0100
committerLennart Poettering <lennart@poettering.net>2024-02-20 16:50:00 +0100
commitb3a635841aaf5a6d3f5985dfd2082f7a22ca74d1 (patch)
treeb362d843fe68bdc4a2bcb33b9b09c0b4b24836f4 /src/cryptenroll/cryptenroll-fido2.c
parentpkcs11-util: clean up credential handling for PKCS11 PIN (diff)
downloadsystemd-b3a635841aaf5a6d3f5985dfd2082f7a22ca74d1.tar.xz
systemd-b3a635841aaf5a6d3f5985dfd2082f7a22ca74d1.zip
cryptenroll,cryptsetup: clean up unlock credential for TPM2 + FIDO2
Let's make sure that when cryptenroll asks for the TPM2 or FIDO2 token PIN it uses cryptenroll.* credential namespace, and cryptsetup uses cryptsetup.*.
Diffstat (limited to 'src/cryptenroll/cryptenroll-fido2.c')
-rw-r--r--src/cryptenroll/cryptenroll-fido2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cryptenroll/cryptenroll-fido2.c b/src/cryptenroll/cryptenroll-fido2.c
index 7e35dca9c5..194771d54e 100644
--- a/src/cryptenroll/cryptenroll-fido2.c
+++ b/src/cryptenroll/cryptenroll-fido2.c
@@ -34,9 +34,10 @@ int load_volume_key_fido2(
device,
/* until= */ 0,
/* headless= */ false,
+ "cryptenroll.fido2-pin",
+ ASK_PASSWORD_PUSH_CACHE|ASK_PASSWORD_ACCEPT_CACHED,
&decrypted_key,
- &decrypted_key_size,
- ASK_PASSWORD_PUSH_CACHE|ASK_PASSWORD_ACCEPT_CACHED);
+ &decrypted_key_size);
if (r == -EAGAIN)
return log_error_errno(r, "FIDO2 token does not exist, or UV is blocked. Please try again.");
if (r < 0)