SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cryptsetup-fido2: Remove plain mode parameters from acquire_fido2_key_auto()

Browse Source 
`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()`.
This commit is contained in:
Peter Cai
2022-12-22 11:20:56 -05:00
parent 0a8e026e82
commit 52105bb487
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cryptsetup/cryptsetup.c
-1
View File
@@ -1121,7 +1121,6 @@ static int attach_luks_or_plain_or_bitlk_by_fido2(
name,
friendly,
arg_fido2_device,
key_file, arg_keyfile_size, arg_keyfile_offset,
until,
arg_headless,
&decrypted_key, &decrypted_key_size,
src/shared/cryptsetup-fido2.c
+3 -4
View File
@@ -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,
src/shared/cryptsetup-fido2.h
-6
View File
@@ -34,9 +34,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,
@@ -73,9 +70,6 @@ static inline 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,