X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tests%2Fgenerators%2Fgenerate-luks2-overlapping-areas-c0-json0.img.sh;h=23883bb928cd2372e96e44eeaf90c9b513514af2;hb=6497abd1df88001eb1f45f7348534911b33d05b5;hp=c319ca37545edd09b8e35079eaa509b279180f2e;hpb=f7fc3bb4e50cce23dd95111b246b6e034537e2cf;p=platform%2Fupstream%2Fcryptsetup.git 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 c319ca3..23883bb 100755 --- a/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh +++ b/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh @@ -13,15 +13,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() { # copy area 6 offset and length into area 7 @@ -31,38 +22,19 @@ 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() { - 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) then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || 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