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

Refactor activation by volume key(s) in helper routine.

Browse Source
This commit is contained in:
Ondrej Kozina
2025-04-25 21:47:43 +02:00
committed by Milan Broz
parent 8fcd8a78d8
commit cf29d51589
3 changed files with 111 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/cryptsetup.c
View File

@@ -1724,11 +1724,10 @@ static int action_open_luks(void)
struct crypt_active_device cad;
struct crypt_device *cd = NULL;
const char *data_device, *header_device, *activated_name;
char *key = NULL, *vk_description_activation1 = NULL, *vk_description_activation2 = NULL;
uint32_t activate_flags = 0;
int r, keysize, tries;
int r, tries, keysize = 0;
struct stat st;
struct crypt_keyslot_context *kc = NULL, *kc1 = NULL, *kc2 = NULL;
struct crypt_keyslot_context *kc1 = NULL, *kc2 = NULL;
if (ARG_SET(OPT_REFRESH_ID)) {
activated_name = action_argc > 1 ? action_argv[1] : action_argv[0];
@@ -1785,6 +1784,7 @@ static int action_open_luks(void)
goto out;
}
if (ARG_SET(OPT_VOLUME_KEY_FILE_ID) || ARG_SET(OPT_VOLUME_KEY_KEYRING_ID)) {
if (ARG_SET(OPT_VOLUME_KEY_FILE_ID)) {
keysize = crypt_get_volume_key_size(cd);
if (!keysize && !ARG_SET(OPT_KEY_SIZE_ID)) {
@@ -1793,40 +1793,22 @@ static int action_open_luks(void)
goto out;
} else if (!keysize)
keysize = ARG_UINT32(OPT_KEY_SIZE_ID) / 8;
r = tools_read_vk(ARG_STR(OPT_VOLUME_KEY_FILE_ID), &key, keysize);
if (r < 0)
goto out;
r = crypt_activate_by_volume_key(cd, activated_name,
key, keysize, activate_flags);
} else if (ARG_SET(OPT_VOLUME_KEY_KEYRING_ID)) {
if (vks_in_keyring_count == 1) {
r = tools_parse_vk_description(vks_in_keyring[0], &vk_description_activation1);
if (r < 0)
goto out;
r = crypt_keyslot_context_init_by_vk_in_keyring(cd, vk_description_activation1, &kc1);
if (r)
goto out;
r = crypt_activate_by_keyslot_context(cd, activated_name, CRYPT_ANY_SLOT, kc1, CRYPT_ANY_SLOT, NULL, activate_flags);
} else if (vks_in_keyring_count == 2) {
r = tools_parse_vk_description(vks_in_keyring[0], &vk_description_activation1);
if (r < 0)
goto out;
r = tools_parse_vk_description(vks_in_keyring[1], &vk_description_activation2);
if (r < 0)
goto out;
r = crypt_keyslot_context_init_by_vk_in_keyring(cd, vk_description_activation1, &kc1);
if (r)
goto out;
r = crypt_keyslot_context_init_by_vk_in_keyring(cd, vk_description_activation2, &kc2);
if (r)
goto out;
r = crypt_activate_by_keyslot_context(cd, activated_name, CRYPT_ANY_SLOT, kc1, CRYPT_ANY_SLOT, kc2, activate_flags);
}
r = luks_init_keyslot_contexts_by_volume_keys(cd, ARG_STR(OPT_VOLUME_KEY_FILE_ID),
NULL /* unused */,
keysize,
0 /* unused */,
vks_in_keyring[0],
vks_in_keyring[1],
&kc1, &kc2);
if (r < 0)
goto out;
r = crypt_activate_by_keyslot_context(cd, activated_name, CRYPT_ANY_SLOT,
kc1, CRYPT_ANY_SLOT, kc2, activate_flags);
if (r == -EPERM)
log_err(_("Volume key does not match the volume."));
if (r)
goto out;
} else {
r = luks_try_token_unlock(cd, ARG_INT32(OPT_KEY_SLOT_ID),
ARG_INT32(OPT_TOKEN_ID_ID), activated_name,
@@ -1840,14 +1822,14 @@ static int action_open_luks(void)
tries = set_tries_tty(true);
do {
r = luks_init_keyslot_context(cd, NULL, verify_passphrase(0), false, &kc);
crypt_keyslot_context_free(kc1);
kc1 = NULL;
r = luks_init_keyslot_context(cd, NULL, verify_passphrase(0), false, &kc1);
if (r < 0)
goto out;
r = crypt_activate_by_keyslot_context(cd, activated_name, ARG_INT32(OPT_KEY_SLOT_ID),
kc, CRYPT_ANY_SLOT, kc, activate_flags);
crypt_keyslot_context_free(kc);
kc = NULL;
kc1, CRYPT_ANY_SLOT, kc1, activate_flags);
tools_keyslot_msg(r, UNLOCKED);
tools_passphrase_msg(r);
@@ -1868,10 +1850,7 @@ out:
crypt_keyslot_context_free(kc1);
crypt_keyslot_context_free(kc2);
crypt_safe_free(key);
crypt_free(cd);
free(vk_description_activation1);
free(vk_description_activation2);
return r;
}

75
src/utils_luks.c
View File

@@ -376,3 +376,78 @@ out:
return r;
}
/* Initiates keyslot context(s) based on non-interactive input only */
int luks_init_keyslot_contexts_by_volume_keys(struct crypt_device *cd,
const char *vk_file1,
const char *vk_file2,
int keysize1_bytes,
int keysize2_bytes,
const char *vk_in_keyring1,
const char *vk_in_keyring2,
struct crypt_keyslot_context **r_kc1,
struct crypt_keyslot_context **r_kc2)
{
int r = -EINVAL;
char *vk_description = NULL, *key = NULL;
struct crypt_keyslot_context *kc1 = NULL, *kc2 = NULL;
assert(cd);
assert(r_kc1);
assert(r_kc2);
if (vk_file1 && keysize1_bytes > 0) {
r = tools_read_vk(vk_file1, &key, keysize1_bytes);
if (r < 0)
return r;
r = crypt_keyslot_context_init_by_volume_key(cd, key, keysize1_bytes, &kc1);
if (r < 0)
goto out;
}
/* volume key in file takes precedence */
if (vk_in_keyring1 && !kc1) {
r = tools_parse_vk_description(vk_in_keyring1, &vk_description);
if (r < 0)
goto out;
r = crypt_keyslot_context_init_by_vk_in_keyring(cd, vk_description, &kc1);
if (r < 0)
goto out;
}
if (vk_file2 && keysize2_bytes > 0) {
crypt_safe_free(key);
key = NULL;
r = tools_read_vk(vk_file2, &key, keysize2_bytes);
if (r < 0)
goto out;
r = crypt_keyslot_context_init_by_volume_key(cd, key, keysize2_bytes, &kc2);
if (r < 0)
goto out;
}
/* volume key in file takes precedence */
if (vk_in_keyring2 && !kc2) {
free(vk_description);
vk_description = NULL;
r = tools_parse_vk_description(vk_in_keyring2, &vk_description);
if (r < 0)
goto out;
r = crypt_keyslot_context_init_by_vk_in_keyring(cd, vk_description, &kc2);
}
out:
crypt_safe_free(key);
free(vk_description);
if (r) {
crypt_keyslot_context_free(kc1);
crypt_keyslot_context_free(kc2);
} else {
*r_kc1 = kc1;
*r_kc2 = kc2;
}
return r;
}

10
src/utils_luks.h
View File

@@ -54,4 +54,14 @@ int luks_try_token_unlock(struct crypt_device *cd,
bool retry_with_pin,
struct crypt_keyslot_context **r_kc);
int luks_init_keyslot_contexts_by_volume_keys(struct crypt_device *cd,
const char *vk_file1,
const char *vk_file2,
int keysize1_bytes,
int keysize2_bytes,
const char *vk_in_keyring1,
const char *vk_in_keyring2,
struct crypt_keyslot_context **r_kc1,
struct crypt_keyslot_context **r_kc2);
#endif /* UTILS_LUKS_H */