From d43b495f21eaf943e0d5bf4b8f3754fe4dca45ab Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sat, 9 Apr 2022 16:57:36 +0200 Subject: [PATCH] test generators: unify mangle & kill header functions --- ...-luks2-area-in-json-hdr-space-json0.img.sh | 8 +---- ...nerate-luks2-argon2-leftover-params.img.sh | 8 +---- .../generate-luks2-correct-full-json0.img.sh | 8 +---- ...s2-corrupted-hdr0-with-correct-chks.img.sh | 6 +--- ...s2-corrupted-hdr1-with-correct-chks.img.sh | 6 +--- ...generate-luks2-invalid-json-size-c0.img.sh | 8 +---- ...generate-luks2-invalid-json-size-c1.img.sh | 8 +---- ...generate-luks2-invalid-json-size-c2.img.sh | 16 ++------- ...rate-luks2-invalid-keyslots-size-c0.img.sh | 8 +---- ...rate-luks2-invalid-keyslots-size-c1.img.sh | 8 +---- ...rate-luks2-invalid-keyslots-size-c2.img.sh | 8 +---- ...ate-luks2-invalid-object-type-json0.img.sh | 8 +---- ...te-luks2-invalid-opening-char-json0.img.sh | 8 +---- ...nerate-luks2-keyslot-missing-digest.img.sh | 8 +---- ...rate-luks2-keyslot-too-many-digests.img.sh | 8 +---- ...-luks2-metadata-size-128k-secondary.img.sh | 18 ++-------- .../generate-luks2-metadata-size-128k.img.sh | 18 ++-------- ...e-luks2-metadata-size-16k-secondary.img.sh | 18 ++-------- ...te-luks2-metadata-size-1m-secondary.img.sh | 18 ++-------- .../generate-luks2-metadata-size-1m.img.sh | 18 ++-------- ...-luks2-metadata-size-256k-secondary.img.sh | 18 ++-------- .../generate-luks2-metadata-size-256k.img.sh | 18 ++-------- ...te-luks2-metadata-size-2m-secondary.img.sh | 18 ++-------- .../generate-luks2-metadata-size-2m.img.sh | 18 ++-------- ...e-luks2-metadata-size-32k-secondary.img.sh | 18 ++-------- .../generate-luks2-metadata-size-32k.img.sh | 18 ++-------- ...te-luks2-metadata-size-4m-secondary.img.sh | 18 ++-------- .../generate-luks2-metadata-size-4m.img.sh | 18 ++-------- ...-luks2-metadata-size-512k-secondary.img.sh | 18 ++-------- .../generate-luks2-metadata-size-512k.img.sh | 18 ++-------- ...luks2-metadata-size-64k-inv-area-c0.img.sh | 18 ++-------- ...luks2-metadata-size-64k-inv-area-c1.img.sh | 18 ++-------- ...adata-size-64k-inv-keyslots-size-c0.img.sh | 18 ++-------- ...e-luks2-metadata-size-64k-secondary.img.sh | 18 ++-------- .../generate-luks2-metadata-size-64k.img.sh | 18 ++-------- ...ks2-metadata-size-invalid-secondary.img.sh | 18 ++-------- ...enerate-luks2-metadata-size-invalid.img.sh | 18 ++-------- ...issing-keyslot-referenced-in-digest.img.sh | 8 +---- ...missing-keyslot-referenced-in-token.img.sh | 8 +---- ...issing-segment-referenced-in-digest.img.sh | 8 +---- ...s2-missing-trailing-null-byte-json0.img.sh | 8 +---- ...te-luks2-non-null-byte-beyond-json0.img.sh | 8 +---- ...e-luks2-non-null-bytes-beyond-json0.img.sh | 8 +---- ...te-luks2-overlapping-areas-c0-json0.img.sh | 8 +---- ...te-luks2-overlapping-areas-c1-json0.img.sh | 8 +---- ...te-luks2-overlapping-areas-c2-json0.img.sh | 8 +---- ...rate-luks2-pbkdf2-leftover-params-0.img.sh | 8 +---- ...rate-luks2-pbkdf2-leftover-params-1.img.sh | 8 +---- ...s2-segment-crypt-missing-encryption.img.sh | 8 +---- ...uks2-segment-crypt-missing-ivoffset.img.sh | 8 +---- ...s2-segment-crypt-missing-sectorsize.img.sh | 8 +---- ...uks2-segment-crypt-wrong-encryption.img.sh | 8 +---- ...-luks2-segment-crypt-wrong-ivoffset.img.sh | 8 +---- ...s2-segment-crypt-wrong-sectorsize-0.img.sh | 8 +---- ...s2-segment-crypt-wrong-sectorsize-1.img.sh | 8 +---- ...s2-segment-crypt-wrong-sectorsize-2.img.sh | 8 +---- ...nerate-luks2-segment-missing-offset.img.sh | 8 +---- ...generate-luks2-segment-missing-size.img.sh | 8 +---- ...generate-luks2-segment-missing-type.img.sh | 8 +---- .../generate-luks2-segment-two.img.sh | 8 +---- ...generate-luks2-segment-unknown-type.img.sh | 8 +---- ...te-luks2-segment-wrong-backup-key-0.img.sh | 8 +---- ...te-luks2-segment-wrong-backup-key-1.img.sh | 8 +---- ...e-luks2-segment-wrong-flags-element.img.sh | 8 +---- .../generate-luks2-segment-wrong-flags.img.sh | 8 +---- ...generate-luks2-segment-wrong-offset.img.sh | 8 +---- ...generate-luks2-segment-wrong-size-0.img.sh | 8 +---- ...generate-luks2-segment-wrong-size-1.img.sh | 8 +---- ...generate-luks2-segment-wrong-size-2.img.sh | 8 +---- .../generate-luks2-segment-wrong-type.img.sh | 8 +---- ...erate-luks2-uint64-max-segment-size.img.sh | 8 +---- ...-luks2-uint64-overflow-segment-size.img.sh | 8 +---- ...te-luks2-uint64-signed-segment-size.img.sh | 8 +---- tests/generators/lib.sh | 36 +++++++++++++++++++ 74 files changed, 155 insertions(+), 689 deletions(-) diff --git a/tests/generators/generate-luks2-area-in-json-hdr-space-json0.img.sh b/tests/generators/generate-luks2-area-in-json-hdr-space-json0.img.sh index 1fac008f..a4fde598 100755 --- a/tests/generators/generate-luks2-area-in-json-hdr-space-json0.img.sh +++ b/tests/generators/generate-luks2-area-in-json-hdr-space-json0.img.sh @@ -25,13 +25,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-argon2-leftover-params.img.sh b/tests/generators/generate-luks2-argon2-leftover-params.img.sh index f89d7063..786df3d5 100755 --- a/tests/generators/generate-luks2-argon2-leftover-params.img.sh +++ b/tests/generators/generate-luks2-argon2-leftover-params.img.sh @@ -23,13 +23,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-correct-full-json0.img.sh b/tests/generators/generate-luks2-correct-full-json0.img.sh index fcc30cee..12e4110c 100755 --- a/tests/generators/generate-luks2-correct-full-json0.img.sh +++ b/tests/generators/generate-luks2-correct-full-json0.img.sh @@ -38,13 +38,7 @@ function generate() printf $format_str $KEY $fill ${json_str:$offset} | _dd of=$TMPDIR/json0 bs=1 seek=$offset conv=notrunc - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-corrupted-hdr0-with-correct-chks.img.sh b/tests/generators/generate-luks2-corrupted-hdr0-with-correct-chks.img.sh index aa5de5cf..e5da2c97 100755 --- a/tests/generators/generate-luks2-corrupted-hdr0-with-correct-chks.img.sh +++ b/tests/generators/generate-luks2-corrupted-hdr0-with-correct-chks.img.sh @@ -24,11 +24,7 @@ function generate() printf "%s" $json_new_str | _dd of=$TMPDIR/json0 bs=512 count=$LUKS2_JSON_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG + lib_mangle_json_hdr0 } function check() diff --git a/tests/generators/generate-luks2-corrupted-hdr1-with-correct-chks.img.sh b/tests/generators/generate-luks2-corrupted-hdr1-with-correct-chks.img.sh index e96cb810..eb4f2b6e 100755 --- a/tests/generators/generate-luks2-corrupted-hdr1-with-correct-chks.img.sh +++ b/tests/generators/generate-luks2-corrupted-hdr1-with-correct-chks.img.sh @@ -24,11 +24,7 @@ function generate() printf "%s" $json_new_str | _dd of=$TMPDIR/json1 bs=512 count=$LUKS2_JSON_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json1 $TMPDIR/area1 - erase_checksum $TMPDIR/area1 - chks1=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks1 $TMPDIR/area1 - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG + lib_mangle_json_hdr1 } function check() diff --git a/tests/generators/generate-luks2-invalid-json-size-c0.img.sh b/tests/generators/generate-luks2-invalid-json-size-c0.img.sh index 76d3aaab..226a180e 100755 --- a/tests/generators/generate-luks2-invalid-json-size-c0.img.sh +++ b/tests/generators/generate-luks2-invalid-json-size-c0.img.sh @@ -22,13 +22,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-invalid-json-size-c1.img.sh b/tests/generators/generate-luks2-invalid-json-size-c1.img.sh index a9d8cba6..5c306142 100755 --- a/tests/generators/generate-luks2-invalid-json-size-c1.img.sh +++ b/tests/generators/generate-luks2-invalid-json-size-c1.img.sh @@ -22,13 +22,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-invalid-json-size-c2.img.sh b/tests/generators/generate-luks2-invalid-json-size-c2.img.sh index 0d51f602..41223389 100755 --- a/tests/generators/generate-luks2-invalid-json-size-c2.img.sh +++ b/tests/generators/generate-luks2-invalid-json-size-c2.img.sh @@ -24,24 +24,14 @@ function generate() json_str=$(jq -c '.' $TMPDIR/json0) write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES write_bin_hdr_offset $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE } function check() diff --git a/tests/generators/generate-luks2-invalid-keyslots-size-c0.img.sh b/tests/generators/generate-luks2-invalid-keyslots-size-c0.img.sh index bb58e315..0ec0a8bb 100755 --- a/tests/generators/generate-luks2-invalid-keyslots-size-c0.img.sh +++ b/tests/generators/generate-luks2-invalid-keyslots-size-c0.img.sh @@ -25,13 +25,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-invalid-keyslots-size-c1.img.sh b/tests/generators/generate-luks2-invalid-keyslots-size-c1.img.sh index 1cceaeb2..017e7d1d 100755 --- a/tests/generators/generate-luks2-invalid-keyslots-size-c1.img.sh +++ b/tests/generators/generate-luks2-invalid-keyslots-size-c1.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-invalid-keyslots-size-c2.img.sh b/tests/generators/generate-luks2-invalid-keyslots-size-c2.img.sh index 611f4567..895d81fe 100755 --- a/tests/generators/generate-luks2-invalid-keyslots-size-c2.img.sh +++ b/tests/generators/generate-luks2-invalid-keyslots-size-c2.img.sh @@ -22,13 +22,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-invalid-object-type-json0.img.sh b/tests/generators/generate-luks2-invalid-object-type-json0.img.sh index 49261afa..ec331481 100755 --- a/tests/generators/generate-luks2-invalid-object-type-json0.img.sh +++ b/tests/generators/generate-luks2-invalid-object-type-json0.img.sh @@ -22,13 +22,7 @@ function generate() printf "%s" "$json_str" | _dd of=$TMPDIR/json0 bs=1 conv=notrunc - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-invalid-opening-char-json0.img.sh b/tests/generators/generate-luks2-invalid-opening-char-json0.img.sh index 7ae51ffb..5244cbe6 100755 --- a/tests/generators/generate-luks2-invalid-opening-char-json0.img.sh +++ b/tests/generators/generate-luks2-invalid-opening-char-json0.img.sh @@ -22,13 +22,7 @@ function generate() printf "%s" "$json_str" | _dd of=$TMPDIR/json0 bs=1 conv=notrunc - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-keyslot-missing-digest.img.sh b/tests/generators/generate-luks2-keyslot-missing-digest.img.sh index 5b2af64d..6a236678 100755 --- a/tests/generators/generate-luks2-keyslot-missing-digest.img.sh +++ b/tests/generators/generate-luks2-keyslot-missing-digest.img.sh @@ -24,13 +24,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-keyslot-too-many-digests.img.sh b/tests/generators/generate-luks2-keyslot-too-many-digests.img.sh index 7dcf944d..8eba27a1 100755 --- a/tests/generators/generate-luks2-keyslot-too-many-digests.img.sh +++ b/tests/generators/generate-luks2-keyslot-too-many-digests.img.sh @@ -22,13 +22,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh index cb62edd7..84298a65 100755 --- a/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh @@ -36,27 +36,15 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES write_bin_hdr_offset $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area0 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE kill + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE } function check() diff --git a/tests/generators/generate-luks2-metadata-size-128k.img.sh b/tests/generators/generate-luks2-metadata-size-128k.img.sh index 4c74c328..90747039 100755 --- a/tests/generators/generate-luks2-metadata-size-128k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-128k.img.sh @@ -35,25 +35,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh index 07350e72..23c323f0 100755 --- a/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh @@ -36,27 +36,15 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES write_bin_hdr_offset $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area0 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE kill + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE } function check() diff --git a/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh index 49125175..3c3a1718 100755 --- a/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh @@ -36,27 +36,15 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES write_bin_hdr_offset $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area0 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE kill + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE } function check() diff --git a/tests/generators/generate-luks2-metadata-size-1m.img.sh b/tests/generators/generate-luks2-metadata-size-1m.img.sh index d224b36f..709a8259 100755 --- a/tests/generators/generate-luks2-metadata-size-1m.img.sh +++ b/tests/generators/generate-luks2-metadata-size-1m.img.sh @@ -35,25 +35,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh index 8a9e4e88..1085dd06 100755 --- a/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh @@ -36,27 +36,15 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES write_bin_hdr_offset $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area0 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE kill + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE } function check() diff --git a/tests/generators/generate-luks2-metadata-size-256k.img.sh b/tests/generators/generate-luks2-metadata-size-256k.img.sh index f918ee59..a5c4b66d 100755 --- a/tests/generators/generate-luks2-metadata-size-256k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-256k.img.sh @@ -36,25 +36,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-metadata-size-2m-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-2m-secondary.img.sh index 9d12dc1e..379e366c 100755 --- a/tests/generators/generate-luks2-metadata-size-2m-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-2m-secondary.img.sh @@ -35,27 +35,15 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES write_bin_hdr_offset $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area0 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE kill + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE } function check() diff --git a/tests/generators/generate-luks2-metadata-size-2m.img.sh b/tests/generators/generate-luks2-metadata-size-2m.img.sh index eef144fb..c0ed3bb6 100755 --- a/tests/generators/generate-luks2-metadata-size-2m.img.sh +++ b/tests/generators/generate-luks2-metadata-size-2m.img.sh @@ -35,25 +35,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh index 1aa1907f..5cc80b13 100755 --- a/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh @@ -36,27 +36,15 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES write_bin_hdr_offset $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area0 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE kill + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE } function check() diff --git a/tests/generators/generate-luks2-metadata-size-32k.img.sh b/tests/generators/generate-luks2-metadata-size-32k.img.sh index 2e485b9e..c3a1ec0b 100755 --- a/tests/generators/generate-luks2-metadata-size-32k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-32k.img.sh @@ -35,25 +35,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-metadata-size-4m-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-4m-secondary.img.sh index 5bd30a08..598d9f04 100755 --- a/tests/generators/generate-luks2-metadata-size-4m-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-4m-secondary.img.sh @@ -35,27 +35,15 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES write_bin_hdr_offset $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area0 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE kill + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE } function check() diff --git a/tests/generators/generate-luks2-metadata-size-4m.img.sh b/tests/generators/generate-luks2-metadata-size-4m.img.sh index 5f46f171..0d06d080 100755 --- a/tests/generators/generate-luks2-metadata-size-4m.img.sh +++ b/tests/generators/generate-luks2-metadata-size-4m.img.sh @@ -35,25 +35,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh index 29664081..5861b4e8 100755 --- a/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh @@ -36,27 +36,15 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES write_bin_hdr_offset $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area0 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE kill + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE } function check() diff --git a/tests/generators/generate-luks2-metadata-size-512k.img.sh b/tests/generators/generate-luks2-metadata-size-512k.img.sh index 29ca19b3..c2e04eb3 100755 --- a/tests/generators/generate-luks2-metadata-size-512k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-512k.img.sh @@ -35,25 +35,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-metadata-size-64k-inv-area-c0.img.sh b/tests/generators/generate-luks2-metadata-size-64k-inv-area-c0.img.sh index 84a3b074..3913bb1d 100755 --- a/tests/generators/generate-luks2-metadata-size-64k-inv-area-c0.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k-inv-area-c0.img.sh @@ -35,25 +35,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-metadata-size-64k-inv-area-c1.img.sh b/tests/generators/generate-luks2-metadata-size-64k-inv-area-c1.img.sh index aba61d32..e763f954 100755 --- a/tests/generators/generate-luks2-metadata-size-64k-inv-area-c1.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k-inv-area-c1.img.sh @@ -36,25 +36,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-metadata-size-64k-inv-keyslots-size-c0.img.sh b/tests/generators/generate-luks2-metadata-size-64k-inv-keyslots-size-c0.img.sh index 7a48b528..8c471240 100755 --- a/tests/generators/generate-luks2-metadata-size-64k-inv-keyslots-size-c0.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k-inv-keyslots-size-c0.img.sh @@ -36,25 +36,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh index 8d2a008f..dd0ad8f3 100755 --- a/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh @@ -36,27 +36,15 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES write_bin_hdr_offset $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area0 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE kill + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE } function check() diff --git a/tests/generators/generate-luks2-metadata-size-64k.img.sh b/tests/generators/generate-luks2-metadata-size-64k.img.sh index e0c17f96..ad60a020 100755 --- a/tests/generators/generate-luks2-metadata-size-64k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k.img.sh @@ -35,25 +35,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-metadata-size-invalid-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-invalid-secondary.img.sh index a118d6fd..bfac7408 100755 --- a/tests/generators/generate-luks2-metadata-size-invalid-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-invalid-secondary.img.sh @@ -35,27 +35,15 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BOGUS_BYTES write_bin_hdr_offset $TMPDIR/hdr1 $TEST_MDA_SIZE_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area0 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE kill + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE } function check() diff --git a/tests/generators/generate-luks2-metadata-size-invalid.img.sh b/tests/generators/generate-luks2-metadata-size-invalid.img.sh index 16645e9e..0115f21d 100755 --- a/tests/generators/generate-luks2-metadata-size-invalid.img.sh +++ b/tests/generators/generate-luks2-metadata-size-invalid.img.sh @@ -35,25 +35,13 @@ function generate() test ${#json_str} -lt $((LUKS2_JSON_SIZE*512)) || exit 2 write_luks2_json "$json_str" $TMPDIR/json0 $TEST_JSN_SIZE + write_luks2_json "$json_str" $TMPDIR/json1 $TEST_JSN_SIZE write_bin_hdr_size $TMPDIR/hdr0 $TEST_MDA_SIZE_BOGUS_BYTES write_bin_hdr_size $TMPDIR/hdr1 $TEST_MDA_SIZE_BOGUS_BYTES - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $TEST_JSN_SIZE - merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json0 $TMPDIR/area1 $TEST_JSN_SIZE - - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - - erase_checksum $TMPDIR/area1 - chks0=$(calc_sha256_checksum_file $TMPDIR/area1) - write_checksum $chks0 $TMPDIR/area1 - - kill_bin_hdr $TMPDIR/area1 - - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $TEST_MDA_SIZE - write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $TEST_MDA_SIZE + lib_mangle_json_hdr0 $TEST_MDA_SIZE $TEST_JSN_SIZE + lib_mangle_json_hdr1 $TEST_MDA_SIZE $TEST_JSN_SIZE kill } function check() diff --git a/tests/generators/generate-luks2-missing-keyslot-referenced-in-digest.img.sh b/tests/generators/generate-luks2-missing-keyslot-referenced-in-digest.img.sh index fcdf65e8..eb236d10 100755 --- a/tests/generators/generate-luks2-missing-keyslot-referenced-in-digest.img.sh +++ b/tests/generators/generate-luks2-missing-keyslot-referenced-in-digest.img.sh @@ -26,13 +26,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-missing-keyslot-referenced-in-token.img.sh b/tests/generators/generate-luks2-missing-keyslot-referenced-in-token.img.sh index 7c8fd849..2e3b748a 100755 --- a/tests/generators/generate-luks2-missing-keyslot-referenced-in-token.img.sh +++ b/tests/generators/generate-luks2-missing-keyslot-referenced-in-token.img.sh @@ -24,13 +24,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-missing-segment-referenced-in-digest.img.sh b/tests/generators/generate-luks2-missing-segment-referenced-in-digest.img.sh index e1075540..75d072fe 100755 --- a/tests/generators/generate-luks2-missing-segment-referenced-in-digest.img.sh +++ b/tests/generators/generate-luks2-missing-segment-referenced-in-digest.img.sh @@ -26,13 +26,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-missing-trailing-null-byte-json0.img.sh b/tests/generators/generate-luks2-missing-trailing-null-byte-json0.img.sh index 5aa9f5a5..00a9cd3a 100755 --- a/tests/generators/generate-luks2-missing-trailing-null-byte-json0.img.sh +++ b/tests/generators/generate-luks2-missing-trailing-null-byte-json0.img.sh @@ -41,13 +41,7 @@ function generate() printf $format_str $KEY $fill ${json_str:$offset} | _dd of=$TMPDIR/json0 bs=1 seek=$offset conv=notrunc - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-non-null-byte-beyond-json0.img.sh b/tests/generators/generate-luks2-non-null-byte-beyond-json0.img.sh index 9e11adbd..977f4ecc 100755 --- a/tests/generators/generate-luks2-non-null-byte-beyond-json0.img.sh +++ b/tests/generators/generate-luks2-non-null-byte-beyond-json0.img.sh @@ -22,13 +22,7 @@ function generate() printf '%s' $json_str | _dd of=$TMPDIR/json0 bs=1 conv=notrunc - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-non-null-bytes-beyond-json0.img.sh b/tests/generators/generate-luks2-non-null-bytes-beyond-json0.img.sh index d4d2e2fb..1419c6db 100755 --- a/tests/generators/generate-luks2-non-null-bytes-beyond-json0.img.sh +++ b/tests/generators/generate-luks2-non-null-bytes-beyond-json0.img.sh @@ -26,13 +26,7 @@ function generate() printf '%s' "$QUOTE" | _dd of=$TMPDIR/json0 seek=$((json_len_orig+SPACE)) bs=1 conv=notrunc - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh b/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh index 786cb8de..ad967477 100755 --- a/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh +++ b/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh @@ -22,13 +22,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-overlapping-areas-c1-json0.img.sh b/tests/generators/generate-luks2-overlapping-areas-c1-json0.img.sh index f182f11c..6aad0b75 100755 --- a/tests/generators/generate-luks2-overlapping-areas-c1-json0.img.sh +++ b/tests/generators/generate-luks2-overlapping-areas-c1-json0.img.sh @@ -22,13 +22,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-overlapping-areas-c2-json0.img.sh b/tests/generators/generate-luks2-overlapping-areas-c2-json0.img.sh index 0243058c..bc90ad12 100755 --- a/tests/generators/generate-luks2-overlapping-areas-c2-json0.img.sh +++ b/tests/generators/generate-luks2-overlapping-areas-c2-json0.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-pbkdf2-leftover-params-0.img.sh b/tests/generators/generate-luks2-pbkdf2-leftover-params-0.img.sh index 1b0f10e5..2f1e981b 100755 --- a/tests/generators/generate-luks2-pbkdf2-leftover-params-0.img.sh +++ b/tests/generators/generate-luks2-pbkdf2-leftover-params-0.img.sh @@ -23,13 +23,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-pbkdf2-leftover-params-1.img.sh b/tests/generators/generate-luks2-pbkdf2-leftover-params-1.img.sh index 1d78dc11..c7ae3377 100755 --- a/tests/generators/generate-luks2-pbkdf2-leftover-params-1.img.sh +++ b/tests/generators/generate-luks2-pbkdf2-leftover-params-1.img.sh @@ -23,13 +23,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-crypt-missing-encryption.img.sh b/tests/generators/generate-luks2-segment-crypt-missing-encryption.img.sh index 146de213..2c549a7e 100755 --- a/tests/generators/generate-luks2-segment-crypt-missing-encryption.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-missing-encryption.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-crypt-missing-ivoffset.img.sh b/tests/generators/generate-luks2-segment-crypt-missing-ivoffset.img.sh index 8c1fe274..490e92c1 100755 --- a/tests/generators/generate-luks2-segment-crypt-missing-ivoffset.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-missing-ivoffset.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-crypt-missing-sectorsize.img.sh b/tests/generators/generate-luks2-segment-crypt-missing-sectorsize.img.sh index a83583d4..535996a6 100755 --- a/tests/generators/generate-luks2-segment-crypt-missing-sectorsize.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-missing-sectorsize.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-crypt-wrong-encryption.img.sh b/tests/generators/generate-luks2-segment-crypt-wrong-encryption.img.sh index e7c95b5c..6ddc9f27 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-encryption.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-encryption.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-crypt-wrong-ivoffset.img.sh b/tests/generators/generate-luks2-segment-crypt-wrong-ivoffset.img.sh index fb620a50..33b2c427 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-ivoffset.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-ivoffset.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-0.img.sh b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-0.img.sh index 5b39662a..bd75b41d 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-0.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-0.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-1.img.sh b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-1.img.sh index 2855c1ba..bee64f36 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-1.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-1.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-2.img.sh b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-2.img.sh index 51b95d90..57939374 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-2.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-2.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-missing-offset.img.sh b/tests/generators/generate-luks2-segment-missing-offset.img.sh index 9fc968a1..dbadfdd0 100755 --- a/tests/generators/generate-luks2-segment-missing-offset.img.sh +++ b/tests/generators/generate-luks2-segment-missing-offset.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-missing-size.img.sh b/tests/generators/generate-luks2-segment-missing-size.img.sh index a48831ed..ceb86d98 100755 --- a/tests/generators/generate-luks2-segment-missing-size.img.sh +++ b/tests/generators/generate-luks2-segment-missing-size.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-missing-type.img.sh b/tests/generators/generate-luks2-segment-missing-type.img.sh index d86243c9..f93c9735 100755 --- a/tests/generators/generate-luks2-segment-missing-type.img.sh +++ b/tests/generators/generate-luks2-segment-missing-type.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-two.img.sh b/tests/generators/generate-luks2-segment-two.img.sh index 893e50ea..5e2a73f8 100755 --- a/tests/generators/generate-luks2-segment-two.img.sh +++ b/tests/generators/generate-luks2-segment-two.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-unknown-type.img.sh b/tests/generators/generate-luks2-segment-unknown-type.img.sh index 1d956951..0e17e549 100755 --- a/tests/generators/generate-luks2-segment-unknown-type.img.sh +++ b/tests/generators/generate-luks2-segment-unknown-type.img.sh @@ -22,13 +22,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-wrong-backup-key-0.img.sh b/tests/generators/generate-luks2-segment-wrong-backup-key-0.img.sh index d9f9b102..1df5f925 100755 --- a/tests/generators/generate-luks2-segment-wrong-backup-key-0.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-backup-key-0.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-wrong-backup-key-1.img.sh b/tests/generators/generate-luks2-segment-wrong-backup-key-1.img.sh index 86e70eb1..ee8d2a39 100755 --- a/tests/generators/generate-luks2-segment-wrong-backup-key-1.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-backup-key-1.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-wrong-flags-element.img.sh b/tests/generators/generate-luks2-segment-wrong-flags-element.img.sh index fc22d9f9..41c9eacb 100755 --- a/tests/generators/generate-luks2-segment-wrong-flags-element.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-flags-element.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-wrong-flags.img.sh b/tests/generators/generate-luks2-segment-wrong-flags.img.sh index 9ef953f1..8d51a8b5 100755 --- a/tests/generators/generate-luks2-segment-wrong-flags.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-flags.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-wrong-offset.img.sh b/tests/generators/generate-luks2-segment-wrong-offset.img.sh index 81f536a5..240745d3 100755 --- a/tests/generators/generate-luks2-segment-wrong-offset.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-offset.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-wrong-size-0.img.sh b/tests/generators/generate-luks2-segment-wrong-size-0.img.sh index b3db80a8..0c8394d6 100755 --- a/tests/generators/generate-luks2-segment-wrong-size-0.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-size-0.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-wrong-size-1.img.sh b/tests/generators/generate-luks2-segment-wrong-size-1.img.sh index f5624c88..b89625bd 100755 --- a/tests/generators/generate-luks2-segment-wrong-size-1.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-size-1.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-wrong-size-2.img.sh b/tests/generators/generate-luks2-segment-wrong-size-2.img.sh index 40441cb0..5810d2b1 100755 --- a/tests/generators/generate-luks2-segment-wrong-size-2.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-size-2.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-segment-wrong-type.img.sh b/tests/generators/generate-luks2-segment-wrong-type.img.sh index de1955cd..2649b651 100755 --- a/tests/generators/generate-luks2-segment-wrong-type.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-type.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-uint64-max-segment-size.img.sh b/tests/generators/generate-luks2-uint64-max-segment-size.img.sh index 18134ca6..05a917f2 100755 --- a/tests/generators/generate-luks2-uint64-max-segment-size.img.sh +++ b/tests/generators/generate-luks2-uint64-max-segment-size.img.sh @@ -22,13 +22,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-uint64-overflow-segment-size.img.sh b/tests/generators/generate-luks2-uint64-overflow-segment-size.img.sh index ffc4ca23..9bef272e 100755 --- a/tests/generators/generate-luks2-uint64-overflow-segment-size.img.sh +++ b/tests/generators/generate-luks2-uint64-overflow-segment-size.img.sh @@ -20,13 +20,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/generate-luks2-uint64-signed-segment-size.img.sh b/tests/generators/generate-luks2-uint64-signed-segment-size.img.sh index f111b1e7..931274d4 100755 --- a/tests/generators/generate-luks2-uint64-signed-segment-size.img.sh +++ b/tests/generators/generate-luks2-uint64-signed-segment-size.img.sh @@ -21,13 +21,7 @@ function generate() write_luks2_json "$json_str" $TMPDIR/json0 - merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 - erase_checksum $TMPDIR/area0 - chks0=$(calc_sha256_checksum_file $TMPDIR/area0) - write_checksum $chks0 $TMPDIR/area0 - write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG - kill_bin_hdr $TMPDIR/hdr1 - write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG + lib_mangle_json_hdr0_kill_hdr1 } function check() diff --git a/tests/generators/lib.sh b/tests/generators/lib.sh index bcdb3601..1d60f6c0 100644 --- a/tests/generators/lib.sh +++ b/tests/generators/lib.sh @@ -210,3 +210,39 @@ function lib_cleanup() rm -f $TMPDIR/* rm -fd $TMPDIR } + +function lib_mangle_json_hdr0() +{ + local mda_sz=${1:-} + local jsn_sz=${2:-} + local kill_hdr=${3:-} + + merge_bin_hdr_with_json $TMPDIR/hdr0 $TMPDIR/json0 $TMPDIR/area0 $jsn_sz + erase_checksum $TMPDIR/area0 + chks0=$(calc_sha256_checksum_file $TMPDIR/area0) + write_checksum $chks0 $TMPDIR/area0 + test -n "$kill_hdr" && kill_bin_hdr $TMPDIR/area0 + write_luks2_hdr0 $TMPDIR/area0 $TGT_IMG $mda_sz +} + +function lib_mangle_json_hdr1() +{ + local mda_sz=${1:-} + local jsn_sz=${2:-} + local kill_hdr=${3:-} + + merge_bin_hdr_with_json $TMPDIR/hdr1 $TMPDIR/json1 $TMPDIR/area1 $jsn_sz + erase_checksum $TMPDIR/area1 + chks1=$(calc_sha256_checksum_file $TMPDIR/area1) + write_checksum $chks1 $TMPDIR/area1 + test -n "$kill_hdr" && kill_bin_hdr $TMPDIR/area1 + write_luks2_hdr1 $TMPDIR/area1 $TGT_IMG $mda_sz +} + +function lib_mangle_json_hdr0_kill_hdr1() +{ + lib_mangle_json_hdr0 + + kill_bin_hdr $TMPDIR/hdr1 + write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG +}