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

Rename sector size related variables.

Browse Source
This commit is contained in:
Ondrej Kozina
2022-06-14 17:11:25 +02:00
parent 2240e75bb9
commit 369a18cd3b
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/luks2/luks2_reencrypt.c
View File

@@ -2790,7 +2790,7 @@ static int reencrypt_load_by_passphrase(struct crypt_device *cd,
struct luks2_reencrypt *rh; struct luks2_reencrypt *rh;
const struct volume_key *vk; const struct volume_key *vk;
size_t alignment; size_t alignment;
uint32_t old_ss, new_ss, sector_size; uint32_t old_sector_size, new_sector_size, sector_size;
struct crypt_dm_active_device dmd_target, dmd_source = { struct crypt_dm_active_device dmd_target, dmd_source = {
.uuid = crypt_get_uuid(cd), .uuid = crypt_get_uuid(cd),
.flags = CRYPT_ACTIVATE_SHARED /* turn off exclusive open checks */ .flags = CRYPT_ACTIVATE_SHARED /* turn off exclusive open checks */
@@ -2809,9 +2809,9 @@ static int reencrypt_load_by_passphrase(struct crypt_device *cd,
log_dbg(cd, "Loading LUKS2 reencryption context."); log_dbg(cd, "Loading LUKS2 reencryption context.");
old_ss = reencrypt_get_sector_size_old(hdr); old_sector_size = reencrypt_get_sector_size_old(hdr);
new_ss = reencrypt_get_sector_size_new(hdr); new_sector_size = reencrypt_get_sector_size_new(hdr);
sector_size = new_ss > old_ss ? new_ss : old_ss; sector_size = new_sector_size > old_sector_size ? new_sector_size : old_sector_size;
r = reencrypt_verify_resilience_params(cd, params, sector_size); r = reencrypt_verify_resilience_params(cd, params, sector_size);
if (r < 0) if (r < 0)
@@ -2918,8 +2918,8 @@ static int reencrypt_load_by_passphrase(struct crypt_device *cd,
if ((minimal_size && (required_size < minimal_size)) || if ((minimal_size && (required_size < minimal_size)) ||
(required_size > (device_size >> SECTOR_SHIFT)) || (required_size > (device_size >> SECTOR_SHIFT)) ||
(!dynamic && (required_size != minimal_size)) || (!dynamic && (required_size != minimal_size)) ||
(old_ss > 0 && MISALIGNED(required_size, old_ss >> SECTOR_SHIFT)) || (old_sector_size > 0 && MISALIGNED(required_size, old_sector_size >> SECTOR_SHIFT)) ||
(new_ss > 0 && MISALIGNED(required_size, new_ss >> SECTOR_SHIFT))) { (new_sector_size > 0 && MISALIGNED(required_size, new_sector_size >> SECTOR_SHIFT))) {
log_err(cd, _("Illegal device size requested in reencryption parameters.")); log_err(cd, _("Illegal device size requested in reencryption parameters."));
goto err; goto err;
} }

60
tests/luks2-reencryption-test
View File

@@ -1365,26 +1365,26 @@ fi
echo "[16] Offline reencryption with fixed device size." echo "[16] Offline reencryption with fixed device size."
preparebig 68 preparebig 68
for test_ss in $TEST_SECTORS; do for test_sector_size in $TEST_SECTORS; do
printf "sector size %4s: " $test_ss printf "sector size %4s: " $test_sector_size
for test_res in checksum journal none; do for test_res in checksum journal none; do
echo -n "[$test_res]" echo -n "[$test_res]"
reencrypt_offline_fixed_size $test_ss 2048 $HASH2 $test_res $((60*1024*2)) $HASH8 reencrypt_offline_fixed_size $test_sector_size 2048 $HASH2 $test_res $((60*1024*2)) $HASH8
reencrypt_offline_fixed_size $test_ss $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8 reencrypt_offline_fixed_size $test_sector_size $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8
reencrypt_offline_fixed_size $test_ss $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8 reencrypt_offline_fixed_size $test_sector_size $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8
echo -n "[OK]" echo -n "[OK]"
done done
echo "" echo ""
done done
echo "[17] Online reencryption with fixed device size." echo "[17] Online reencryption with fixed device size."
for test_ss in $TEST_SECTORS; do for test_sector_size in $TEST_SECTORS; do
printf "sector size %4s: " $test_ss printf "sector size %4s: " $test_sector_size
for test_res in checksum journal none; do for test_res in checksum journal none; do
echo -n "[$test_res]" echo -n "[$test_res]"
reencrypt_online_fixed_size $test_ss 2048 $HASH2 $test_res $((60*1024*2)) $HASH8 reencrypt_online_fixed_size $test_sector_size 2048 $HASH2 $test_res $((60*1024*2)) $HASH8
reencrypt_online_fixed_size $test_ss $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8 reencrypt_online_fixed_size $test_sector_size $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8
reencrypt_online_fixed_size $test_ss $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8 reencrypt_online_fixed_size $test_sector_size $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8
echo -n "[OK]" echo -n "[OK]"
done done
echo "" echo ""
@@ -1393,39 +1393,39 @@ done
echo "[18] Offline reencryption with fixed device size (detached header)." echo "[18] Offline reencryption with fixed device size (detached header)."
preparebig 60 preparebig 60
for test_ss in $TEST_SECTORS; do for test_sector_size in $TEST_SECTORS; do
printf "sector size %4s: " $test_ss printf "sector size %4s: " $test_sector_size
for test_res in checksum journal none; do for test_res in checksum journal none; do
echo -n "[$test_res]" echo -n "[$test_res]"
reencrypt_offline_fixed_size $test_ss 2048 $HASH2 $test_res $((60*1024*2)) $HASH8 $IMG_HDR reencrypt_offline_fixed_size $test_sector_size 2048 $HASH2 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
reencrypt_offline_fixed_size $test_ss $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8 $IMG_HDR reencrypt_offline_fixed_size $test_sector_size $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
reencrypt_offline_fixed_size $test_ss $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8 $IMG_HDR reencrypt_offline_fixed_size $test_sector_size $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
echo -n "[OK]" echo -n "[OK]"
done done
echo "" echo ""
done done
echo "[19] Online reencryption with fixed device size (detached header)." echo "[19] Online reencryption with fixed device size (detached header)."
for test_ss in $TEST_SECTORS; do for test_sector_size in $TEST_SECTORS; do
printf "sector size %4s: " $test_ss printf "sector size %4s: " $test_sector_size
for test_res in checksum journal none; do for test_res in checksum journal none; do
echo -n "[$test_res]" echo -n "[$test_res]"
reencrypt_online_fixed_size $test_ss 2048 $HASH2 $test_res $((60*1024*2)) $HASH8 $IMG_HDR reencrypt_online_fixed_size $test_sector_size 2048 $HASH2 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
reencrypt_online_fixed_size $test_ss $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8 $IMG_HDR reencrypt_online_fixed_size $test_sector_size $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
reencrypt_online_fixed_size $test_ss $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8 $IMG_HDR reencrypt_online_fixed_size $test_sector_size $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
echo -n "[OK]" echo -n "[OK]"
done done
echo "" echo ""
done done
echo "[20] Offline encryption with fixed device size (detached header)." echo "[20] Offline encryption with fixed device size (detached header)."
for test_ss in $TEST_SECTORS; do for test_sector_size in $TEST_SECTORS; do
printf "sector size %4s: " $test_ss printf "sector size %4s: " $test_sector_size
for test_res in checksum journal none; do for test_res in checksum journal none; do
echo -n "[$test_res]" echo -n "[$test_res]"
encrypt_offline_fixed_size $test_ss 2048 $HASH2 $test_res $((60*1024*2)) $HASH8 $IMG_HDR encrypt_offline_fixed_size $test_sector_size 2048 $HASH2 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
encrypt_offline_fixed_size $test_ss $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8 $IMG_HDR encrypt_offline_fixed_size $test_sector_size $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
encrypt_offline_fixed_size $test_ss $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8 $IMG_HDR encrypt_offline_fixed_size $test_sector_size $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
echo -n "[OK]" echo -n "[OK]"
done done
echo "" echo ""
@@ -1433,13 +1433,13 @@ done
echo "[21] Offline decryption with fixed device size (detached header)." echo "[21] Offline decryption with fixed device size (detached header)."
prepare_linear_dev 60 prepare_linear_dev 60
for test_ss in $TEST_SECTORS; do for test_sector_size in $TEST_SECTORS; do
printf "sector size %4s: " $test_ss printf "sector size %4s: " $test_sector_size
for test_res in checksum journal none; do for test_res in checksum journal none; do
echo -n "[$test_res]" echo -n "[$test_res]"
decrypt_offline_fixed_size $test_ss 2048 $HASH2 $test_res $((60*1024*2)) $HASH8 $IMG_HDR decrypt_offline_fixed_size $test_sector_size 2048 $HASH2 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
decrypt_offline_fixed_size $test_ss $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8 $IMG_HDR decrypt_offline_fixed_size $test_sector_size $((28*1024*2)) $HASH1 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
decrypt_offline_fixed_size $test_ss $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8 $IMG_HDR decrypt_offline_fixed_size $test_sector_size $((31*1024*2)) $HASH7 $test_res $((60*1024*2)) $HASH8 $IMG_HDR
echo -n "[OK]" echo -n "[OK]"
done done
echo "" echo ""