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

Do not fail reencryption silently when --active-name is not LUKS2.

Browse Source
This commit is contained in:
Ondrej Kozina
2019-07-31 12:57:26 +02:00
parent 3bea349f9e
commit 7380731bf7
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cryptsetup.c
View File

@@ -3103,9 +3103,8 @@ static int action_reencrypt(void)
if (!opt_encrypt || opt_reencrypt_resume_only) { if (!opt_encrypt || opt_reencrypt_resume_only) {
if (opt_active_name) { if (opt_active_name) {
if ((r = crypt_init_by_name_and_header(&cd, opt_active_name, opt_header_device))) r = crypt_init_by_name_and_header(&cd, opt_active_name, opt_header_device);
return r; if (r || !crypt_get_type(cd) || strcmp(crypt_get_type(cd), CRYPT_LUKS2)) {
if (!crypt_get_type(cd) || strcmp(crypt_get_type(cd), CRYPT_LUKS2)) {
log_err(_("Device %s is not a valid LUKS device."), opt_active_name); log_err(_("Device %s is not a valid LUKS device."), opt_active_name);
r = -EINVAL; r = -EINVAL;
goto out; goto out;