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

Drop duplicate type check in LUKS2 encryption.

Browse Source
This commit is contained in:
Ondrej Kozina
2021-02-24 13:08:16 +01:00
parent 68130ef2f5
commit 3ebf7fa3bd
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cryptsetup.c
View File

@@ -2807,7 +2807,7 @@ static int action_encrypt_luks2(struct crypt_device **cd)
type = crypt_get_default_type(); type = crypt_get_default_type();
if (!isLUKS2(type)) { if (!isLUKS2(type)) {
log_err(_("Invalid LUKS device type.")); log_err(_("Encryption is supported only for LUKS2 format."));
return -EINVAL; return -EINVAL;
} }
@@ -2829,11 +2829,6 @@ static int action_encrypt_luks2(struct crypt_device **cd)
log_std(_("Adjusting --reduce-device-size value to twice the --offset %" PRIu64 " (sectors).\n"), ARG_UINT64(OPT_OFFSET_ID) * 2); log_std(_("Adjusting --reduce-device-size value to twice the --offset %" PRIu64 " (sectors).\n"), ARG_UINT64(OPT_OFFSET_ID) * 2);
} }
if (strncmp(type, CRYPT_LUKS2, strlen(CRYPT_LUKS2))) {
log_err(_("Encryption is supported only for LUKS2 format."));
return -EINVAL;
}
if (ARG_SET(OPT_UUID_ID) && uuid_parse(ARG_STR(OPT_UUID_ID), uuid) == -1) { if (ARG_SET(OPT_UUID_ID) && uuid_parse(ARG_STR(OPT_UUID_ID), uuid) == -1) {
log_err(_("Wrong LUKS UUID format provided.")); log_err(_("Wrong LUKS UUID format provided."));
return -EINVAL; return -EINVAL;