- Update regression tests after recent changes.

- Verify various sector sizes.

2 files changed, 72 insertions, 65 deletions

diff --git a/tools/regression/geom_eli/init.t b/tools/regression/geom_eli/init.t
index 5e4775c..10fd7f7 100644
--- a/tools/regression/geom_eli/init.t
+++ b/tools/regression/geom_eli/init.t
@@ -4,11 +4,9 @@
 base=`basename $0`
 no=45
 sectors=100
-rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
 keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
-echo "1..36"
+echo "1..180"
 
 i=1
 for cipher in aes:0 aes:128 aes:192 aes:256 \
@@ -16,36 +14,43 @@ for cipher in aes:0 aes:128 aes:192 aes:256 \
     blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \
     blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \
     blowfish:416 blowfish:448; do
-	algo=${cipher%%:*}
+	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
-
-	dd if=/dev/random of=${rnd} bs=512 count=${sectors} >/dev/null 2>&1
-	dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
-
-	geli init -a $algo -l $keylen -P -K $keyfile md${no}
-	geli attach -p -k $keyfile md${no}
-
-	dd if=${rnd} of=/dev/md${no}.eli bs=512 count=${sectors} 2>/dev/null
-
-	md_rnd=`dd if=${rnd} bs=512 count=${sectors} 2>/dev/null | md5`
-	md_ddev=`dd if=/dev/md${no}.eli bs=512 count=${sectors} 2>/dev/null | md5`
-	md_edev=`dd if=/dev/md${no} bs=512 count=${sectors} 2>/dev/null | md5`
-
-	if [ ${md_rnd} = ${md_ddev} ]; then
-		echo "ok $i - ${cipher}"
-	else
-		echo "not ok $i - ${cipher}"
-	fi
-	i=$((i+1))
-	if [ ${md_rnd} != ${md_edev} ]; then
-		echo "ok $i - ${cipher}"
-	else
-		echo "not ok $i - ${cipher}"
-	fi
-	i=$((i+1))
-
-	geli detach md${no}
+	for secsize in 512 1024 2048 4096 8192; do
+		rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
+		mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1
+
+		dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
+
+		geli init -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no}
+		geli attach -p -k $keyfile md${no}
+
+		secs=`diskinfo /dev/md${no}.eli | awk '{print $4}'`
+
+		dd if=/dev/random of=${rnd} bs=${secsize} count=${secs} >/dev/null 2>&1
+		dd if=${rnd} of=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null
+
+		md_rnd=`dd if=${rnd} bs=${secsize} count=${secs} 2>/dev/null | md5`
+		md_ddev=`dd if=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null | md5`
+		md_edev=`dd if=/dev/md${no} bs=${secsize} count=${secs} 2>/dev/null | md5`
+
+		if [ ${md_rnd} = ${md_ddev} ]; then
+			echo "ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+		else
+			echo "not ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+		fi
+		i=$((i+1))
+		if [ ${md_rnd} != ${md_edev} ]; then
+			echo "ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+		else
+			echo "not ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+		fi
+		i=$((i+1))
+
+		geli detach md${no}
+		rm -f $rnd
+		mdconfig -d -u $no
+	done
 done
 
-mdconfig -d -u $no
-rm -f $rnd $keyfile
+rm -f $keyfile
diff --git a/tools/regression/geom_eli/onetime.t b/tools/regression/geom_eli/onetime.t
index d52ef56..70b5479 100644
--- a/tools/regression/geom_eli/onetime.t
+++ b/tools/regression/geom_eli/onetime.t
@@ -4,10 +4,8 @@
 base=`basename $0`
 no=45
 sectors=100
-rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
-mdconfig -a -t malloc -s $sectors -u $no || exit 1
 
-echo "1..36"
+echo "1..180"
 
 i=1
 for cipher in aes:0 aes:128 aes:192 aes:256 \
@@ -15,34 +13,38 @@ for cipher in aes:0 aes:128 aes:192 aes:256 \
     blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \
     blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \
     blowfish:416 blowfish:448; do
-	algo=${cipher%%:*}
+	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
-
-	dd if=/dev/random of=${rnd} bs=512 count=${sectors} >/dev/null 2>&1
-
-	geli onetime -a $algo -l $keylen md${no}
-
-	dd if=${rnd} of=/dev/md${no}.eli bs=512 count=${sectors} 2>/dev/null
-
-	md_rnd=`dd if=${rnd} bs=512 count=${sectors} 2>/dev/null | md5`
-	md_ddev=`dd if=/dev/md${no}.eli bs=512 count=${sectors} 2>/dev/null | md5`
-	md_edev=`dd if=/dev/md${no} bs=512 count=${sectors} 2>/dev/null | md5`
-
-	if [ ${md_rnd} = ${md_ddev} ]; then
-		echo "ok $i - ${cipher}"
-	else
-		echo "not ok $i - ${cipher}"
-	fi
-	i=$((i+1))
-	if [ ${md_rnd} != ${md_edev} ]; then
-		echo "ok $i - ${cipher}"
-	else
-		echo "not ok $i - ${cipher}"
-	fi
-	i=$((i+1))
-
-	geli detach md${no}
+	for secsize in 512 1024 2048 4096 8192; do
+		rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
+		mdconfig -a -t malloc -s `expr $secsize \* $sectors`b -u $no || exit 1
+
+		geli onetime -e $ealgo -l $keylen -s $secsize md${no}
+
+		secs=`diskinfo /dev/md${no}.eli | awk '{print $4}'`
+
+		dd if=/dev/random of=${rnd} bs=${secsize} count=${secs} >/dev/null 2>&1
+		dd if=${rnd} of=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null
+
+		md_rnd=`dd if=${rnd} bs=${secsize} count=${secs} 2>/dev/null | md5`
+		md_ddev=`dd if=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null | md5`
+		md_edev=`dd if=/dev/md${no} bs=${secsize} count=${secs} 2>/dev/null | md5`
+
+		if [ ${md_rnd} = ${md_ddev} ]; then
+			echo "ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+		else
+			echo "not ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+		fi
+		i=$((i+1))
+		if [ ${md_rnd} != ${md_edev} ]; then
+			echo "ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+		else
+			echo "not ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+		fi
+		i=$((i+1))
+
+		geli detach md${no}
+		rm -f $rnd
+		mdconfig -d -u $no
+	done
 done
-
-mdconfig -d -u $no
-rm -f $rnd