From nobody Mon Apr 28 23:48:15 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as
 permitted sender) client-ip=208.118.235.17;
 envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
 helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted
 sender)  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
 mx.zohomail.com
	with SMTPS id 1499451294765109.6890100081697;
 Fri, 7 Jul 2017 11:14:54 -0700 (PDT)
Received: from localhost ([::1]:58076 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
	id 1dTXmH-00051X-6k
	for importer@patchew.org; Fri, 07 Jul 2017 14:14:53 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43845)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1dTWmu-00076D-VF
	for qemu-devel@nongnu.org; Fri, 07 Jul 2017 13:11:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1dTWmq-0001KV-Fs
	for qemu-devel@nongnu.org; Fri, 07 Jul 2017 13:11:28 -0400
Received: from mx1.redhat.com ([209.132.183.28]:14566)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <kwolf@redhat.com>)
	id 1dTWmg-0001Fj-P7; Fri, 07 Jul 2017 13:11:15 -0400
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
	[10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id CACB57EBDB;
	Fri,  7 Jul 2017 17:11:13 +0000 (UTC)
Received: from noname.redhat.com (ovpn-117-34.ams2.redhat.com [10.36.117.34])
	by smtp.corp.redhat.com (Postfix) with ESMTP id BEE9D61F23;
	Fri,  7 Jul 2017 17:11:12 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CACB57EBDB
Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com;
	dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com;
	spf=pass smtp.mailfrom=kwolf@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com CACB57EBDB
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Date: Fri,  7 Jul 2017 19:08:50 +0200
Message-Id: <1499447335-6125-96-git-send-email-kwolf@redhat.com>
In-Reply-To: <1499447335-6125-1-git-send-email-kwolf@redhat.com>
References: <1499447335-6125-1-git-send-email-kwolf@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
	(mx1.redhat.com [10.5.110.27]);
	Fri, 07 Jul 2017 17:11:14 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
	[fuzzy]
X-Received-From: 209.132.183.28
Subject: [Qemu-devel] [PULL 095/100] iotests: reduce PBKDF iterations when
 testing LUKS
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"

From: "Daniel P. Berrange" <berrange@redhat.com>

By default the PBKDF algorithm used with LUKS is tuned
based on the number of iterations to produce 1 second
of running time. This makes running the I/O test with
the LUKS format orders of magnitude slower than with
qcow2/raw formats.

When creating LUKS images, set the iteration time to
a 10ms to reduce the time overhead for LUKS, since
security does not matter in I/O tests.

Previously a full 'check -luks' would take

  $ time ./check -luks
  Passed all 22 tests

  real  23m9.988s
  user  21m46.223s
  sys   0m22.841s

Now it takes

  $ time ./check -luks
  Passed all 22 tests

  real  4m39.235s
  user  3m29.590s
  sys   0m24.234s

Still slow compared to qcow2/raw, but much improved
none the less.

Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170626123510.20134-4-berrange@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/149           |   3 +
 tests/qemu-iotests/149.out       | 118 +++++++++++++++++++----------------=
----
 tests/qemu-iotests/common.filter |   3 +-
 tests/qemu-iotests/common.rc     |   3 +
 4 files changed, 67 insertions(+), 60 deletions(-)

diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149
index 8407251..f62e618 100755
--- a/tests/qemu-iotests/149
+++ b/tests/qemu-iotests/149
@@ -136,6 +136,7 @@ def cryptsetup_add_password(config, slot):
         args =3D ["luksAddKey", config.image_path(),
                 "--key-slot", slot,
                 "--key-file", "-",
+                "--iter-time", "10",
                 pwfile]
=20
         cryptsetup(args, password)
@@ -164,6 +165,7 @@ def cryptsetup_format(config):
         args.extend(["--hash", config.hash])
     args.extend(["--key-slot", slot])
     args.extend(["--key-file", "-"])
+    args.extend(["--iter-time", "10"])
     args.append(config.image_path())
=20
     cryptsetup(args, password)
@@ -230,6 +232,7 @@ def qemu_img_create(config, size_mb):
=20
     opts =3D [
         "key-secret=3Dsec0",
+        "iter-time=3D10",
         "cipher-alg=3D%s-%d" % (config.cipher, config.keylen),
         "cipher-mode=3D%s" % config.mode,
         "ivgen-alg=3D%s" % config.ivgen,
diff --git a/tests/qemu-iotests/149.out b/tests/qemu-iotests/149.out
index 90b5b55..b18c4e4 100644
--- a/tests/qemu-iotests/149.out
+++ b/tests/qemu-iotests/149.out
@@ -2,7 +2,7 @@
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 -=
-hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-aes-256-xts-plain64-sha1=
.img
+sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 -=
-hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-x=
ts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha1.img =
qiotest-145-aes-256-xts-plain64-sha1
 # Set dev owner
@@ -60,8 +60,8 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts=
-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Daes-256,cipher-mode=3Dxts,ivgen=
-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-xts-plain64-sha1.img 4=
194304M
-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha1.img', fmt=3Dluks size=
=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxts i=
vgen-alg=3Dplain64 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m=
ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-xts-pla=
in64-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha1.img', fmt=3Dluks size=
=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxts i=
vgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha1.img =
qiotest-145-aes-256-xts-plain64-sha1
@@ -122,7 +122,7 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha1.img
 # Create image
 truncate TEST_DIR/luks-twofish-256-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher twofish-xts-plain64 --key-size 5=
12 --hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-twofish-256-xts-plai=
n64-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher twofish-xts-plain64 --key-size 5=
12 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-twofi=
sh-256-xts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-256-xts-plain64-sha1.=
img qiotest-145-twofish-256-xts-plain64-sha1
 # Set dev owner
@@ -180,8 +180,8 @@ unlink TEST_DIR/luks-twofish-256-xts-plain64-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img twofish-256=
-xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Dtwofish-256,cipher-mode=3Dxts,i=
vgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-twofish-256-xts-plain64-sh=
a1.img 4194304M
-Formatting 'TEST_DIR/luks-twofish-256-xts-plain64-sha1.img', fmt=3Dluks si=
ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dtwofish-256 cipher-mode=
=3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dtwofish-256,ciph=
er-mode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-twofish-256=
-xts-plain64-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-twofish-256-xts-plain64-sha1.img', fmt=3Dluks si=
ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dtwofish-256 cipher-mode=
=3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-256-xts-plain64-sha1.=
img qiotest-145-twofish-256-xts-plain64-sha1
@@ -242,7 +242,7 @@ unlink TEST_DIR/luks-twofish-256-xts-plain64-sha1.img
 # Create image
 truncate TEST_DIR/luks-serpent-256-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 5=
12 --hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-serpent-256-xts-plai=
n64-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 5=
12 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpe=
nt-256-xts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-256-xts-plain64-sha1.=
img qiotest-145-serpent-256-xts-plain64-sha1
 # Set dev owner
@@ -300,8 +300,8 @@ unlink TEST_DIR/luks-serpent-256-xts-plain64-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img serpent-256=
-xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Dserpent-256,cipher-mode=3Dxts,i=
vgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-serpent-256-xts-plain64-sh=
a1.img 4194304M
-Formatting 'TEST_DIR/luks-serpent-256-xts-plain64-sha1.img', fmt=3Dluks si=
ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dserpent-256 cipher-mode=
=3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dserpent-256,ciph=
er-mode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-serpent-256=
-xts-plain64-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-serpent-256-xts-plain64-sha1.img', fmt=3Dluks si=
ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dserpent-256 cipher-mode=
=3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-256-xts-plain64-sha1.=
img qiotest-145-serpent-256-xts-plain64-sha1
@@ -362,7 +362,7 @@ unlink TEST_DIR/luks-serpent-256-xts-plain64-sha1.img
 # Create image
 truncate TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher cast5-cbc-plain64 --key-size 128=
 --hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-cast5-128-cbc-plain64-=
sha1.img
+sudo cryptsetup -q -v luksFormat --cipher cast5-cbc-plain64 --key-size 128=
 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-cast5-1=
28-cbc-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-cast5-128-cbc-plain64-sha1.im=
g qiotest-145-cast5-128-cbc-plain64-sha1
 # Set dev owner
@@ -420,8 +420,8 @@ unlink TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img cast5-128-c=
bc-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Dcast5-128,cipher-mode=3Dcbc,ivg=
en-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-cast5-128-cbc-plain64-sha1.i=
mg 4194304M
-Formatting 'TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img', fmt=3Dluks size=
=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dcast5-128 cipher-mode=3Dcbc=
 ivgen-alg=3Dplain64 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dcast5-128,cipher=
-mode=3Dcbc,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-cast5-128-cbc=
-plain64-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img', fmt=3Dluks size=
=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dcast5-128 cipher-mode=3Dcbc=
 ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-cast5-128-cbc-plain64-sha1.im=
g qiotest-145-cast5-128-cbc-plain64-sha1
@@ -483,7 +483,7 @@ Skipping cast6-256-xts-plain64-sha1 in blacklist
 # Create image
 truncate TEST_DIR/luks-aes-256-cbc-plain-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain --key-size 256 --h=
ash sha1 --key-slot 0 --key-file - TEST_DIR/luks-aes-256-cbc-plain-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain --key-size 256 --h=
ash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-cbc=
-plain-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain-sha1.img qi=
otest-145-aes-256-cbc-plain-sha1
 # Set dev owner
@@ -541,8 +541,8 @@ unlink TEST_DIR/luks-aes-256-cbc-plain-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-cbc=
-plain-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Daes-256,cipher-mode=3Dcbc,ivgen=
-alg=3Dplain,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-cbc-plain-sha1.img 41943=
04M
-Formatting 'TEST_DIR/luks-aes-256-cbc-plain-sha1.img', fmt=3Dluks size=3D4=
398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcbc ivgen=
-alg=3Dplain hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m=
ode=3Dcbc,ivgen-alg=3Dplain,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-cbc-plain=
-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-aes-256-cbc-plain-sha1.img', fmt=3Dluks size=3D4=
398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcbc ivgen=
-alg=3Dplain hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain-sha1.img qi=
otest-145-aes-256-cbc-plain-sha1
@@ -603,7 +603,7 @@ unlink TEST_DIR/luks-aes-256-cbc-plain-sha1.img
 # Create image
 truncate TEST_DIR/luks-aes-256-cbc-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain64 --key-size 256 -=
-hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-aes-256-cbc-plain64-sha1=
.img
+sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain64 --key-size 256 -=
-hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-c=
bc-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha1.img =
qiotest-145-aes-256-cbc-plain64-sha1
 # Set dev owner
@@ -661,8 +661,8 @@ unlink TEST_DIR/luks-aes-256-cbc-plain64-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-cbc=
-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Daes-256,cipher-mode=3Dcbc,ivgen=
-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-cbc-plain64-sha1.img 4=
194304M
-Formatting 'TEST_DIR/luks-aes-256-cbc-plain64-sha1.img', fmt=3Dluks size=
=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcbc i=
vgen-alg=3Dplain64 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m=
ode=3Dcbc,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-cbc-pla=
in64-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-aes-256-cbc-plain64-sha1.img', fmt=3Dluks size=
=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcbc i=
vgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha1.img =
qiotest-145-aes-256-cbc-plain64-sha1
@@ -723,7 +723,7 @@ unlink TEST_DIR/luks-aes-256-cbc-plain64-sha1.img
 # Create image
 truncate TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-cbc-essiv:sha256 --key-size =
256 --hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-aes-256-cbc-essiv-s=
ha256-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher aes-cbc-essiv:sha256 --key-size =
256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-=
256-cbc-essiv-sha256-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1=
.img qiotest-145-aes-256-cbc-essiv-sha256-sha1
 # Set dev owner
@@ -781,8 +781,8 @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-cbc=
-essiv-sha256-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Daes-256,cipher-mode=3Dcbc,ivgen=
-alg=3Dessiv,hash-alg=3Dsha1,ivgen-hash-alg=3Dsha256 TEST_DIR/luks-aes-256-=
cbc-essiv-sha256-sha1.img 4194304M
-Formatting 'TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img', fmt=3Dluks s=
ize=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcb=
c ivgen-alg=3Dessiv ivgen-hash-alg=3Dsha256 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m=
ode=3Dcbc,ivgen-alg=3Dessiv,hash-alg=3Dsha1,ivgen-hash-alg=3Dsha256 TEST_DI=
R/luks-aes-256-cbc-essiv-sha256-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img', fmt=3Dluks s=
ize=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcb=
c ivgen-alg=3Dessiv ivgen-hash-alg=3Dsha256 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1=
.img qiotest-145-aes-256-cbc-essiv-sha256-sha1
@@ -843,7 +843,7 @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-essiv:sha256 --key-size =
512 --hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-aes-256-xts-essiv-s=
ha256-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher aes-xts-essiv:sha256 --key-size =
512 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-=
256-xts-essiv-sha256-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1=
.img qiotest-145-aes-256-xts-essiv-sha256-sha1
 # Set dev owner
@@ -901,8 +901,8 @@ unlink TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts=
-essiv-sha256-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Daes-256,cipher-mode=3Dxts,ivgen=
-alg=3Dessiv,hash-alg=3Dsha1,ivgen-hash-alg=3Dsha256 TEST_DIR/luks-aes-256-=
xts-essiv-sha256-sha1.img 4194304M
-Formatting 'TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img', fmt=3Dluks s=
ize=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxt=
s ivgen-alg=3Dessiv ivgen-hash-alg=3Dsha256 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m=
ode=3Dxts,ivgen-alg=3Dessiv,hash-alg=3Dsha1,ivgen-hash-alg=3Dsha256 TEST_DI=
R/luks-aes-256-xts-essiv-sha256-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img', fmt=3Dluks s=
ize=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxt=
s ivgen-alg=3Dessiv ivgen-hash-alg=3Dsha256 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1=
.img qiotest-145-aes-256-xts-essiv-sha256-sha1
@@ -963,7 +963,7 @@ unlink TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img
 # Create image
 truncate TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 256 -=
-hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-aes-128-xts-plain64-sha2=
56-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 256 -=
-hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-128-x=
ts-plain64-sha256-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-128-xts-plain64-sha256-sh=
a1.img qiotest-145-aes-128-xts-plain64-sha256-sha1
 # Set dev owner
@@ -1021,8 +1021,8 @@ unlink TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.=
img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-128-xts=
-plain64-sha256-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Daes-128,cipher-mode=3Dxts,ivgen=
-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-128-xts-plain64-sha256-sha=
1.img 4194304M
-Formatting 'TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img', fmt=3Dluks=
 size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-128 cipher-mode=3D=
xts ivgen-alg=3Dplain64 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-128,cipher-m=
ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-128-xts-pla=
in64-sha256-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img', fmt=3Dluks=
 size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-128 cipher-mode=3D=
xts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-128-xts-plain64-sha256-sh=
a1.img qiotest-145-aes-128-xts-plain64-sha256-sha1
@@ -1083,7 +1083,7 @@ unlink TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.=
img
 # Create image
 truncate TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 384 -=
-hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-aes-192-xts-plain64-sha2=
56-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 384 -=
-hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-192-x=
ts-plain64-sha256-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-192-xts-plain64-sha256-sh=
a1.img qiotest-145-aes-192-xts-plain64-sha256-sha1
 # Set dev owner
@@ -1141,8 +1141,8 @@ unlink TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.=
img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-192-xts=
-plain64-sha256-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Daes-192,cipher-mode=3Dxts,ivgen=
-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-192-xts-plain64-sha256-sha=
1.img 4194304M
-Formatting 'TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img', fmt=3Dluks=
 size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-192 cipher-mode=3D=
xts ivgen-alg=3Dplain64 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-192,cipher-m=
ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-192-xts-pla=
in64-sha256-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img', fmt=3Dluks=
 size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-192 cipher-mode=3D=
xts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-192-xts-plain64-sha256-sh=
a1.img qiotest-145-aes-192-xts-plain64-sha256-sha1
@@ -1203,7 +1203,7 @@ unlink TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.=
img
 # Create image
 truncate TEST_DIR/luks-twofish-128-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher twofish-xts-plain64 --key-size 2=
56 --hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-twofish-128-xts-plai=
n64-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher twofish-xts-plain64 --key-size 2=
56 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-twofi=
sh-128-xts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-128-xts-plain64-sha1.=
img qiotest-145-twofish-128-xts-plain64-sha1
 # Set dev owner
@@ -1261,8 +1261,8 @@ unlink TEST_DIR/luks-twofish-128-xts-plain64-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img twofish-128=
-xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Dtwofish-128,cipher-mode=3Dxts,i=
vgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-twofish-128-xts-plain64-sh=
a1.img 4194304M
-Formatting 'TEST_DIR/luks-twofish-128-xts-plain64-sha1.img', fmt=3Dluks si=
ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dtwofish-128 cipher-mode=
=3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dtwofish-128,ciph=
er-mode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-twofish-128=
-xts-plain64-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-twofish-128-xts-plain64-sha1.img', fmt=3Dluks si=
ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dtwofish-128 cipher-mode=
=3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-128-xts-plain64-sha1.=
img qiotest-145-twofish-128-xts-plain64-sha1
@@ -1324,7 +1324,7 @@ Skipping twofish-192-xts-plain64-sha1 in blacklist
 # Create image
 truncate TEST_DIR/luks-serpent-128-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 2=
56 --hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-serpent-128-xts-plai=
n64-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 2=
56 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpe=
nt-128-xts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-128-xts-plain64-sha1.=
img qiotest-145-serpent-128-xts-plain64-sha1
 # Set dev owner
@@ -1382,8 +1382,8 @@ unlink TEST_DIR/luks-serpent-128-xts-plain64-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img serpent-128=
-xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Dserpent-128,cipher-mode=3Dxts,i=
vgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-serpent-128-xts-plain64-sh=
a1.img 4194304M
-Formatting 'TEST_DIR/luks-serpent-128-xts-plain64-sha1.img', fmt=3Dluks si=
ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dserpent-128 cipher-mode=
=3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dserpent-128,ciph=
er-mode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-serpent-128=
-xts-plain64-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-serpent-128-xts-plain64-sha1.img', fmt=3Dluks si=
ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dserpent-128 cipher-mode=
=3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-128-xts-plain64-sha1.=
img qiotest-145-serpent-128-xts-plain64-sha1
@@ -1444,7 +1444,7 @@ unlink TEST_DIR/luks-serpent-128-xts-plain64-sha1.img
 # Create image
 truncate TEST_DIR/luks-serpent-192-xts-plain64-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 3=
84 --hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-serpent-192-xts-plai=
n64-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher serpent-xts-plain64 --key-size 3=
84 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-serpe=
nt-192-xts-plain64-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-192-xts-plain64-sha1.=
img qiotest-145-serpent-192-xts-plain64-sha1
 # Set dev owner
@@ -1502,8 +1502,8 @@ unlink TEST_DIR/luks-serpent-192-xts-plain64-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img serpent-192=
-xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Dserpent-192,cipher-mode=3Dxts,i=
vgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-serpent-192-xts-plain64-sh=
a1.img 4194304M
-Formatting 'TEST_DIR/luks-serpent-192-xts-plain64-sha1.img', fmt=3Dluks si=
ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dserpent-192 cipher-mode=
=3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dserpent-192,ciph=
er-mode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-serpent-192=
-xts-plain64-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-serpent-192-xts-plain64-sha1.img', fmt=3Dluks si=
ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dserpent-192 cipher-mode=
=3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-192-xts-plain64-sha1.=
img qiotest-145-serpent-192-xts-plain64-sha1
@@ -1566,7 +1566,7 @@ Skipping cast6-192-xts-plain64-sha1 in blacklist
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain64-sha256.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 -=
-hash sha256 --key-slot 0 --key-file - TEST_DIR/luks-aes-256-xts-plain64-sh=
a256.img
+sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain64 --key-size 512 -=
-hash sha256 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256=
-xts-plain64-sha256.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha256.im=
g qiotest-145-aes-256-xts-plain64-sha256
 # Set dev owner
@@ -1624,8 +1624,8 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha256.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts=
-plain64-sha256 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Daes-256,cipher-mode=3Dxts,ivgen=
-alg=3Dplain64,hash-alg=3Dsha256 TEST_DIR/luks-aes-256-xts-plain64-sha256.i=
mg 4194304M
-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha256.img', fmt=3Dluks size=
=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxts i=
vgen-alg=3Dplain64 hash-alg=3Dsha256
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m=
ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha256 TEST_DIR/luks-aes-256-xts-p=
lain64-sha256.img 4194304M
+Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha256.img', fmt=3Dluks size=
=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxts i=
vgen-alg=3Dplain64 hash-alg=3Dsha256 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha256.im=
g qiotest-145-aes-256-xts-plain64-sha256
@@ -1688,7 +1688,7 @@ Skipping aes-256-xts-plain64-ripemd160 in blacklist
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain --key-size 512 --h=
ash sha1 --key-slot 3 --key-file - TEST_DIR/luks-aes-256-xts-plain-sha1-pws=
lot3.img
+sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain --key-size 512 --h=
ash sha1 --key-slot 3 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts=
-plain-sha1-pwslot3.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot=
3.img qiotest-145-aes-256-xts-plain-sha1-pwslot3
 # Set dev owner
@@ -1748,21 +1748,21 @@ unlink TEST_DIR/luks-aes-256-xts-plain-sha1-pwslot3=
.img
 # Create image
 truncate TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img --size 419430=
4MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain --key-size 512 --h=
ash sha1 --key-slot 0 --key-file - TEST_DIR/luks-aes-256-xts-plain-sha1-pwa=
llslots.img
+sudo cryptsetup -q -v luksFormat --cipher aes-xts-plain --key-size 512 --h=
ash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-256-xts=
-plain-sha1-pwallslots.img
 # Add password slot 1
-sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 1 --key-file - TEST_DIR/passwd.txt
+sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 1 --key-file - --iter-time 10 TEST_DIR/passwd.txt
 # Add password slot 2
-sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 2 --key-file - TEST_DIR/passwd.txt
+sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 2 --key-file - --iter-time 10 TEST_DIR/passwd.txt
 # Add password slot 3
-sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 3 --key-file - TEST_DIR/passwd.txt
+sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 3 --key-file - --iter-time 10 TEST_DIR/passwd.txt
 # Add password slot 4
-sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 4 --key-file - TEST_DIR/passwd.txt
+sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 4 --key-file - --iter-time 10 TEST_DIR/passwd.txt
 # Add password slot 5
-sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 5 --key-file - TEST_DIR/passwd.txt
+sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 5 --key-file - --iter-time 10 TEST_DIR/passwd.txt
 # Add password slot 6
-sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 6 --key-file - TEST_DIR/passwd.txt
+sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 6 --key-file - --iter-time 10 TEST_DIR/passwd.txt
 # Add password slot 7
-sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 7 --key-file - TEST_DIR/passwd.txt
+sudo cryptsetup -q -v luksAddKey TEST_DIR/luks-aes-256-xts-plain-sha1-pwal=
lslots.img --key-slot 7 --key-file - --iter-time 10 TEST_DIR/passwd.txt
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain-sha1-pwalls=
lots.img qiotest-145-aes-256-xts-plain-sha1-pwallslots
 # Set dev owner
@@ -1820,8 +1820,8 @@ unlink TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslot=
s.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts=
-plain-sha1-pwallslots =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3Dc2xvdDE=3D,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Daes-256,cipher-mode=3Dxts,ivgen=
-alg=3Dplain,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslot=
s.img 4194304M
-Formatting 'TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img', fmt=3Dlu=
ks size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=
=3Dxts ivgen-alg=3Dplain hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3Dc2xvdDE=3D,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m=
ode=3Dxts,ivgen-alg=3Dplain,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-xts-plain=
-sha1-pwallslots.img 4194304M
+Formatting 'TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img', fmt=3Dlu=
ks size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=
=3Dxts ivgen-alg=3Dplain hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain-sha1-pwalls=
lots.img qiotest-145-aes-256-xts-plain-sha1-pwallslots
@@ -1882,7 +1882,7 @@ unlink TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslot=
s.img
 # Create image
 truncate TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-cbc-essiv:sha256 --key-size =
256 --hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-aes-256-cbc-essiv-a=
uto-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher aes-cbc-essiv:sha256 --key-size =
256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-aes-=
256-cbc-essiv-auto-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.i=
mg qiotest-145-aes-256-cbc-essiv-auto-sha1
 # Set dev owner
@@ -1940,8 +1940,8 @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-cbc=
-essiv-auto-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Daes-256,cipher-mode=3Dcbc,ivgen=
-alg=3Dessiv,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img =
4194304M
-Formatting 'TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img', fmt=3Dluks siz=
e=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcbc =
ivgen-alg=3Dessiv hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m=
ode=3Dcbc,ivgen-alg=3Dessiv,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-cbc-essiv=
-auto-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img', fmt=3Dluks siz=
e=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcbc =
ivgen-alg=3Dessiv hash-alg=3Dsha1 iter-time=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.i=
mg qiotest-145-aes-256-cbc-essiv-auto-sha1
@@ -2002,7 +2002,7 @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img
 # Create image
 truncate TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img --size 4194304MB
 # Format image
-sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain64:sha256 --key-siz=
e 256 --hash sha1 --key-slot 0 --key-file - TEST_DIR/luks-aes-256-cbc-plain=
64-sha256-sha1.img
+sudo cryptsetup -q -v luksFormat --cipher aes-cbc-plain64:sha256 --key-siz=
e 256 --hash sha1 --key-slot 0 --key-file - --iter-time 10 TEST_DIR/luks-ae=
s-256-cbc-plain64-sha256-sha1.img
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha256-sh=
a1.img qiotest-145-aes-256-cbc-plain64-sha256-sha1
 # Set dev owner
@@ -2060,8 +2060,8 @@ unlink TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.=
img
=20
 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-cbc=
-plain64-sha256-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 # Create image
-qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,cipher-alg=3Daes-256,cipher-mode=3Dcbc,ivgen=
-alg=3Dplain64,hash-alg=3Dsha1,ivgen-hash-alg=3Dsha256 TEST_DIR/luks-aes-25=
6-cbc-plain64-sha256-sha1.img 4194304M
-Formatting 'TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img', fmt=3Dluks=
 size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3D=
cbc ivgen-alg=3Dplain64 ivgen-hash-alg=3Dsha256 hash-alg=3Dsha1
+qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format=
=3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m=
ode=3Dcbc,ivgen-alg=3Dplain64,hash-alg=3Dsha1,ivgen-hash-alg=3Dsha256 TEST_=
DIR/luks-aes-256-cbc-plain64-sha256-sha1.img 4194304M
+Formatting 'TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img', fmt=3Dluks=
 size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3D=
cbc ivgen-alg=3Dplain64 ivgen-hash-alg=3Dsha256 hash-alg=3Dsha1 iter-time=
=3D10
=20
 # Open dev
 sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha256-sh=
a1.img qiotest-145-aes-256-cbc-plain64-sha256-sha1
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.f=
ilter
index 2f595b2..7a58e57 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -126,7 +126,8 @@ _filter_img_create()
         -e "s# block_state_zero=3D\\(on\\|off\\)##g" \
         -e "s# log_size=3D[0-9]\\+##g" \
         -e "s# refcount_bits=3D[0-9]\\+##g" \
-        -e "s# key-secret=3D[a-zA-Z0-9]\\+##g"
+        -e "s# key-secret=3D[a-zA-Z0-9]\\+##g" \
+        -e "s# iter-time=3D[0-9]\\+##g"
 }
=20
 _filter_img_info()
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 9fd3130..2548e58 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -107,6 +107,9 @@ _set_default_imgopts()
     if [ "$IMGFMT" =3D=3D "qcow2" ] && ! (echo "$IMGOPTS" | grep "compat=
=3D" > /dev/null); then
         IMGOPTS=3D$(_optstr_add "$IMGOPTS" "compat=3D1.1")
     fi
+    if [ "$IMGFMT" =3D=3D "luks" ] && ! (echo "$IMGOPTS" | grep "iter-time=
=3D" > /dev/null); then
+        IMGOPTS=3D$(_optstr_add "$IMGOPTS" "iter-time=3D10")
+    fi
 }
=20
 _use_sample_img()
--=20
1.8.3.1