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: fix activation and hidden device offsets.

Browse Source
This commit is contained in:
Milan Broz
2012-11-27 17:13:53 +01:00
parent 17a8e85cb8
commit 21756a1969
3 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/setup.c
View File

@@ -2434,7 +2434,7 @@ uint64_t crypt_get_data_offset(struct crypt_device *cd)
return cd->loopaes_hdr.offset; return cd->loopaes_hdr.offset;
if (isTCRYPT(cd->type)) if (isTCRYPT(cd->type))
return TCRYPT_get_data_offset(&cd->tcrypt_hdr); return TCRYPT_get_data_offset(cd, &cd->tcrypt_hdr, &cd->tcrypt_params);
return 0; return 0;
} }
@@ -2451,7 +2451,7 @@ uint64_t crypt_get_iv_offset(struct crypt_device *cd)
return cd->loopaes_hdr.skip; return cd->loopaes_hdr.skip;
if (isTCRYPT(cd->type)) if (isTCRYPT(cd->type))
return TCRYPT_get_iv_offset(&cd->tcrypt_hdr); return TCRYPT_get_iv_offset(cd, &cd->tcrypt_hdr, &cd->tcrypt_params);
return 0; return 0;
} }
@@ -2524,8 +2524,8 @@ int crypt_get_active_device(struct crypt_device *cd, const char *name,
return -ENOTSUP; return -ENOTSUP;
if (cd && isTCRYPT(cd->type)) { if (cd && isTCRYPT(cd->type)) {
cad->offset = TCRYPT_get_data_offset(&cd->tcrypt_hdr); cad->offset = TCRYPT_get_data_offset(cd, &cd->tcrypt_hdr, &cd->tcrypt_params);
cad->iv_offset = TCRYPT_get_iv_offset(&cd->tcrypt_hdr); cad->iv_offset = TCRYPT_get_iv_offset(cd, &cd->tcrypt_hdr, &cd->tcrypt_params);
} else { } else {
cad->offset = dmd.u.crypt.offset; cad->offset = dmd.u.crypt.offset;
cad->iv_offset = dmd.u.crypt.iv_offset; cad->iv_offset = dmd.u.crypt.iv_offset;

54
lib/tcrypt/tcrypt.c
View File

@@ -508,9 +508,10 @@ static int TCRYPT_init_hdr(struct crypt_device *cd,
r = hdr_from_disk(hdr, params, i, r); r = hdr_from_disk(hdr, params, i, r);
if (!r) { if (!r) {
log_dbg("TCRYPT: Header version: %d, req. %d, sector %d" log_dbg("TCRYPT: Header version: %d, req. %d, sector %d"
", PBKDF2 hash %s", (int)hdr->d.version, ", mk_offset %" PRIu64 ", hidden_size %" PRIu64
", volume size %" PRIu64, (int)hdr->d.version,
(int)hdr->d.version_tc, (int)hdr->d.sector_size, (int)hdr->d.version_tc, (int)hdr->d.sector_size,
params->hash_name); hdr->d.mk_offset, hdr->d.hidden_volume_size, hdr->d.volume_size);
log_dbg("TCRYPT: Header cipher %s-%s, key size %d", log_dbg("TCRYPT: Header cipher %s-%s, key size %d",
params->cipher, params->mode, params->key_size); params->cipher, params->mode, params->key_size);
} }
@@ -627,6 +628,11 @@ int TCRYPT_activate(struct crypt_device *cd,
if (!algs) if (!algs)
return -EINVAL; return -EINVAL;
if (params->flags & CRYPT_TCRYPT_HIDDEN_HEADER)
dmd.size = hdr->d.hidden_volume_size / hdr->d.sector_size;
else
dmd.size = hdr->d.volume_size / hdr->d.sector_size;
r = device_block_adjust(cd, dmd.data_device, DEV_EXCL, r = device_block_adjust(cd, dmd.data_device, DEV_EXCL,
dmd.u.crypt.offset, &dmd.size, &dmd.flags); dmd.u.crypt.offset, &dmd.size, &dmd.flags);
if (r) if (r)
@@ -802,19 +808,49 @@ int TCRYPT_init_by_name(struct crypt_device *cd, const char *name,
return 0; return 0;
} }
uint64_t TCRYPT_get_data_offset(struct tcrypt_phdr *hdr) uint64_t TCRYPT_get_data_offset(struct crypt_device *cd,
struct tcrypt_phdr *hdr,
struct crypt_params_tcrypt *params)
{ {
uint64_t size;
if (params->mode && !strncmp(params->mode, "xts", 3)) {
if (hdr->d.version < 3)
return 1;
if (params->flags & CRYPT_TCRYPT_HIDDEN_HEADER) {
if (hdr->d.version > 3)
return (hdr->d.mk_offset / hdr->d.sector_size);
if (device_size(crypt_metadata_device(cd), &size) < 0)
return 0;
return (size - hdr->d.hidden_volume_size +
(TCRYPT_HDR_HIDDEN_OFFSET_OLD)) / hdr->d.sector_size;
}
return (hdr->d.mk_offset / hdr->d.sector_size);
}
if (params->flags & CRYPT_TCRYPT_HIDDEN_HEADER) {
if (device_size(crypt_metadata_device(cd), &size) < 0)
return 0;
return (size - hdr->d.hidden_volume_size +
(TCRYPT_HDR_HIDDEN_OFFSET_OLD)) / hdr->d.sector_size;
}
// FIXME: system vol. // FIXME: system vol.
if (!hdr->d.mk_offset) return hdr->d.mk_offset / hdr->d.sector_size;
return 1;
return (hdr->d.mk_offset / hdr->d.sector_size);
} }
uint64_t TCRYPT_get_iv_offset(struct tcrypt_phdr *hdr) uint64_t TCRYPT_get_iv_offset(struct crypt_device *cd,
struct tcrypt_phdr *hdr,
struct crypt_params_tcrypt *params
)
{ {
if (!hdr->d.mk_offset) if (params->mode && !strncmp(params->mode, "xts", 3))
return TCRYPT_get_data_offset(cd, hdr, params);
else if (params->mode && !strncmp(params->mode, "lrw", 3))
return 0; return 0;
return (hdr->d.mk_offset / hdr->d.sector_size);
return hdr->d.mk_offset / hdr->d.sector_size;
} }
int TCRYPT_get_volume_key(struct crypt_device *cd, int TCRYPT_get_volume_key(struct crypt_device *cd,

9
lib/tcrypt/tcrypt.h
View File

@@ -91,8 +91,13 @@ int TCRYPT_activate(struct crypt_device *cd,
int TCRYPT_deactivate(struct crypt_device *cd, int TCRYPT_deactivate(struct crypt_device *cd,
const char *name); const char *name);
uint64_t TCRYPT_get_data_offset(struct tcrypt_phdr *hdr); uint64_t TCRYPT_get_data_offset(struct crypt_device *cd,
uint64_t TCRYPT_get_iv_offset(struct tcrypt_phdr *hdr); struct tcrypt_phdr *hdr,
struct crypt_params_tcrypt *params);
uint64_t TCRYPT_get_iv_offset(struct crypt_device *cd,
struct tcrypt_phdr *hdr,
struct crypt_params_tcrypt *params);
int TCRYPT_get_volume_key(struct crypt_device *cd, int TCRYPT_get_volume_key(struct crypt_device *cd,
struct tcrypt_phdr *hdr, struct tcrypt_phdr *hdr,