From 33b9a51fa8a1a168446f1caeb8099e198bed963a Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Tue, 5 Mar 2024 13:58:46 +0100 Subject: [PATCH] Fix regression in LUKS1 decryption. With removal of cryptsetup-reencrypt there was a bug introduced that broke resuming interrupted LUKS1 decryption operation. LUKS2 code was not affected. --- src/utils_reencrypt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils_reencrypt.c b/src/utils_reencrypt.c index 8d62ec8b..0d908bcf 100644 --- a/src/utils_reencrypt.c +++ b/src/utils_reencrypt.c @@ -1451,7 +1451,8 @@ static int _decrypt(struct crypt_device **cd, enum device_status_info dev_st, co assert(cd); - if (dev_st == DEVICE_LUKS1 || dev_st == DEVICE_LUKS1_UNUSABLE) + if (dev_st == DEVICE_LUKS1 || dev_st == DEVICE_LUKS1_UNUSABLE || + (dev_st == DEVICE_NOT_LUKS && ARG_SET(OPT_UUID_ID) && !ARG_SET(OPT_HEADER_ID))) return reencrypt_luks1(data_device); /* header file does not exist, try loading device type from data device */