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

Add context to device handling functions.

Browse Source
This commit is contained in:
Milan Broz
2018-11-27 14:19:57 +01:00
parent a5a8467993
commit 7812214db6
16 changed files with 180 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/luks1/keyencryption.c
View File

@@ -75,7 +75,7 @@ static int LUKS_endec_template(char *src, size_t srcLength,
log_dbg(ctx, "Using dmcrypt to access keyslot area.");
bsize = device_block_size(dmd.data_device);
bsize = device_block_size(ctx, dmd.data_device);
alignment = device_alignment(dmd.data_device);
if (!bsize || !alignment)
return -EINVAL;
@@ -183,11 +183,11 @@ int LUKS_encrypt_to_storage(char *src, size_t srcLength,
r = -EIO;
/* Write buffer to device */
devfd = device_open(device, O_RDWR);
devfd = device_open(ctx, device, O_RDWR);
if (devfd < 0)
goto out;
if (write_lseek_blockwise(devfd, device_block_size(device),
if (write_lseek_blockwise(devfd, device_block_size(ctx, device),
device_alignment(device), src, srcLength,
sector * SECTOR_SIZE) < 0)
goto out;
@@ -195,7 +195,7 @@ int LUKS_encrypt_to_storage(char *src, size_t srcLength,
r = 0;
out:
if (devfd >= 0) {
device_sync(device, devfd);
device_sync(ctx, device, devfd);
close(devfd);
}
if (r)
@@ -240,14 +240,14 @@ int LUKS_decrypt_from_storage(char *dst, size_t dstLength,
log_dbg(ctx, "Using userspace crypto wrapper to access keyslot area.");
/* Read buffer from device */
devfd = device_open(device, O_RDONLY);
devfd = device_open(ctx, device, O_RDONLY);
if (devfd < 0) {
log_err(ctx, _("Cannot open device %s."), device_path(device));
crypt_storage_destroy(s);
return -EIO;
}
if (read_lseek_blockwise(devfd, device_block_size(device),
if (read_lseek_blockwise(devfd, device_block_size(ctx, device),
device_alignment(device), dst, dstLength,
sector * SECTOR_SIZE) < 0) {
if (!fstat(devfd, &st) && (st.st_size < (off_t)dstLength))