From 32983312ed70e7b105e4da837edd8759a7c682ea Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Fri, 15 Mar 2019 05:54:35 +0100 Subject: [PATCH 1/2] test: bump the second partition size to 50MB 10MB is not enough for a LUKS2 partition. --- test/test-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-functions b/test/test-functions index cd8175117b..e6fccce8c3 100644 --- a/test/test-functions +++ b/test/test-functions @@ -470,7 +470,7 @@ create_empty_image() { [ -b "$LOOPDEV" ] || return 1 echo "LOOPDEV=$LOOPDEV" >> $STATEFILE sfdisk "$LOOPDEV" < Date: Fri, 15 Mar 2019 10:05:33 +0100 Subject: [PATCH 2/2] test: use PBKDF2 instead of Argon2 in cryptsetup... to reduce memory requirements for volume manipulation. Also, to further improve the test performance, reduce number of PBKDF iterations to 1000 (allowed minimum). --- test/TEST-02-CRYPTSETUP/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh index 71709f7d58..97eb2f409e 100755 --- a/test/TEST-02-CRYPTSETUP/test.sh +++ b/test/TEST-02-CRYPTSETUP/test.sh @@ -29,7 +29,7 @@ check_result_qemu() { test_setup() { create_empty_image echo -n test >$TESTDIR/keyfile - cryptsetup -q luksFormat ${LOOPDEV}p2 $TESTDIR/keyfile + cryptsetup -q luksFormat --pbkdf pbkdf2 --pbkdf-force-iterations 1000 ${LOOPDEV}p2 $TESTDIR/keyfile cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile mkfs.ext4 -L var /dev/mapper/varcrypt mkdir -p $TESTDIR/root