X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tests%2Fgenerators%2Fgenerate-luks2-metadata-size-512k-secondary.img.sh;h=49808165b49f65f1588142ccff238cde635937f0;hb=6497abd1df88001eb1f45f7348534911b33d05b5;hp=581dea0347d5f394e1bb7d9f4018e6b7ad713bcd;hpb=f7fc3bb4e50cce23dd95111b246b6e034537e2cf;p=platform%2Fupstream%2Fcryptsetup.git 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 581dea0..4980816 100755 --- a/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh @@ -16,15 +16,6 @@ # $1 full target dir # $2 full source luks2 image -function prepare() -{ - cp $SRC_IMG $TGT_IMG - test -d $TMPDIR || mkdir $TMPDIR - read_luks2_json0 $TGT_IMG $TMPDIR/json0 - read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr0 - read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr1 -} - function generate() { # 512 KiB metadata @@ -45,34 +36,21 @@ 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() { - 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 @@ -80,18 +58,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res1 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - -test $# -eq 2 || exit 1 - -TGT_IMG=$1/$(test_img_name $0) -SRC_IMG=$2 - -prepare +lib_prepare $@ generate check -cleanup +lib_cleanup