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

Remove unused code in reencryption.

Browse Source
This commit is contained in:
Ondrej Kozina
2023-04-19 09:46:36 +02:00
parent 7859673bd2
commit c81c3d1fc0
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/luks2/luks2_reencrypt.c
View File

@@ -1991,9 +1991,7 @@ static int reencrypt_set_decrypt_shift_segments(struct crypt_device *cd,
crypt_reencrypt_direction_info di) crypt_reencrypt_direction_info di)
{ {
int r; int r;
uint64_t first_segment_offset, first_segment_length, uint64_t data_offset = LUKS2_get_data_offset(hdr) << SECTOR_SHIFT;
second_segment_offset, second_segment_length,
data_offset = LUKS2_get_data_offset(hdr) << SECTOR_SHIFT;
json_object *jobj_segment_first = NULL, *jobj_segment_second = NULL, *jobj_segments; json_object *jobj_segment_first = NULL, *jobj_segment_second = NULL, *jobj_segments;
if (di == CRYPT_REENCRYPT_BACKWARD) if (di == CRYPT_REENCRYPT_BACKWARD)
@@ -2003,17 +2001,14 @@ static int reencrypt_set_decrypt_shift_segments(struct crypt_device *cd,
* future data_device layout: * future data_device layout:
* [encrypted first segment (max data shift size)][gap (data shift size)][second encrypted data segment] * [encrypted first segment (max data shift size)][gap (data shift size)][second encrypted data segment]
*/ */
first_segment_offset = 0;
first_segment_length = moved_segment_length;
jobj_segments = json_object_new_object(); jobj_segments = json_object_new_object();
if (!jobj_segments) if (!jobj_segments)
return -ENOMEM; return -ENOMEM;
r = -EINVAL; r = -EINVAL;
jobj_segment_first = json_segment_create_crypt(first_segment_offset, jobj_segment_first = json_segment_create_crypt(0, crypt_get_iv_offset(cd),
crypt_get_iv_offset(cd), &first_segment_length, &moved_segment_length, crypt_get_cipher_spec(cd),
crypt_get_cipher_spec(cd), crypt_get_sector_size(cd), 0); crypt_get_sector_size(cd), 0);
if (!jobj_segment_first) { if (!jobj_segment_first) {
log_dbg(cd, "Failed generate 1st segment."); log_dbg(cd, "Failed generate 1st segment.");
@@ -2025,11 +2020,9 @@ static int reencrypt_set_decrypt_shift_segments(struct crypt_device *cd,
goto err; goto err;
if (dev_size > moved_segment_length) { if (dev_size > moved_segment_length) {
second_segment_offset = data_offset + first_segment_length; jobj_segment_second = json_segment_create_crypt(data_offset + moved_segment_length,
second_segment_length = 0; crypt_get_iv_offset(cd) + (moved_segment_length >> SECTOR_SHIFT),
jobj_segment_second = json_segment_create_crypt(second_segment_offset, NULL,
crypt_get_iv_offset(cd) + (first_segment_length >> SECTOR_SHIFT),
second_segment_length ? &second_segment_length : NULL,
crypt_get_cipher_spec(cd), crypt_get_cipher_spec(cd),
crypt_get_sector_size(cd), 0); crypt_get_sector_size(cd), 0);
if (!jobj_segment_second) { if (!jobj_segment_second) {