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

TCRYPT: support crypt_volume_key_get

Browse Source
This commit is contained in:
Milan Broz
2012-11-23 15:20:46 +01:00
parent 6ab93841e9
commit 8d69e19ac1
3 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/setup.c
View File

@@ -2137,7 +2137,8 @@ int crypt_volume_key_get(struct crypt_device *cd,
} else if (isLUKS(cd->type)) {
r = LUKS_open_key_with_hdr(keyslot, passphrase,
passphrase_size, &cd->hdr, &vk, cd);
} else if (isTCRYPT(cd->type)) {
r = TCRYPT_get_volume_key(cd, &cd->tcrypt_hdr, &cd->tcrypt_params, &vk);
} else
log_err(cd, _("This operation is not supported for %s crypt device.\n"), cd->type ?: "(none)");

29
lib/tcrypt/tcrypt.c
View File

@@ -737,3 +737,32 @@ uint64_t TCRYPT_get_iv_offset(struct tcrypt_phdr *hdr)
return 0;
return (hdr->d.mk_offset / hdr->d.sector_size);
}
int TCRYPT_get_volume_key(struct crypt_device *cd,
struct tcrypt_phdr *hdr,
struct crypt_params_tcrypt *params,
struct volume_key **vk)
{
int i, num_keys = 1, key_size;
const char *c;
if (!hdr->d.version) {
log_dbg("TCRYPT: this function is not supported without encrypted header load.");
return -ENOTSUP;
}
*vk = crypt_alloc_volume_key(params->key_size, NULL);
if (!*vk)
return -ENOMEM;
for (num_keys = 0, c = params->cipher; c ; num_keys++)
c = strchr(++c, '-');
key_size = params->key_size / num_keys;
for (i = 0; i < num_keys; i++)
copy_key(&(*vk)->key[key_size * i], hdr->d.keys, num_keys - 1,
key_size, i, params->mode);
return 0;
}

6
lib/tcrypt/tcrypt.h
View File

@@ -65,6 +65,7 @@ struct tcrypt_phdr {
} __attribute__((__packed__));
struct crypt_dm_active_device;
struct volume_key;
struct device;
int TCRYPT_read_phdr(struct crypt_device *cd,
@@ -89,4 +90,9 @@ int TCRYPT_deactivate(struct crypt_device *cd,
uint64_t TCRYPT_get_data_offset(struct tcrypt_phdr *hdr);
uint64_t TCRYPT_get_iv_offset(struct tcrypt_phdr *hdr);
int TCRYPT_get_volume_key(struct crypt_device *cd,
struct tcrypt_phdr *hdr,
struct crypt_params_tcrypt *params,
struct volume_key **vk);
#endif