From 6d8587c1378e7a863d2cebcc0559f95164d2b508 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sat, 9 Apr 2022 16:57:36 +0200 Subject: [PATCH] test generators: unify kill header check functions --- ...e-luks2-area-in-json-hdr-space-json0.img.sh | 4 +--- ...enerate-luks2-argon2-leftover-params.img.sh | 4 +--- .../generate-luks2-correct-full-json0.img.sh | 4 +--- .../generate-luks2-invalid-json-size-c0.img.sh | 4 +--- .../generate-luks2-invalid-json-size-c1.img.sh | 4 +--- ...erate-luks2-invalid-keyslots-size-c0.img.sh | 4 +--- ...erate-luks2-invalid-keyslots-size-c1.img.sh | 4 +--- ...erate-luks2-invalid-keyslots-size-c2.img.sh | 4 +--- ...rate-luks2-invalid-object-type-json0.img.sh | 4 +--- ...ate-luks2-invalid-opening-char-json0.img.sh | 4 +--- ...enerate-luks2-keyslot-missing-digest.img.sh | 4 +--- ...erate-luks2-keyslot-too-many-digests.img.sh | 4 +--- ...e-luks2-metadata-size-128k-secondary.img.sh | 5 ++--- .../generate-luks2-metadata-size-128k.img.sh | 5 ++--- ...te-luks2-metadata-size-16k-secondary.img.sh | 5 ++--- ...ate-luks2-metadata-size-1m-secondary.img.sh | 5 ++--- .../generate-luks2-metadata-size-1m.img.sh | 5 ++--- ...e-luks2-metadata-size-256k-secondary.img.sh | 5 ++--- .../generate-luks2-metadata-size-256k.img.sh | 5 ++--- ...ate-luks2-metadata-size-2m-secondary.img.sh | 5 ++--- .../generate-luks2-metadata-size-2m.img.sh | 5 ++--- ...te-luks2-metadata-size-32k-secondary.img.sh | 5 ++--- .../generate-luks2-metadata-size-32k.img.sh | 5 ++--- ...ate-luks2-metadata-size-4m-secondary.img.sh | 5 ++--- .../generate-luks2-metadata-size-4m.img.sh | 5 ++--- ...e-luks2-metadata-size-512k-secondary.img.sh | 5 ++--- .../generate-luks2-metadata-size-512k.img.sh | 5 ++--- ...-luks2-metadata-size-64k-inv-area-c0.img.sh | 5 ++--- ...-luks2-metadata-size-64k-inv-area-c1.img.sh | 5 ++--- ...tadata-size-64k-inv-keyslots-size-c0.img.sh | 5 ++--- ...te-luks2-metadata-size-64k-secondary.img.sh | 5 ++--- .../generate-luks2-metadata-size-64k.img.sh | 5 ++--- ...uks2-metadata-size-invalid-secondary.img.sh | 5 ++--- ...generate-luks2-metadata-size-invalid.img.sh | 5 ++--- ...missing-keyslot-referenced-in-digest.img.sh | 4 +--- ...-missing-keyslot-referenced-in-token.img.sh | 4 +--- ...missing-segment-referenced-in-digest.img.sh | 4 +--- ...ks2-missing-trailing-null-byte-json0.img.sh | 4 +--- ...ate-luks2-non-null-byte-beyond-json0.img.sh | 4 +--- ...te-luks2-non-null-bytes-beyond-json0.img.sh | 4 +--- ...ate-luks2-overlapping-areas-c0-json0.img.sh | 4 +--- ...ate-luks2-overlapping-areas-c1-json0.img.sh | 4 +--- ...ate-luks2-overlapping-areas-c2-json0.img.sh | 4 +--- ...erate-luks2-pbkdf2-leftover-params-0.img.sh | 4 +--- ...erate-luks2-pbkdf2-leftover-params-1.img.sh | 4 +--- ...ks2-segment-crypt-missing-encryption.img.sh | 4 +--- ...luks2-segment-crypt-missing-ivoffset.img.sh | 4 +--- ...ks2-segment-crypt-missing-sectorsize.img.sh | 4 +--- ...luks2-segment-crypt-wrong-encryption.img.sh | 4 +--- ...e-luks2-segment-crypt-wrong-ivoffset.img.sh | 4 +--- ...ks2-segment-crypt-wrong-sectorsize-0.img.sh | 4 +--- ...ks2-segment-crypt-wrong-sectorsize-1.img.sh | 4 +--- ...ks2-segment-crypt-wrong-sectorsize-2.img.sh | 4 +--- ...enerate-luks2-segment-missing-offset.img.sh | 4 +--- .../generate-luks2-segment-missing-size.img.sh | 4 +--- .../generate-luks2-segment-missing-type.img.sh | 4 +--- .../generate-luks2-segment-two.img.sh | 4 +--- .../generate-luks2-segment-unknown-type.img.sh | 4 +--- ...ate-luks2-segment-wrong-backup-key-0.img.sh | 4 +--- ...ate-luks2-segment-wrong-backup-key-1.img.sh | 4 +--- ...te-luks2-segment-wrong-flags-element.img.sh | 4 +--- .../generate-luks2-segment-wrong-flags.img.sh | 4 +--- .../generate-luks2-segment-wrong-offset.img.sh | 4 +--- .../generate-luks2-segment-wrong-size-0.img.sh | 4 +--- .../generate-luks2-segment-wrong-size-1.img.sh | 4 +--- .../generate-luks2-segment-wrong-size-2.img.sh | 4 +--- .../generate-luks2-segment-wrong-type.img.sh | 4 +--- ...nerate-luks2-uint64-max-segment-size.img.sh | 4 +--- ...e-luks2-uint64-overflow-segment-size.img.sh | 4 +--- ...ate-luks2-uint64-signed-segment-size.img.sh | 4 +--- tests/generators/lib.sh | 18 ++++++++++++++++++ 71 files changed, 110 insertions(+), 210 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 a4fde598..a7d31478 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 @@ -30,9 +30,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c --arg off $OFFS --arg len $LEN \ diff --git a/tests/generators/generate-luks2-argon2-leftover-params.img.sh b/tests/generators/generate-luks2-argon2-leftover-params.img.sh index 786df3d5..6f10f370 100755 --- a/tests/generators/generate-luks2-argon2-leftover-params.img.sh +++ b/tests/generators/generate-luks2-argon2-leftover-params.img.sh @@ -28,9 +28,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) diff --git a/tests/generators/generate-luks2-correct-full-json0.img.sh b/tests/generators/generate-luks2-correct-full-json0.img.sh index 12e4110c..eb3b7324 100755 --- a/tests/generators/generate-luks2-correct-full-json0.img.sh +++ b/tests/generators/generate-luks2-correct-full-json0.img.sh @@ -43,9 +43,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 226a180e..13dea929 100755 --- a/tests/generators/generate-luks2-invalid-json-size-c0.img.sh +++ b/tests/generators/generate-luks2-invalid-json-size-c0.img.sh @@ -27,9 +27,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c --arg js $JS 'if .config.json_size != ($js | tostring ) 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 5c306142..5cdc7ce8 100755 --- a/tests/generators/generate-luks2-invalid-json-size-c1.img.sh +++ b/tests/generators/generate-luks2-invalid-json-size-c1.img.sh @@ -27,9 +27,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c --arg js $JS 'if .config.json_size != ($js | tostring ) 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 0ec0a8bb..8187b722 100755 --- a/tests/generators/generate-luks2-invalid-keyslots-size-c0.img.sh +++ b/tests/generators/generate-luks2-invalid-keyslots-size-c0.img.sh @@ -30,9 +30,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c --arg off $OFFS 'if .config.keyslots_size != ( .segments."0".offset | tonumber - ($off | tonumber) + 4096 | tostring ) 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 017e7d1d..2ba1a9b0 100755 --- a/tests/generators/generate-luks2-invalid-keyslots-size-c1.img.sh +++ b/tests/generators/generate-luks2-invalid-keyslots-size-c1.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if (.config.keyslots_size | tonumber % 4096) == 0 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 895d81fe..f9834382 100755 --- a/tests/generators/generate-luks2-invalid-keyslots-size-c2.img.sh +++ b/tests/generators/generate-luks2-invalid-keyslots-size-c2.img.sh @@ -27,9 +27,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .config.keyslots_size != ([.keyslots[].area.size ] | map(tonumber) | add - 4096 | tostring) 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 ec331481..b84df31d 100755 --- a/tests/generators/generate-luks2-invalid-object-type-json0.img.sh +++ b/tests/generators/generate-luks2-invalid-object-type-json0.img.sh @@ -27,9 +27,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 5244cbe6..aeaeba4b 100755 --- a/tests/generators/generate-luks2-invalid-opening-char-json0.img.sh +++ b/tests/generators/generate-luks2-invalid-opening-char-json0.img.sh @@ -27,9 +27,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) diff --git a/tests/generators/generate-luks2-keyslot-missing-digest.img.sh b/tests/generators/generate-luks2-keyslot-missing-digest.img.sh index 6a236678..ecfd7cf8 100755 --- a/tests/generators/generate-luks2-keyslot-missing-digest.img.sh +++ b/tests/generators/generate-luks2-keyslot-missing-digest.img.sh @@ -29,9 +29,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 8eba27a1..034c6e07 100755 --- a/tests/generators/generate-luks2-keyslot-too-many-digests.img.sh +++ b/tests/generators/generate-luks2-keyslot-too-many-digests.img.sh @@ -27,9 +27,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 84298a65..2a44678a 100755 --- a/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh @@ -49,9 +49,8 @@ function generate() function check() { - read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr_res0 $TEST_MDA_SIZE - local str_res0=$(head -c 6 $TMPDIR/hdr_res0) - test "$str_res0" = "VACUUM" || exit 2 + lib_hdr0_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json1 $TGT_IMG $TMPDIR/json_res1 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or diff --git a/tests/generators/generate-luks2-metadata-size-128k.img.sh b/tests/generators/generate-luks2-metadata-size-128k.img.sh index 90747039..79cccbd7 100755 --- a/tests/generators/generate-luks2-metadata-size-128k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-128k.img.sh @@ -46,9 +46,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 23c323f0..f0e6e8dc 100755 --- a/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh @@ -49,9 +49,8 @@ function generate() function check() { - read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr_res0 $TEST_MDA_SIZE - local str_res0=$(head -c 6 $TMPDIR/hdr_res0) - test "$str_res0" = "VACUUM" || exit 2 + lib_hdr0_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json1 $TGT_IMG $TMPDIR/json_res1 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 3c3a1718..25c19c1d 100755 --- a/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh @@ -49,9 +49,8 @@ function generate() function check() { - read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr_res0 $TEST_MDA_SIZE - local str_res0=$(head -c 6 $TMPDIR/hdr_res0) - test "$str_res0" = "VACUUM" || exit 2 + lib_hdr0_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json1 $TGT_IMG $TMPDIR/json_res1 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or diff --git a/tests/generators/generate-luks2-metadata-size-1m.img.sh b/tests/generators/generate-luks2-metadata-size-1m.img.sh index 709a8259..9228fe58 100755 --- a/tests/generators/generate-luks2-metadata-size-1m.img.sh +++ b/tests/generators/generate-luks2-metadata-size-1m.img.sh @@ -46,9 +46,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 1085dd06..b4c10277 100755 --- a/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh @@ -49,9 +49,8 @@ function generate() function check() { - read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr_res0 $TEST_MDA_SIZE - local str_res0=$(head -c 6 $TMPDIR/hdr_res0) - test "$str_res0" = "VACUUM" || exit 2 + lib_hdr0_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json1 $TGT_IMG $TMPDIR/json_res1 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or diff --git a/tests/generators/generate-luks2-metadata-size-256k.img.sh b/tests/generators/generate-luks2-metadata-size-256k.img.sh index a5c4b66d..60ec8782 100755 --- a/tests/generators/generate-luks2-metadata-size-256k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-256k.img.sh @@ -47,9 +47,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 379e366c..0c689059 100755 --- a/tests/generators/generate-luks2-metadata-size-2m-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-2m-secondary.img.sh @@ -48,9 +48,8 @@ function generate() function check() { - read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr_res0 $TEST_MDA_SIZE - local str_res0=$(head -c 6 $TMPDIR/hdr_res0) - test "$str_res0" = "VACUUM" || exit 2 + lib_hdr0_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json1 $TGT_IMG $TMPDIR/json_res1 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or diff --git a/tests/generators/generate-luks2-metadata-size-2m.img.sh b/tests/generators/generate-luks2-metadata-size-2m.img.sh index c0ed3bb6..0dbb5215 100755 --- a/tests/generators/generate-luks2-metadata-size-2m.img.sh +++ b/tests/generators/generate-luks2-metadata-size-2m.img.sh @@ -46,9 +46,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 5cc80b13..effd2442 100755 --- a/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh @@ -49,9 +49,8 @@ function generate() function check() { - read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr_res0 $TEST_MDA_SIZE - local str_res0=$(head -c 6 $TMPDIR/hdr_res0) - test "$str_res0" = "VACUUM" || exit 2 + lib_hdr0_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json1 $TGT_IMG $TMPDIR/json_res1 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or diff --git a/tests/generators/generate-luks2-metadata-size-32k.img.sh b/tests/generators/generate-luks2-metadata-size-32k.img.sh index c3a1ec0b..f9701448 100755 --- a/tests/generators/generate-luks2-metadata-size-32k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-32k.img.sh @@ -46,9 +46,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 598d9f04..f4238502 100755 --- a/tests/generators/generate-luks2-metadata-size-4m-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-4m-secondary.img.sh @@ -48,9 +48,8 @@ function generate() function check() { - read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr_res0 $TEST_MDA_SIZE - local str_res0=$(head -c 6 $TMPDIR/hdr_res0) - test "$str_res0" = "VACUUM" || exit 2 + lib_hdr0_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json1 $TGT_IMG $TMPDIR/json_res1 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or diff --git a/tests/generators/generate-luks2-metadata-size-4m.img.sh b/tests/generators/generate-luks2-metadata-size-4m.img.sh index 0d06d080..b15ad4be 100755 --- a/tests/generators/generate-luks2-metadata-size-4m.img.sh +++ b/tests/generators/generate-luks2-metadata-size-4m.img.sh @@ -46,9 +46,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 5861b4e8..49808165 100755 --- a/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh @@ -49,9 +49,8 @@ function generate() function check() { - read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr_res0 $TEST_MDA_SIZE - local str_res0=$(head -c 6 $TMPDIR/hdr_res0) - test "$str_res0" = "VACUUM" || exit 2 + lib_hdr0_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json1 $TGT_IMG $TMPDIR/json_res1 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or diff --git a/tests/generators/generate-luks2-metadata-size-512k.img.sh b/tests/generators/generate-luks2-metadata-size-512k.img.sh index c2e04eb3..f3da37fd 100755 --- a/tests/generators/generate-luks2-metadata-size-512k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-512k.img.sh @@ -46,9 +46,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 3913bb1d..3913f03b 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 @@ -46,9 +46,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 e763f954..b01f9339 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 @@ -47,9 +47,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE # .keyslots.7.area.offset = ( ((.config.keyslots_size | tonumber) + ($mda | tonumber) - (.keyslots.7.area.size | tonumber) + 1) | tostring ) | jq -c --arg mda $((2*TEST_MDA_SIZE_BYTES)) --arg jsize $JSON_SIZE \ 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 8c471240..5b8517a4 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 @@ -47,9 +47,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE --arg off $DATA_OFFSET --arg mda $((2*TEST_MDA_SIZE_BYTES)) \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 dd0ad8f3..9635ab7d 100755 --- a/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh @@ -49,9 +49,8 @@ function generate() function check() { - read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr_res0 $TEST_MDA_SIZE - local str_res0=$(head -c 6 $TMPDIR/hdr_res0) - test "$str_res0" = "VACUUM" || exit 2 + lib_hdr0_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json1 $TGT_IMG $TMPDIR/json_res1 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or diff --git a/tests/generators/generate-luks2-metadata-size-64k.img.sh b/tests/generators/generate-luks2-metadata-size-64k.img.sh index ad60a020..50941b8a 100755 --- a/tests/generators/generate-luks2-metadata-size-64k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k.img.sh @@ -46,9 +46,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 bfac7408..d2ddd61b 100755 --- a/tests/generators/generate-luks2-metadata-size-invalid-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-invalid-secondary.img.sh @@ -48,9 +48,8 @@ function generate() function check() { - read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr_res0 $TEST_MDA_SIZE - local str_res0=$(head -c 6 $TMPDIR/hdr_res0) - test "$str_res0" = "VACUUM" || exit 2 + lib_hdr0_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json1 $TGT_IMG $TMPDIR/json_res1 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or diff --git a/tests/generators/generate-luks2-metadata-size-invalid.img.sh b/tests/generators/generate-luks2-metadata-size-invalid.img.sh index 0115f21d..745fc5cb 100755 --- a/tests/generators/generate-luks2-metadata-size-invalid.img.sh +++ b/tests/generators/generate-luks2-metadata-size-invalid.img.sh @@ -46,9 +46,8 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $TEST_MDA_SIZE - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed $TEST_MDA_SIZE || exit 2 + read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 $TEST_JSN_SIZE jq -c --arg koff $KEYSLOTS_OFFSET --arg jsize $JSON_SIZE \ 'if ([.keyslots[].area.offset] | map(tonumber) | min | tostring != $koff) or 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 eb236d10..2d2bbb61 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 @@ -31,9 +31,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 2e3b748a..2b16afb1 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 @@ -29,9 +29,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 75d072fe..3e7a299b 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 @@ -31,9 +31,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 00a9cd3a..eedfc89c 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 @@ -46,9 +46,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 977f4ecc..d21ebc66 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 @@ -27,9 +27,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 1419c6db..205d9ba5 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 @@ -31,9 +31,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 ad967477..23883bb9 100755 --- a/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh +++ b/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh @@ -27,9 +27,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if (.keyslots."6".area.offset != .keyslots."7".area.offset) or (.keyslots."6".area.size != .keyslots."7".area.size) 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 6aad0b75..07336274 100755 --- a/tests/generators/generate-luks2-overlapping-areas-c1-json0.img.sh +++ b/tests/generators/generate-luks2-overlapping-areas-c1-json0.img.sh @@ -27,9 +27,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if (.keyslots."7".area.offset != (.keyslots."6".area.offset | tonumber + 1 | tostring)) or 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 bc90ad12..6699b383 100755 --- a/tests/generators/generate-luks2-overlapping-areas-c2-json0.img.sh +++ b/tests/generators/generate-luks2-overlapping-areas-c2-json0.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .keyslots."7".area.offset != ([.keyslots."6".area.offset, .keyslots."6".area.size ] | map(tonumber) | add - 1 | tostring) 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 2f1e981b..c703a65a 100755 --- a/tests/generators/generate-luks2-pbkdf2-leftover-params-0.img.sh +++ b/tests/generators/generate-luks2-pbkdf2-leftover-params-0.img.sh @@ -28,9 +28,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 c7ae3377..3d186114 100755 --- a/tests/generators/generate-luks2-pbkdf2-leftover-params-1.img.sh +++ b/tests/generators/generate-luks2-pbkdf2-leftover-params-1.img.sh @@ -28,9 +28,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 chks_res0=$(read_sha256_checksum $TGT_IMG) 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 2c549a7e..e92bc2a8 100755 --- a/tests/generators/generate-luks2-segment-crypt-missing-encryption.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-missing-encryption.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".encryption 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 490e92c1..77beb531 100755 --- a/tests/generators/generate-luks2-segment-crypt-missing-ivoffset.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-missing-ivoffset.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".iv_tweak 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 535996a6..06095335 100755 --- a/tests/generators/generate-luks2-segment-crypt-missing-sectorsize.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-missing-sectorsize.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".sector_size 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 6ddc9f27..9d7e5849 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-encryption.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-encryption.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".encryption | type != "object" 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 33b2c427..0830a169 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-ivoffset.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-ivoffset.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".iv_tweak != "dynamic" 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 bd75b41d..069b6c0d 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 @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".sector_size != 1023 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 bee64f36..c310ff1f 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 @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".sector_size != "4096" 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 57939374..b4b8b393 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 @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".sector_size != -1024 diff --git a/tests/generators/generate-luks2-segment-missing-offset.img.sh b/tests/generators/generate-luks2-segment-missing-offset.img.sh index dbadfdd0..6d5811eb 100755 --- a/tests/generators/generate-luks2-segment-missing-offset.img.sh +++ b/tests/generators/generate-luks2-segment-missing-offset.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".offset diff --git a/tests/generators/generate-luks2-segment-missing-size.img.sh b/tests/generators/generate-luks2-segment-missing-size.img.sh index ceb86d98..579858fb 100755 --- a/tests/generators/generate-luks2-segment-missing-size.img.sh +++ b/tests/generators/generate-luks2-segment-missing-size.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".size diff --git a/tests/generators/generate-luks2-segment-missing-type.img.sh b/tests/generators/generate-luks2-segment-missing-type.img.sh index f93c9735..5b74c5d0 100755 --- a/tests/generators/generate-luks2-segment-missing-type.img.sh +++ b/tests/generators/generate-luks2-segment-missing-type.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".type diff --git a/tests/generators/generate-luks2-segment-two.img.sh b/tests/generators/generate-luks2-segment-two.img.sh index 5e2a73f8..798c5be5 100755 --- a/tests/generators/generate-luks2-segment-two.img.sh +++ b/tests/generators/generate-luks2-segment-two.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."1" | type != "object" diff --git a/tests/generators/generate-luks2-segment-unknown-type.img.sh b/tests/generators/generate-luks2-segment-unknown-type.img.sh index 0e17e549..814344a3 100755 --- a/tests/generators/generate-luks2-segment-unknown-type.img.sh +++ b/tests/generators/generate-luks2-segment-unknown-type.img.sh @@ -27,9 +27,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".type != "some_type" 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 1df5f925..3ba9d470 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 @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments | length < 2 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 ee8d2a39..11a94d79 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 @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments | length < 64 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 41c9eacb..72da1f19 100755 --- a/tests/generators/generate-luks2-segment-wrong-flags-element.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-flags-element.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".flags != [ "hello", 1 ] diff --git a/tests/generators/generate-luks2-segment-wrong-flags.img.sh b/tests/generators/generate-luks2-segment-wrong-flags.img.sh index 8d51a8b5..19d6340e 100755 --- a/tests/generators/generate-luks2-segment-wrong-flags.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-flags.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".flags != "hello" diff --git a/tests/generators/generate-luks2-segment-wrong-offset.img.sh b/tests/generators/generate-luks2-segment-wrong-offset.img.sh index 240745d3..c9b1b506 100755 --- a/tests/generators/generate-luks2-segment-wrong-offset.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-offset.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".offset != "-42" 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 0c8394d6..b9227a7d 100755 --- a/tests/generators/generate-luks2-segment-wrong-size-0.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-size-0.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".size != 4096 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 b89625bd..6be5031e 100755 --- a/tests/generators/generate-luks2-segment-wrong-size-1.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-size-1.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".size != "automatic" 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 5810d2b1..311c0e8c 100755 --- a/tests/generators/generate-luks2-segment-wrong-size-2.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-size-2.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".size != "511" diff --git a/tests/generators/generate-luks2-segment-wrong-type.img.sh b/tests/generators/generate-luks2-segment-wrong-type.img.sh index 2649b651..c0411578 100755 --- a/tests/generators/generate-luks2-segment-wrong-type.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-type.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".type != 42 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 05a917f2..f966e1d9 100755 --- a/tests/generators/generate-luks2-uint64-max-segment-size.img.sh +++ b/tests/generators/generate-luks2-uint64-max-segment-size.img.sh @@ -27,9 +27,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".size != "18446744073709551104" 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 9bef272e..4e064e43 100755 --- a/tests/generators/generate-luks2-uint64-overflow-segment-size.img.sh +++ b/tests/generators/generate-luks2-uint64-overflow-segment-size.img.sh @@ -25,9 +25,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".size != "18446744073709551616" 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 931274d4..6687f35b 100755 --- a/tests/generators/generate-luks2-uint64-signed-segment-size.img.sh +++ b/tests/generators/generate-luks2-uint64-signed-segment-size.img.sh @@ -26,9 +26,7 @@ function generate() function check() { - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 - local str_res1=$(head -c 6 $TMPDIR/hdr_res1) - test "$str_res1" = "VACUUM" || exit 2 + lib_hdr1_killed || exit 2 read_luks2_json0 $TGT_IMG $TMPDIR/json_res0 jq -c 'if .segments."0".size != "-512" diff --git a/tests/generators/lib.sh b/tests/generators/lib.sh index 1d60f6c0..4d7100d7 100644 --- a/tests/generators/lib.sh +++ b/tests/generators/lib.sh @@ -246,3 +246,21 @@ function lib_mangle_json_hdr0_kill_hdr1() kill_bin_hdr $TMPDIR/hdr1 write_luks2_hdr1 $TMPDIR/hdr1 $TGT_IMG } + +function lib_hdr0_killed() +{ + local mda_sz=${1:-} + + read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr_res0 $mda_sz + local str_res0=$(head -c 6 $TMPDIR/hdr_res0) + test "$str_res0" = "VACUUM" +} + +function lib_hdr1_killed() +{ + local mda_sz=${1:-} + + read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr_res1 $mda_sz + local str_res1=$(head -c 6 $TMPDIR/hdr_res1) + test "$str_res1" = "VACUUM" +}