struct crypt_device {
char *type;
- char *device;
- char *metadata_device;
-
- /* loopback automatic detach helpers */
- int loop_device_fd;
- int loop_metadata_device_fd;
+ struct device *device;
+ struct device *metadata_device;
struct volume_key *volume_key;
uint64_t timeout;
/* used in CRYPT_VERITY */
struct crypt_params_verity verity_hdr;
char *verity_root_hash;
- uint64_t verity_root_hash_size;
+ unsigned int verity_root_hash_size;
char *verity_uuid;
/* callbacks definitions */
free(target);
}
-static const char *mdata_device(struct crypt_device *cd)
+static const char *mdata_device_path(struct crypt_device *cd)
+{
+ return device_path(cd->metadata_device ?: cd->device);
+}
+
+/* internal only */
+struct device *crypt_metadata_device(struct crypt_device *cd)
{
return cd->metadata_device ?: cd->device;
}
+struct device *crypt_data_device(struct crypt_device *cd)
+{
+ return cd->device;
+}
+
static int init_crypto(struct crypt_device *ctx)
{
int r;
.uuid = crypt_get_uuid(cd),
.size = size,
.flags = flags,
- .data_device = crypt_get_device_name(cd),
+ .data_device = crypt_data_device(cd),
.u.crypt = {
.cipher = NULL,
.vk = vk,
else
device_check = DEV_EXCL;
- r = device_check_and_adjust(cd, dmd.data_device, device_check,
- &dmd.size, &dmd.u.crypt.offset, &dmd.flags);
+ r = device_block_adjust(cd, dmd.data_device, device_check,
+ dmd.u.crypt.offset, &dmd.size, &dmd.flags);
if (r)
return r;
log_dbg("Trying to activate PLAIN device %s using cipher %s.",
name, dmd.u.crypt.cipher);
- r = dm_create_device(name, CRYPT_PLAIN, &dmd, 0);
+ r = dm_create_device(cd, name, CRYPT_PLAIN, &dmd, 0);
// FIXME
- if (!cd->plain_uuid && dm_query_device(name, DM_ACTIVE_UUID, &dmd) >= 0)
+ if (!cd->plain_uuid && dm_query_device(cd, name, DM_ACTIVE_UUID, &dmd) >= 0)
cd->plain_uuid = CONST_CAST(char*)dmd.uuid;
free(dm_cipher);
if(r < 0)
goto out;
- r = LUKS_open_key_with_hdr(mdata_device(cd), keyslot, passphrase_read,
+ r = LUKS_open_key_with_hdr(keyslot, passphrase_read,
passphrase_size_read, &cd->hdr, vk, cd);
if (r == -EPERM)
eperm = 1;
return dm_get_dir();
}
-static int set_device_or_loop(const char *device_org, char **device, int *loop_fd)
-{
- int r, readonly = 0;
-
- if (!device_org)
- return 0;
-
- r = device_ready(NULL, device_org, O_RDONLY);
- if (r == -ENOTBLK) {
- *device = crypt_loop_get_device();
- log_dbg("Not a block device, %s%s.", *device ?
- "using free loop device " : "no free loop device found",
- *device ?: "");
- if (!*device) {
- log_err(NULL, _("Cannot find a free loopback device.\n"));
- return -ENOSYS;
- }
-
- /* Keep the loop open, dettached on last close. */
- *loop_fd = crypt_loop_attach(*device, device_org, 0, 1, &readonly);
- if (*loop_fd == -1) {
- log_err(NULL, _("Attaching loopback device failed "
- "(loop device with autoclear flag is required).\n"));
- return -EINVAL;
- }
-
- r = device_ready(NULL, *device, O_RDONLY);
- }
-
- if (r < 0)
- return -ENOTBLK;
-
- if (!*device && device_org && !(*device = strdup(device_org)))
- return -ENOMEM;
-
- return 0;
-}
-
int crypt_init(struct crypt_device **cd, const char *device)
{
struct crypt_device *h = NULL;
return -ENOMEM;
memset(h, 0, sizeof(*h));
- h->loop_device_fd = -1;
- h->loop_metadata_device_fd = -1;
- r = set_device_or_loop(device, &h->device, &h->loop_device_fd);
+ r = device_alloc(&h->device, device);
if (r < 0)
goto bad;
- if (dm_init(h, 1) < 0) {
- r = -ENOSYS;
- goto bad;
- }
+ dm_backend_init();
h->iteration_time = 1000;
h->password_verify = 0;
*cd = h;
return 0;
bad:
-
- if (h) {
- if (h->loop_device_fd != -1)
- close(h->loop_device_fd);
- free(h->device);
- }
+ device_free(h->device);
free(h);
return r;
}
/* Check data device size, require at least one sector */
size_min = crypt_get_data_offset(cd) << SECTOR_SHIFT ?: SECTOR_SIZE;
- r = device_size(crypt_get_device_name(cd), &size);
+ r = device_size(cd->device, &size);
if (r < 0)
return r;
if (size < size_min) {
- log_err(cd, _("LUKS header detected but device %s is too small.\n"),
- crypt_get_device_name(cd));
+ log_err(cd, _("Header detected but device %s is too small.\n"),
+ device_path(cd->device));
return -EINVAL;
}
int crypt_set_data_device(struct crypt_device *cd, const char *device)
{
- char *data_device = NULL;
- int r, loop_fd = -1;
+ struct device *dev = NULL;
+ int r;
log_dbg("Setting ciphertext data device to %s.", device ?: "(none)");
if (!cd->device || !device)
return -EINVAL;
- r = set_device_or_loop(device, &data_device, &loop_fd);
+ r = device_alloc(&dev, device);
if (r < 0)
return r;
if (!cd->metadata_device) {
cd->metadata_device = cd->device;
- cd->loop_metadata_device_fd = cd->loop_device_fd;
- } else {
- free(cd->device);
- if (cd->loop_device_fd != -1)
- close(cd->loop_device_fd);
- }
+ } else
+ device_free(cd->device);
- cd->device = data_device;
- cd->loop_device_fd = loop_fd;
+ cd->device = dev;
return crypt_check_data_device_size(cd);
}
if (r < 0)
return r;
- r = LUKS_read_phdr(mdata_device(cd), &hdr, require_header, repair, cd);
+ r = LUKS_read_phdr(&hdr, require_header, repair, cd);
if (r < 0)
return r;
if (params)
sb_offset = params->hash_area_offset;
- r = VERITY_read_sb(cd, mdata_device(cd), sb_offset,
- &cd->verity_uuid, &cd->verity_hdr);
+ r = VERITY_read_sb(cd, sb_offset, &cd->verity_uuid, &cd->verity_hdr);
if (r < 0)
return r;
if (params)
cd->verity_hdr.flags = params->flags;
- if (params && params->data_device &&
- (r = crypt_set_data_device(cd, params->data_device)) < 0)
- return r;
-
+ /* Hash availability checked in sb load */
cd->verity_root_hash_size = crypt_hash_size(cd->verity_hdr.hash_name);
+ if (cd->verity_root_hash_size > 4096)
+ return -EINVAL;
if (!cd->type && !(cd->type = strdup(CRYPT_VERITY)))
return -ENOMEM;
+ if (params && params->data_device &&
+ (r = crypt_set_data_device(cd, params->data_device)) < 0)
+ return r;
+
return r;
}
char cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
int key_nums, r;
- r = dm_query_device(name, DM_ACTIVE_DEVICE |
- DM_ACTIVE_UUID |
- DM_ACTIVE_CRYPT_CIPHER |
- DM_ACTIVE_CRYPT_KEYSIZE, &dmd);
+ r = dm_query_device(cd, name,
+ DM_ACTIVE_DEVICE |
+ DM_ACTIVE_UUID |
+ DM_ACTIVE_CRYPT_CIPHER |
+ DM_ACTIVE_CRYPT_KEYSIZE, &dmd);
if (r < 0)
goto out;
cd->loopaes_key_size = dmd.u.crypt.vk->keylength / key_nums;
}
} else if (isLUKS(cd->type)) {
- if (mdata_device(cd)) {
+ if (crypt_metadata_device(cd)) {
r = _crypt_load_luks1(cd, 0, 0);
if (r < 0) {
log_dbg("LUKS device header does not match active device.");
}
out:
crypt_free_volume_key(dmd.u.crypt.vk);
+ device_free(dmd.data_device);
free(CONST_CAST(void*)dmd.u.crypt.cipher);
- free(CONST_CAST(void*)dmd.data_device);
free(CONST_CAST(void*)dmd.uuid);
return r;
}
};
int r;
- r = dm_query_device(name, DM_ACTIVE_DEVICE |
- DM_ACTIVE_UUID |
- DM_ACTIVE_VERITY_HASH_DEVICE |
- DM_ACTIVE_VERITY_PARAMS, &dmd);
+ r = dm_query_device(cd, name,
+ DM_ACTIVE_DEVICE |
+ DM_ACTIVE_UUID |
+ DM_ACTIVE_VERITY_HASH_DEVICE |
+ DM_ACTIVE_VERITY_PARAMS, &dmd);
if (r < 0)
goto out;
cd->verity_hdr.flags = params.flags;
cd->verity_hdr.salt_size = params.salt_size;
cd->verity_hdr.salt = params.salt;
- if (!(cd->metadata_device = strdup(dmd.u.verity.hash_device)))
- r = -ENOMEM;
+ cd->metadata_device = dmd.u.verity.hash_device;
}
out:
- free(CONST_CAST(void*)dmd.u.verity.hash_device);
- free(CONST_CAST(void*)dmd.data_device);
+ device_free(dmd.data_device);
free(CONST_CAST(void*)dmd.uuid);
return r;
}
return -ENODEV;
}
- r = dm_query_device(name, DM_ACTIVE_DEVICE | DM_ACTIVE_UUID, &dmd);
+ r = dm_query_device(NULL, name, DM_ACTIVE_DEVICE | DM_ACTIVE_UUID, &dmd);
if (r < 0)
goto out;
if (header_device) {
r = crypt_init(cd, header_device);
} else {
- r = crypt_init(cd, dmd.data_device);
+ r = crypt_init(cd, device_path(dmd.data_device));
/* Underlying device disappeared but mapping still active */
if (!dmd.data_device || r == -ENOTBLK)
/* Underlying device is not readable but crypt mapping exists */
if (r == -ENOTBLK) {
- free(CONST_CAST(void*)dmd.data_device);
+ device_free(dmd.data_device);
dmd.data_device = NULL;
r = crypt_init(cd, NULL);
}
log_dbg("Active device has no UUID set, some parameters are not set.");
if (header_device) {
- r = crypt_set_data_device(*cd, dmd.data_device);
+ r = crypt_set_data_device(*cd, device_path(dmd.data_device));
if (r < 0)
goto out;
}
crypt_free(*cd);
*cd = NULL;
}
- free(CONST_CAST(void*)dmd.data_device);
+ device_free(dmd.data_device);
free(CONST_CAST(void*)dmd.uuid);
return r;
}
unsigned long required_alignment = DEFAULT_DISK_ALIGNMENT;
unsigned long alignment_offset = 0;
- if (!mdata_device(cd)) {
+ if (!crypt_metadata_device(cd)) {
log_err(cd, _("Can't format LUKS without device.\n"));
return -EINVAL;
}
if (params && params->data_device) {
cd->metadata_device = cd->device;
- if (!(cd->device = strdup(params->data_device)))
+ cd->device = NULL;
+ if (device_alloc(&cd->device, params->data_device) < 0)
return -ENOMEM;
required_alignment = params->data_alignment * SECTOR_SIZE;
} else if (params && params->data_alignment) {
required_alignment = params->data_alignment * SECTOR_SIZE;
} else
- get_topology_alignment(cd->device, &required_alignment,
+ device_topology_alignment(cd->device,
+ &required_alignment,
&alignment_offset, DEFAULT_DISK_ALIGNMENT);
+ /* Check early if we cannot allocate block device for key slot access */
+ r = device_block_adjust(cd, cd->device, DEV_OK, 0, NULL, NULL);
+ if(r < 0)
+ return r;
+
r = LUKS_generate_phdr(&cd->hdr, cd->volume_key, cipher, cipher_mode,
(params && params->hash) ? params->hash : "sha1",
uuid, LUKS_STRIPES,
required_alignment / SECTOR_SIZE,
alignment_offset / SECTOR_SIZE,
cd->iteration_time, &cd->PBKDF2_per_sec,
- cd->metadata_device, cd);
+ cd->metadata_device ? 1 : 0, cd);
if(r < 0)
return r;
/* Wipe first 8 sectors - fs magic numbers etc. */
- r = crypt_wipe(mdata_device(cd), 0, 8 * SECTOR_SIZE, CRYPT_WIPE_ZERO, 1);
+ r = crypt_wipe(crypt_metadata_device(cd), 0, 8 * SECTOR_SIZE, CRYPT_WIPE_ZERO, 1);
if(r < 0) {
if (r == -EBUSY)
log_err(cd, _("Cannot format device %s which is still in use.\n"),
- mdata_device(cd));
- else
+ mdata_device_path(cd));
+ else if (r == -EACCES) {
+ log_err(cd, _("Cannot format device %s, permission denied.\n"),
+ mdata_device_path(cd));
+ r = -EINVAL;
+ } else
log_err(cd, _("Cannot wipe header on device %s.\n"),
- mdata_device(cd));
+ mdata_device_path(cd));
return r;
}
- r = LUKS_write_phdr(mdata_device(cd), &cd->hdr, cd);
+ r = LUKS_write_phdr(&cd->hdr, cd);
return r;
}
size_t volume_key_size,
struct crypt_params_loopaes *params)
{
- if (!mdata_device(cd)) {
+ if (!crypt_metadata_device(cd)) {
log_err(cd, _("Can't format LOOPAES without device.\n"));
return -EINVAL;
}
const char *uuid,
struct crypt_params_verity *params)
{
- int r = 0;
+ int r = 0, hash_size;
uint64_t data_device_size;
- if (!mdata_device(cd)) {
+ if (!crypt_metadata_device(cd)) {
log_err(cd, _("Can't format VERITY without device.\n"));
return -EINVAL;
}
if (!params || !params->data_device)
return -EINVAL;
+ if (params->hash_type > VERITY_MAX_HASH_TYPE) {
+ log_err(cd, _("Unsupported VERITY hash type %d.\n"), params->hash_type);
+ return -EINVAL;
+ }
+
+ if (VERITY_BLOCK_SIZE_OK(params->data_block_size) ||
+ VERITY_BLOCK_SIZE_OK(params->hash_block_size)) {
+ log_err(cd, _("Unsupported VERITY block size.\n"));
+ return -EINVAL;
+ }
+
+ if (params->hash_area_offset % 512) {
+ log_err(cd, _("Unsupported VERITY hash offset.\n"));
+ return -EINVAL;
+ }
+
if (!(cd->type = strdup(CRYPT_VERITY)))
return -ENOMEM;
if (r)
return r;
if (!params->data_size) {
- r = device_size(params->data_device, &data_device_size);
+ r = device_size(cd->device, &data_device_size);
if (r < 0)
return r;
} else
cd->verity_hdr.data_size = params->data_size;
- cd->verity_root_hash_size = crypt_hash_size(params->hash_name);
- if (!cd->verity_root_hash_size)
+ hash_size = crypt_hash_size(params->hash_name);
+ if (hash_size <= 0) {
+ log_err(cd, _("Hash algorithm %s not supported.\n"),
+ params->hash_name);
return -EINVAL;
+ }
+ cd->verity_root_hash_size = hash_size;
cd->verity_root_hash = malloc(cd->verity_root_hash_size);
if (!cd->verity_root_hash)
return r;
if (params->flags & CRYPT_VERITY_CREATE_HASH) {
- r = VERITY_create(cd, &cd->verity_hdr, cd->device, mdata_device(cd),
+ r = VERITY_create(cd, &cd->verity_hdr,
cd->verity_root_hash, cd->verity_root_hash_size);
if (r)
return r;
return r;
}
- r = VERITY_write_sb(cd, mdata_device(cd),
- cd->verity_hdr.hash_area_offset,
+ r = VERITY_write_sb(cd, cd->verity_hdr.hash_area_offset,
cd->verity_uuid,
&cd->verity_hdr);
}
return -EINVAL;
}
- log_dbg("Formatting device %s as type %s.", mdata_device(cd) ?: "(none)", type);
+ log_dbg("Formatting device %s as type %s.", mdata_device_path(cd) ?: "(none)", type);
r = init_crypto(cd);
if (r < 0)
int r;
log_dbg("Trying to load %s crypt type from device %s.",
- requested_type ?: "any", mdata_device(cd) ?: "(none)");
+ requested_type ?: "any", mdata_device_path(cd) ?: "(none)");
- if (!mdata_device(cd))
+ if (!crypt_metadata_device(cd))
return -EINVAL;
if (!requested_type || isLUKS(requested_type)) {
} else
return -EINVAL;
- if (r < 0)
- return r;
-
- /* cd->type and header must be set in context */
- r = crypt_check_data_device_size(cd);
- if (r < 0) {
- free(cd->type);
- cd->type = NULL;
- }
-
return r;
}
int r;
log_dbg("Trying to repair %s crypt type from device %s.",
- requested_type ?: "any", mdata_device(cd) ?: "(none)");
+ requested_type ?: "any", mdata_device_path(cd) ?: "(none)");
- if (!mdata_device(cd))
+ if (!crypt_metadata_device(cd))
return -EINVAL;
if (requested_type && !isLUKS(requested_type))
log_dbg("Resizing device %s to %" PRIu64 " sectors.", name, new_size);
- r = dm_query_device(name, DM_ACTIVE_DEVICE | DM_ACTIVE_CRYPT_CIPHER |
+ r = dm_query_device(cd, name, DM_ACTIVE_DEVICE | DM_ACTIVE_CRYPT_CIPHER |
DM_ACTIVE_UUID | DM_ACTIVE_CRYPT_KEYSIZE |
DM_ACTIVE_CRYPT_KEY, &dmd);
if (r < 0) {
goto out;
}
- r = device_check_and_adjust(cd, dmd.data_device, DEV_OK, &new_size,
- &dmd.u.crypt.offset, &dmd.flags);
+ r = device_block_adjust(cd, dmd.data_device, DEV_OK,
+ dmd.u.crypt.offset, &new_size, &dmd.flags);
if (r)
goto out;
r = 0;
} else {
dmd.size = new_size;
- r = dm_create_device(name, cd->type, &dmd, 1);
+ r = dm_create_device(cd, name, cd->type, &dmd, 1);
}
out:
if (dmd.target == DM_CRYPT) {
if (uuid && !strncmp(uuid, cd->hdr.uuid, sizeof(cd->hdr.uuid))) {
log_dbg("UUID is the same as requested (%s) for device %s.",
- uuid, mdata_device(cd));
+ uuid, mdata_device_path(cd));
return 0;
}
if (uuid)
- log_dbg("Requested new UUID change to %s for %s.", uuid, mdata_device(cd));
+ log_dbg("Requested new UUID change to %s for %s.", uuid, mdata_device_path(cd));
else
- log_dbg("Requested new UUID refresh for %s.", mdata_device(cd));
+ log_dbg("Requested new UUID refresh for %s.", mdata_device_path(cd));
if (!crypt_confirm(cd, _("Do you really want to change UUID of device?")))
return -EPERM;
- return LUKS_hdr_uuid_set(mdata_device(cd), &cd->hdr, uuid, cd);
+ return LUKS_hdr_uuid_set(&cd->hdr, uuid, cd);
}
int crypt_header_backup(struct crypt_device *cd,
return r;
log_dbg("Requested header backup of device %s (%s) to "
- "file %s.", mdata_device(cd), requested_type, backup_file);
+ "file %s.", mdata_device_path(cd), requested_type, backup_file);
- return LUKS_hdr_backup(backup_file, mdata_device(cd), &cd->hdr, cd);
+ return LUKS_hdr_backup(backup_file, &cd->hdr, cd);
}
int crypt_header_restore(struct crypt_device *cd,
return r;
log_dbg("Requested header restore to device %s (%s) from "
- "file %s.", mdata_device(cd), requested_type, backup_file);
+ "file %s.", mdata_device_path(cd), requested_type, backup_file);
- return LUKS_hdr_restore(backup_file, mdata_device(cd), &cd->hdr, cd);
+ return LUKS_hdr_restore(backup_file, &cd->hdr, cd);
}
void crypt_free(struct crypt_device *cd)
{
if (cd) {
- log_dbg("Releasing crypt device %s context.", mdata_device(cd));
+ log_dbg("Releasing crypt device %s context.", mdata_device_path(cd));
- if (cd->loop_device_fd != -1)
- close(cd->loop_device_fd);
- if (cd->loop_metadata_device_fd != -1)
- close(cd->loop_metadata_device_fd);
-
- dm_exit();
+ dm_backend_exit();
crypt_free_volume_key(cd->volume_key);
- free(cd->device);
- free(cd->metadata_device);
+ device_free(cd->device);
+ device_free(cd->metadata_device);
free(cd->type);
/* used in plain device only */
return -EINVAL;
}
- if (!cd && dm_init(NULL, 1) < 0)
- return -ENOSYS;
+ if (!cd)
+ dm_backend_init();
- r = dm_status_suspended(name);
+ r = dm_status_suspended(cd, name);
if (r < 0)
goto out;
goto out;
}
- r = dm_suspend_and_wipe_key(name);
+ r = dm_suspend_and_wipe_key(cd, name);
if (r == -ENOTSUP)
log_err(cd, "Suspend is not supported for device %s.\n", name);
else if (r)
log_err(cd, "Error during suspending device %s.\n", name);
out:
if (!cd)
- dm_exit();
+ dm_backend_exit();
return r;
}
goto out;
}
- r = dm_status_suspended(name);
+ r = dm_status_suspended(cd, name);
if (r < 0)
return r;
}
if (passphrase) {
- r = LUKS_open_key_with_hdr(mdata_device(cd), keyslot, passphrase,
- passphrase_size, &cd->hdr, &vk, cd);
+ r = LUKS_open_key_with_hdr(keyslot, passphrase, passphrase_size,
+ &cd->hdr, &vk, cd);
} else
r = volume_key_by_terminal_passphrase(cd, keyslot, &vk);
if (r >= 0) {
keyslot = r;
- r = dm_resume_and_reinstate_key(name, vk->keylength, vk->key);
+ r = dm_resume_and_reinstate_key(cd, name, vk->keylength, vk->key);
if (r == -ENOTSUP)
log_err(cd, "Resume is not supported for device %s.\n", name);
else if (r)
goto out;
}
- r = dm_status_suspended(name);
+ r = dm_status_suspended(cd, name);
if (r < 0)
return r;
if (r < 0)
goto out;
- r = LUKS_open_key_with_hdr(mdata_device(cd), keyslot, passphrase_read,
+ r = LUKS_open_key_with_hdr(keyslot, passphrase_read,
passphrase_size_read, &cd->hdr, &vk, cd);
if (r < 0)
goto out;
keyslot = r;
- r = dm_resume_and_reinstate_key(name, vk->keylength, vk->key);
+ r = dm_resume_and_reinstate_key(cd, name, vk->keylength, vk->key);
if (r)
log_err(cd, "Error during resuming device %s.\n", name);
out:
}
} else if (passphrase) {
/* Passphrase provided, use it to unlock existing keyslot */
- r = LUKS_open_key_with_hdr(mdata_device(cd), CRYPT_ANY_SLOT, passphrase,
+ r = LUKS_open_key_with_hdr(CRYPT_ANY_SLOT, passphrase,
passphrase_size, &cd->hdr, &vk, cd);
} else {
/* Passphrase not provided, ask first and use it to unlock existing keyslot */
if (r < 0)
goto out;
- r = LUKS_open_key_with_hdr(mdata_device(cd), CRYPT_ANY_SLOT, password,
+ r = LUKS_open_key_with_hdr(CRYPT_ANY_SLOT, password,
passwordLen, &cd->hdr, &vk, cd);
crypt_safe_free(password);
}
goto out;
}
- r = LUKS_set_key(mdata_device(cd), keyslot, new_password, new_passwordLen,
+ r = LUKS_set_key(keyslot, new_password, new_passwordLen,
&cd->hdr, vk, cd->iteration_time, &cd->PBKDF2_per_sec, cd);
if(r < 0) goto out;
if (r < 0)
goto out;
- r = LUKS_open_key_with_hdr(mdata_device(cd), CRYPT_ANY_SLOT, password, passwordLen,
+ r = LUKS_open_key_with_hdr(CRYPT_ANY_SLOT, password, passwordLen,
&cd->hdr, &vk, cd);
}
if (r < 0)
goto out;
- r = LUKS_set_key(mdata_device(cd), keyslot, new_password, new_passwordLen,
+ r = LUKS_set_key(keyslot, new_password, new_passwordLen,
&cd->hdr, vk, cd->iteration_time, &cd->PBKDF2_per_sec, cd);
out:
crypt_safe_free(password);
passphrase_size = new_passwordLen;
}
- r = LUKS_set_key(mdata_device(cd), keyslot, passphrase, passphrase_size,
+ r = LUKS_set_key(keyslot, passphrase, passphrase_size,
&cd->hdr, vk, cd->iteration_time, &cd->PBKDF2_per_sec, cd);
out:
crypt_safe_free(new_password);
return -EINVAL;
}
- return LUKS_del_key(mdata_device(cd), keyslot, &cd->hdr, cd);
+ return LUKS_del_key(keyslot, &cd->hdr, cd);
}
// activation/deactivation of device mapping
} else if (isLUKS(cd->type)) {
/* provided passphrase, do not retry */
if (passphrase) {
- r = LUKS_open_key_with_hdr(mdata_device(cd), keyslot, passphrase,
+ r = LUKS_open_key_with_hdr(keyslot, passphrase,
passphrase_size, &cd->hdr, &vk, cd);
} else
r = volume_key_by_terminal_passphrase(cd, keyslot, &vk);
&passphrase_size_read, keyfile, keyfile_offset, keyfile_size);
if (r < 0)
goto out;
- r = LUKS_open_key_with_hdr(mdata_device(cd), keyslot, passphrase_read,
+ r = LUKS_open_key_with_hdr(keyslot, passphrase_read,
passphrase_size_read, &cd->hdr, &vk, cd);
if (r < 0)
goto out;
return -EINVAL;
}
- r = VERITY_activate(cd, name, mdata_device(cd),
- volume_key, volume_key_size,
+ r = VERITY_activate(cd, name, volume_key, volume_key_size,
&cd->verity_hdr, CRYPT_ACTIVATE_READONLY);
if (r == -EPERM) {
log_dbg("Deactivating volume %s.", name);
- if (!cd && dm_init(NULL, 1) < 0)
- return -ENOSYS;
+ if (!cd)
+ dm_backend_init();
switch (crypt_status(cd, name)) {
case CRYPT_ACTIVE:
case CRYPT_BUSY:
- r = dm_remove_device(name, 0, 0);
+ r = dm_remove_device(cd, name, 0, 0);
break;
case CRYPT_INACTIVE:
log_err(cd, _("Device %s is not active.\n"), name);
}
if (!cd)
- dm_exit();
+ dm_backend_exit();
return r;
}
if (r < 0)
log_err(cd, _("Cannot retrieve volume key for plain device.\n"));
} else if (isLUKS(cd->type)) {
- r = LUKS_open_key_with_hdr(mdata_device(cd), keyslot, passphrase,
+ r = LUKS_open_key_with_hdr(keyslot, passphrase,
passphrase_size, &cd->hdr, &vk, cd);
} else
{
int r;
- if (!cd && dm_init(NULL, 1) < 0)
- return CRYPT_INVALID;
+ if (!cd)
+ dm_backend_init();
- r = dm_status_device(name);
+ r = dm_status_device(cd, name);
if (!cd)
- dm_exit();
+ dm_backend_exit();
if (r < 0 && r != -ENODEV)
return CRYPT_INVALID;
{
int i;
- log_std(cd, "LUKS header information for %s\n\n", mdata_device(cd));
+ log_std(cd, "LUKS header information for %s\n\n", mdata_device_path(cd));
log_std(cd, "Version: \t%d\n", cd->hdr.version);
log_std(cd, "Cipher name: \t%s\n", cd->hdr.cipherName);
log_std(cd, "Cipher mode: \t%s\n", cd->hdr.cipherMode);
static int _verity_dump(struct crypt_device *cd)
{
- log_std(cd, "VERITY header information for %s\n", mdata_device(cd));
+ log_std(cd, "VERITY header information for %s\n", mdata_device_path(cd));
log_std(cd, "UUID: \t%s\n", cd->verity_uuid ?: "");
log_std(cd, "Hash type: \t%u\n", cd->verity_hdr.hash_type);
log_std(cd, "Data blocks: \t%" PRIu64 "\n", cd->verity_hdr.data_size);
const char *crypt_get_device_name(struct crypt_device *cd)
{
- return cd->device;
+ const char *path = device_block_path(cd->device);
+
+ if (!path)
+ path = device_path(cd->device);
+
+ return path;
}
int crypt_get_volume_key_size(struct crypt_device *cd)
if (!isVERITY(cd->type) || !vp)
return -EINVAL;
- vp->data_device = cd->device;
- vp->hash_device = mdata_device(cd);
+ vp->data_device = device_path(cd->device);
+ vp->hash_device = mdata_device_path(cd);
vp->hash_name = cd->verity_hdr.hash_name;
vp->salt = cd->verity_hdr.salt;
vp->salt_size = cd->verity_hdr.salt_size;
struct crypt_dm_active_device dmd;
int r;
- r = dm_query_device(name, 0, &dmd);
+ r = dm_query_device(cd, name, 0, &dmd);
if (r < 0)
return r;
projects / platform / upstream / cryptsetup.git / blobdiff