diff options
author | Peter Cai <peter@typeblog.net> | 2022-12-17 20:28:51 -0500 |
---|---|---|
committer | Peter Cai <peter@typeblog.net> | 2022-12-22 11:20:56 -0500 |
commit | 52105bb4870e9b0728a185275fe001d69ff6b92c (patch) | |
tree | 82aed55a0dba80f1a2e9139a59cf54deceddd5dd /src/shared/cryptsetup-fido2.c | |
parent | 0a8e026e825dda142a8f1552a4b45815cbfd0b48 (diff) | |
download | systemd-52105bb4870e9b0728a185275fe001d69ff6b92c.tar.gz |
cryptsetup-fido2: Remove plain mode parameters from `acquire_fido2_key_auto()`
`acquire_fido2_key_auto()` will not be used in PLAIN mode, and
parameters such as the salt will be acquired from the LUKS header.
Parameters intended for PLAIN mode are useless in
`acquire_fido2_key_auto()`.
Diffstat (limited to 'src/shared/cryptsetup-fido2.c')
-rw-r--r-- | src/shared/cryptsetup-fido2.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/shared/cryptsetup-fido2.c b/src/shared/cryptsetup-fido2.c index a3bdedba1d..285b82a7e2 100644 --- a/src/shared/cryptsetup-fido2.c +++ b/src/shared/cryptsetup-fido2.c @@ -132,9 +132,6 @@ int acquire_fido2_key_auto( const char *name, const char *friendly_name, const char *fido2_device, - const char *key_file, - size_t key_file_size, - uint64_t key_file_offset, usec_t until, bool headless, void **ret_decrypted_key, @@ -252,7 +249,9 @@ int acquire_fido2_key_auto( fido2_device, rp, cid, cid_size, - key_file, key_file_size, key_file_offset, + /* key_file= */ NULL, /* salt is read from LUKS header instead of key_file */ + /* key_file_size= */ 0, + /* key_file_offset= */ 0, salt, salt_size, until, headless, |