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

Support --device-size option for plain devices.

Browse Source
This commit is contained in:
daniel.zatovic
2022-02-03 21:25:36 +01:00
committed by Milan Broz
parent bef46c950d
commit 452467661e
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cryptsetup.c
View File

@@ -145,7 +145,6 @@ static int action_open_plain(void)
.hash = ARG_SET(OPT_HASH_ID) ? ARG_STR(OPT_HASH_ID) : DEFAULT_PLAIN_HASH,
.skip = ARG_UINT64(OPT_SKIP_ID),
.offset = ARG_UINT64(OPT_OFFSET_ID),
.size = ARG_UINT64(OPT_SIZE_ID),
.sector_size = ARG_UINT32(OPT_SECTOR_SIZE_ID) ?: SECTOR_SIZE
};
char *password = NULL;
@@ -230,6 +229,11 @@ static int action_open_plain(void)
pmode = cipher_mode;
}
if (ARG_SET(OPT_DEVICE_SIZE_ID))
params.size = ARG_UINT64(OPT_DEVICE_SIZE_ID) / SECTOR_SIZE;
else if (ARG_SET(OPT_SIZE_ID))
params.size = ARG_UINT64(OPT_SIZE_ID);
r = crypt_format(cd, CRYPT_PLAIN,
pcipher, pmode,
NULL, NULL,
@@ -2738,6 +2742,9 @@ static const char * verify_open(void)
(strncmp(device_type, "luks", 4) && strcmp(device_type, "tcrypt") && strcmp(device_type, "bitlk"))))
return _("Option --test-passphrase is allowed only for open of LUKS, TCRYPT and BITLK devices.");
if (ARG_SET(OPT_DEVICE_SIZE_ID) && ARG_SET(OPT_SIZE_ID))
return _("Options --device-size and --size cannot be combined.");
/* "open --type tcrypt" and "tcryptDump" checks are identical */
return verify_tcryptdump();
}