eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 20:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make changes in token unlock for further changes in reencrypt action.

Browse Source 
The token preference condition is moved outside the
try_token_unlock routine body.
This commit is contained in:
Ondrej Kozina
2025-04-25 18:31:39 +02:00
committed by Milan Broz
parent 5f48657f4d
commit 8fcd8a78d8
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cryptsetup.c
View File

@@ -875,10 +875,12 @@ static int action_resize(void)
if (isLUKS2(crypt_get_type(cd))) { if (isLUKS2(crypt_get_type(cd))) {
/* try load VK in kernel keyring using token */ /* try load VK in kernel keyring using token */
r = luks_try_token_unlock(cd, ARG_INT32(OPT_KEY_SLOT_ID), r = luks_try_token_unlock(cd, ARG_INT32(OPT_KEY_SLOT_ID),
ARG_INT32(OPT_TOKEN_ID_ID), NULL, ARG_INT32(OPT_TOKEN_ID_ID),
ARG_STR(OPT_TOKEN_TYPE_ID), NULL, ARG_STR(OPT_TOKEN_TYPE_ID),
CRYPT_ACTIVATE_KEYRING_KEY,1, true, CRYPT_ACTIVATE_KEYRING_KEY,
ARG_SET(OPT_TOKEN_ONLY_ID)); 1, true,
ARG_SET(OPT_TOKEN_ONLY_ID) || ARG_SET(OPT_TOKEN_ID_ID) || ARG_SET(OPT_TOKEN_TYPE_ID),
NULL);
if (r >= 0 || quit || ARG_SET(OPT_TOKEN_ONLY_ID)) if (r >= 0 || quit || ARG_SET(OPT_TOKEN_ONLY_ID))
goto out; goto out;
@@ -1829,7 +1831,9 @@ static int action_open_luks(void)
r = luks_try_token_unlock(cd, ARG_INT32(OPT_KEY_SLOT_ID), r = luks_try_token_unlock(cd, ARG_INT32(OPT_KEY_SLOT_ID),
ARG_INT32(OPT_TOKEN_ID_ID), activated_name, ARG_INT32(OPT_TOKEN_ID_ID), activated_name,
ARG_STR(OPT_TOKEN_TYPE_ID), activate_flags, ARG_STR(OPT_TOKEN_TYPE_ID), activate_flags,
set_tries_tty(false), true, ARG_SET(OPT_TOKEN_ONLY_ID)); set_tries_tty(false), true,
ARG_SET(OPT_TOKEN_ONLY_ID) || ARG_SET(OPT_TOKEN_ID_ID) || ARG_SET(OPT_TOKEN_TYPE_ID),
NULL);
if (r >= 0 || r == -EEXIST || quit || ARG_SET(OPT_TOKEN_ONLY_ID)) if (r >= 0 || r == -EEXIST || quit || ARG_SET(OPT_TOKEN_ONLY_ID))
goto out; goto out;
@@ -2707,7 +2711,9 @@ static int action_luksResume(void)
/* try to resume LUKS2 device by token first */ /* try to resume LUKS2 device by token first */
r = luks_try_token_unlock(cd, ARG_INT32(OPT_KEY_SLOT_ID), ARG_INT32(OPT_TOKEN_ID_ID), r = luks_try_token_unlock(cd, ARG_INT32(OPT_KEY_SLOT_ID), ARG_INT32(OPT_TOKEN_ID_ID),
action_argv[0], ARG_STR(OPT_TOKEN_TYPE_ID), 0, action_argv[0], ARG_STR(OPT_TOKEN_TYPE_ID), 0,
set_tries_tty(false), false, ARG_SET(OPT_TOKEN_ONLY_ID)); set_tries_tty(false), false,
ARG_SET(OPT_TOKEN_ONLY_ID) || ARG_SET(OPT_TOKEN_ID_ID) || ARG_SET(OPT_TOKEN_TYPE_ID),
NULL);
if (r >= 0 || quit || ARG_SET(OPT_TOKEN_ONLY_ID)) if (r >= 0 || quit || ARG_SET(OPT_TOKEN_ONLY_ID))
goto out; goto out;

13
src/utils_luks.c
View File

@@ -310,7 +310,8 @@ int luks_try_token_unlock(struct crypt_device *cd,
uint32_t activate_flags, uint32_t activate_flags,
int tries, int tries,
bool activation, bool activation,
bool token_only) bool retry_with_pin,
struct crypt_keyslot_context **r_kc)
{ {
int r; int r;
struct crypt_keyslot_context *kc; struct crypt_keyslot_context *kc;
@@ -326,15 +327,15 @@ int luks_try_token_unlock(struct crypt_device *cd,
return r; return r;
if (activation) if (activation)
r = crypt_activate_by_keyslot_context(cd, activated_name, keyslot, kc, CRYPT_ANY_SLOT, NULL, activate_flags); r = crypt_activate_by_keyslot_context(cd, activated_name, keyslot, kc, CRYPT_ANY_SLOT, kc, activate_flags);
else else
r = crypt_resume_by_keyslot_context(cd, activated_name, keyslot, kc); r = crypt_resume_by_keyslot_context(cd, activated_name, keyslot, kc);
tools_keyslot_msg(r, UNLOCKED); tools_keyslot_msg(r, UNLOCKED);
tools_token_error_msg(r, token_type, token_id, false); tools_token_error_msg(r, token_type, token_id, false);
/* Token requires PIN (-ENOANO). Ask for it if there is evident preference for tokens */ /* Token requires PIN (-ENOANO). */
if (r != -ENOANO || (!token_only && !token_type && token_id == CRYPT_ANY_TOKEN)) if (r != -ENOANO || !retry_with_pin)
goto out; goto out;
if (token_id == CRYPT_ANY_TOKEN) if (token_id == CRYPT_ANY_TOKEN)
@@ -368,6 +369,10 @@ int luks_try_token_unlock(struct crypt_device *cd,
check_signal(&r); check_signal(&r);
} while (r == -ENOANO && (--tries > 0)); } while (r == -ENOANO && (--tries > 0));
out: out:
if (r >= 0 && r_kc)
*r_kc = kc;
else
crypt_keyslot_context_free(kc); crypt_keyslot_context_free(kc);
return r; return r;
} }

3
src/utils_luks.h
View File

@@ -51,6 +51,7 @@ int luks_try_token_unlock(struct crypt_device *cd,
uint32_t activate_flags, uint32_t activate_flags,
int tries, int tries,
bool activation, bool activation,
bool token_only); bool retry_with_pin,
struct crypt_keyslot_context **r_kc);
#endif /* UTILS_LUKS_H */ #endif /* UTILS_LUKS_H */