system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-06 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

cryptsetup-pkcs11: also plug credential name to use to credential plugin

Browse source
This commit is contained in:
Lennart Poettering 2024-02-19 18:16:47 +01:00
parent b3a635841a
commit 1c12daa46f
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.c
View file

@ -158,6 +158,7 @@ static int acquire_luks2_key_systemd(
data.friendly_name = params->friendly_name;
data.headless = params->headless;
data.askpw_credential = params->askpw_credential;
data.askpw_flags = params->askpw_flags;
data.until = params->until;

11
src/cryptsetup/cryptsetup.c
View file

@ -1492,6 +1492,7 @@ static int attach_luks2_by_pkcs11_via_plugin(
const char *friendly_name,
usec_t until,
bool headless,
const char *askpw_credential,
uint32_t flags) {
#if HAVE_LIBCRYPTSETUP_PLUGINS
@ -1504,6 +1505,7 @@ static int attach_luks2_by_pkcs11_via_plugin(
.friendly_name = friendly_name,
.until = until,
.headless = headless,
.askpw_credential = askpw_credential,
.askpw_flags = arg_ask_password_flags,
};
@ -1567,7 +1569,14 @@ static int attach_luks_or_plain_or_bitlk_by_pkcs11(
for (;;) {
if (use_libcryptsetup_plugin && arg_pkcs11_uri_auto)
r = attach_luks2_by_pkcs11_via_plugin(cd, name, friendly, until, arg_headless, flags);
r = attach_luks2_by_pkcs11_via_plugin(
cd,
name,
friendly,
until,
arg_headless,
"cryptsetup.pkcs11-pin",
flags);
else {
r = decrypt_pkcs11_key(
name,

1
src/shared/pkcs11-util.h
View file

@ -112,6 +112,7 @@ typedef struct {
const char *friendly_name;
usec_t until;
bool headless;
const char *askpw_credential;
AskPasswordFlags askpw_flags;
} systemd_pkcs11_plugin_params;