From 5772db549efbc501ceab00d31de46e79bc23e252 Mon Sep 17 00:00:00 2001
From: asomers <asomers@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 26 Jan 2017 20:10:31 +0000
Subject: [PATCH] MFC r310786, r310803, r310985, r311894

r310786:
Reduce the runtime of the GELI tests

There is no reduction in test coverage.  On my system runtime is reduced
from 38m32s to 6m24s.

tests/sys/geom/class/eli/conf.sh
tests/sys/geom/class/eli/init_a_test.sh
tests/sys/geom/class/eli/init_test.sh
tests/sys/geom/class/eli/integrity_copy_test.sh
tests/sys/geom/class/eli/integrity_data_test.sh
tests/sys/geom/class/eli/integrity_hmac_test.sh
tests/sys/geom/class/eli/onetime_a_test.sh
tests/sys/geom/class/eli/onetime_test.sh
	Move the looping code into common functions in conf.sh, and remove
	alias ciphers from the list.

tests/sys/geom/class/eli/init_a_test.sh
tests/sys/geom/class/eli/init_test.sh
tests/sys/geom/class/eli/integrity_copy_test.sh
tests/sys/geom/class/eli/integrity_data_test.sh
tests/sys/geom/class/eli/integrity_hmac_test.sh
tests/sys/geom/class/eli/onetime_a_test.sh
	Move a few commands that don't need to be in the inner loop out.

tests/sys/geom/class/eli/init_test.sh
tests/sys/geom/class/eli/onetime_a_test.sh
	Reduce the sector count

tests/sys/geom/class/eli/Makefile
tests/sys/geom/class/eli/init_alias_test.sh
	Add a test for initializing a GELI device using one of the cipher
	aliases, and check that the alias is correctly interpreted.

MFC after:	4 weeks
Sponsored by:	Spectra Logic Corp
Differential Revision:	https://reviews.freebsd.org/D8814

r310803:
ATFify the gnop tests

Also, add test cases for the -p, -P, and -s options to gnop create

Reviewed by:	ngie
MFC after:	4 weeks
Differential Revision:	https://reviews.freebsd.org/D8892

r310985:
Update ObsoleteFiles.inc for r310803

MFC after:	26 days
X-MFC-with:	310803

r311894:
Fix typo from change 310985 in ObsoleteFiles.inc

MFC after:	16 days
X-MFC-With:	310803
Sponsored by:	Spectra Logic Corp


git-svn-id: svn://svn.freebsd.org/base/stable/10@312828 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 ObsoleteFiles.inc                             |   4 +
 tests/sys/geom/class/eli/Makefile             |   1 +
 tests/sys/geom/class/eli/conf.sh              |  48 +++++
 tests/sys/geom/class/eli/init_a_test.sh       |  70 ++++----
 tests/sys/geom/class/eli/init_alias_test.sh   |  64 +++++++
 tests/sys/geom/class/eli/init_test.sh         |  80 ++++-----
 .../sys/geom/class/eli/integrity_copy_test.sh | 159 ++++++++---------
 .../sys/geom/class/eli/integrity_data_test.sh |  74 +++-----
 .../sys/geom/class/eli/integrity_hmac_test.sh |  73 +++-----
 tests/sys/geom/class/eli/onetime_a_test.sh    |  79 ++++-----
 tests/sys/geom/class/eli/onetime_test.sh      |  87 ++++-----
 tests/sys/geom/class/nop/1_test.sh            |  20 ---
 tests/sys/geom/class/nop/2_test.sh            |  26 ---
 tests/sys/geom/class/nop/Makefile             |  11 +-
 tests/sys/geom/class/nop/conf.sh              |  14 --
 tests/sys/geom/class/nop/nop_test.sh          | 166 ++++++++++++++++++
 16 files changed, 547 insertions(+), 429 deletions(-)
 create mode 100755 tests/sys/geom/class/eli/init_alias_test.sh
 delete mode 100644 tests/sys/geom/class/nop/1_test.sh
 delete mode 100644 tests/sys/geom/class/nop/2_test.sh
 delete mode 100644 tests/sys/geom/class/nop/conf.sh
 create mode 100755 tests/sys/geom/class/nop/nop_test.sh

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index f5ab888a5..84ae5c9fb 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,10 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20161229: Three files from gnop tests consolidated into one
+OLD_FILES+=usr/tests/sys/geom/class/nop/1_test
+OLD_FILES+=usr/tests/sys/geom/class/nop/2_test
+OLD_FILES+=usr/tests/sys/geom/class/nop/conf.sh
 # 20161121: Hyper-V manuals only apply to amd64 and i386.
 .if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386"
 OLD_FILES+=usr/share/man/man4/hv_kvp.4.gz
diff --git a/tests/sys/geom/class/eli/Makefile b/tests/sys/geom/class/eli/Makefile
index 8f4ca60d0..f6e2fd18a 100644
--- a/tests/sys/geom/class/eli/Makefile
+++ b/tests/sys/geom/class/eli/Makefile
@@ -9,6 +9,7 @@ TAP_TESTS_SH+= detach_l_test
 TAP_TESTS_SH+= init_B_test
 TAP_TESTS_SH+= init_J_test
 TAP_TESTS_SH+= init_a_test
+TAP_TESTS_SH+= init_alias_test
 TAP_TESTS_SH+= init_i_P_test
 TAP_TESTS_SH+= init_test
 TAP_TESTS_SH+= integrity_copy_test
diff --git a/tests/sys/geom/class/eli/conf.sh b/tests/sys/geom/class/eli/conf.sh
index 0646e83df..5ac291b2e 100755
--- a/tests/sys/geom/class/eli/conf.sh
+++ b/tests/sys/geom/class/eli/conf.sh
@@ -11,6 +11,54 @@ while [ -c /dev/md$no ]; do
 	: $(( no += 1 ))
 done
 
+# Execute `func` for each combination of cipher, sectorsize, and hmac algo
+# `func` usage should be:
+# func <cipher> <aalgo> <secsize>
+for_each_geli_config() {
+	func=$1
+
+	for cipher in aes-xts:128 aes-xts:256 \
+	    aes-cbc:128 aes-cbc:192 aes-cbc:256 \
+	    3des-cbc:192 \
+	    blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 \
+	    blowfish-cbc:224 blowfish-cbc:256 blowfish-cbc:288 \
+	    blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \
+	    blowfish-cbc:416 blowfish-cbc:448 \
+	    camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do
+		ealgo=${cipher%%:*}
+		keylen=${cipher##*:}
+		for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 \
+		    hmac/sha384 hmac/sha512; do
+			for secsize in 512 1024 2048 4096 8192; do
+				${func} $cipher $aalgo $secsize
+			done
+		done
+	done
+}
+
+# Execute `func` for each combination of cipher, and sectorsize, with no hmac
+# `func` usage should be:
+# func <cipher> <secsize>
+for_each_geli_config_nointegrity() {
+	func=$1
+
+	for cipher in aes-xts:128 aes-xts:256 \
+	    aes-cbc:128 aes-cbc:192 aes-cbc:256 \
+	    3des-cbc:192 \
+	    blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 \
+	    blowfish-cbc:224 blowfish-cbc:256 blowfish-cbc:288 \
+	    blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \
+	    blowfish-cbc:416 blowfish-cbc:448 \
+	    camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do
+		ealgo=${cipher%%:*}
+		keylen=${cipher##*:}
+		for secsize in 512 1024 2048 4096 8192; do
+			${func} $cipher $aalgo $secsize
+		done
+	done
+}
+
+
 geli_test_cleanup()
 {
 	[ -c /dev/md${no}.eli ] && geli detach md${no}.eli
diff --git a/tests/sys/geom/class/eli/init_a_test.sh b/tests/sys/geom/class/eli/init_a_test.sh
index dbb24fe32..9b5b251c9 100644
--- a/tests/sys/geom/class/eli/init_a_test.sh
+++ b/tests/sys/geom/class/eli/init_a_test.sh
@@ -6,55 +6,45 @@
 base=`basename $0`
 sectors=100
 keyfile=`mktemp $base.XXXXXX` || exit 1
+rnd=`mktemp $base.XXXXXX` || exit 1
 
-echo "1..1380"
-
-i=1
-for cipher in aes:0 aes:128 aes:256 \
-    aes-xts:0 aes-xts:128 aes-xts:256 \
-    aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \
-    3des:0 3des:192 \
-    3des-cbc:0 3des-cbc:192 \
-    blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \
-    blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \
-    blowfish:416 blowfish:448 \
-    blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \
-    blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \
-    blowfish-cbc:416 blowfish-cbc:448 \
-    camellia:0 camellia:128 camellia:192 camellia:256 \
-    camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do
+do_test() {
+	cipher=$1
+	aalgo=$2
+	secsize=$3
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
-	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
-		for secsize in 512 1024 2048 4096 8192; do
-			rnd=`mktemp $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
+	mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1
+	geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null
+	geli attach -p -k $keyfile md${no}
+
+	secs=`diskinfo /dev/md${no}.eli | awk '{print $4}'`
 
-			geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null
-			geli attach -p -k $keyfile md${no}
+	dd if=${rnd} of=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null
 
-			secs=`diskinfo /dev/md${no}.eli | awk '{print $4}'`
+	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`
 
-			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
+	if [ ${md_rnd} = ${md_ddev} ]; then
+		echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	else
+		echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	fi
+	i=$((i+1))
 
-			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`
+	geli detach md${no}
+	mdconfig -d -u $no
+}
+
+echo "1..600"
+
+i=1
 
-			if [ ${md_rnd} = ${md_ddev} ]; then
-				echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			else
-				echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			fi
-			i=$((i+1))
+dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
+dd if=/dev/random of=${rnd} bs=8192 count=${sectors} >/dev/null 2>&1
 
-			geli detach md${no}
-			rm -f $rnd
-			mdconfig -d -u $no
-		done
-	done
-done
+for_each_geli_config do_test
 
+rm -f $rnd
 rm -f $keyfile
diff --git a/tests/sys/geom/class/eli/init_alias_test.sh b/tests/sys/geom/class/eli/init_alias_test.sh
new file mode 100755
index 000000000..0422bee07
--- /dev/null
+++ b/tests/sys/geom/class/eli/init_alias_test.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+# $FreeBSD$
+
+# Test "geli init"'s various cipher aliases
+. $(dirname $0)/conf.sh
+
+base=`basename $0`
+sectors=100
+keyfile=`mktemp $base.XXXXXX` || exit 1
+rnd=`mktemp $base.XXXXXX` || exit 1
+
+do_test() {
+	ealgo=$1
+	keylen=$2
+	expected_ealgo=$3
+	expected_keylen=$4
+
+	geli init -B none -e $ealgo -l $keylen -P -K $keyfile md${no} 2>/dev/null
+	geli attach -p -k $keyfile md${no}
+	real_ealgo=`geli list md${no}.eli | awk '/EncryptionAlgorithm/ {print $2}'`
+	real_keylen=`geli list md${no}.eli | awk '/KeyLength/ {print $2}'`
+
+	if [ ${real_ealgo} = ${expected_ealgo} ]; then
+		echo "ok $i - ${ealgo} aliased to ${real_ealgo}"
+	else
+		echo "not ok $i - expected ${expected_ealgo} but got ${real_ealgo}"
+	fi
+	i=$((i+1))
+
+	if [ ${real_keylen} = ${expected_keylen} ]; then
+		echo "ok $i - keylen=${keylen} for ealgo=${ealgo} aliases to ${real_keylen}"
+	else
+		echo "not ok $i - expected ${expected_keylen} but got ${real_keylen}"
+	fi
+	i=$((i+1))
+
+	geli detach md${no}
+}
+
+echo "1..38"
+i=1
+mdconfig -a -t malloc -s 1024k -u $no || exit 1
+dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
+
+for spec in aes:0:AES-XTS:128 aes:128:AES-XTS:128 aes:256:AES-XTS:256 \
+	3des:0:3DES-CBC:192 3des:192:3DES-CBC:192 \
+	blowfish:0:Blowfish-CBC:128 blowfish:128:Blowfish-CBC:128 \
+	blowfish:160:Blowfish-CBC:160 blowfish:192:Blowfish-CBC:192 \
+	blowfish:224:Blowfish-CBC:224 blowfish:256:Blowfish-CBC:256 \
+	blowfish:288:Blowfish-CBC:288 blowfish:352:Blowfish-CBC:352 \
+	blowfish:384:Blowfish-CBC:384 blowfish:416:Blowfish-CBC:416 \
+	blowfish:448:Blowfish-CBC:448 \
+	camellia:0:CAMELLIA-CBC:128 camellia:128:CAMELLIA-CBC:128 \
+	camellia:256:CAMELLIA-CBC:256 ; do
+
+	ealgo=`echo $spec | cut -d : -f 1`
+	keylen=`echo $spec | cut -d : -f 2`
+	expected_ealgo=`echo $spec | cut -d : -f 3`
+	expected_keylen=`echo $spec | cut -d : -f 4`
+
+	do_test $ealgo $keylen $expected_ealgo $expected_keylen
+done
+
+rm -f $keyfile
diff --git a/tests/sys/geom/class/eli/init_test.sh b/tests/sys/geom/class/eli/init_test.sh
index 71dd6e267..31fca5514 100644
--- a/tests/sys/geom/class/eli/init_test.sh
+++ b/tests/sys/geom/class/eli/init_test.sh
@@ -4,62 +4,52 @@
 . $(dirname $0)/conf.sh
 
 base=`basename $0`
-sectors=100
+sectors=32
 keyfile=`mktemp $base.XXXXXX` || exit 1
+rnd=`mktemp $base.XXXXXX` || exit 1
 
-echo "1..460"
+echo "1..200"
 
-i=1
-for cipher in aes:0 aes:128 aes:256 \
-    aes-xts:0 aes-xts:128 aes-xts:256 \
-    aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \
-    3des:0 3des:192 \
-    3des-cbc:0 3des-cbc:192 \
-    blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \
-    blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \
-    blowfish:416 blowfish:448 \
-    blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \
-    blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \
-    blowfish-cbc:416 blowfish-cbc:448 \
-    camellia:0 camellia:128 camellia:192 camellia:256 \
-    camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do
+do_test() {
+	cipher=$1
+	secsize=$2
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
-	for secsize in 512 1024 2048 4096 8192; do
-		rnd=`mktemp $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
+	mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1
+
+	geli init -B none -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null
+	geli attach -p -k $keyfile md${no}
 
-		geli init -B none -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null
-		geli attach -p -k $keyfile md${no}
+	secs=`diskinfo /dev/md${no}.eli | awk '{print $4}'`
 
-		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
 
-		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`
 
-		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))
 
-		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}
+	mdconfig -d -u $no
+}
 
-		geli detach md${no}
-		rm -f $rnd
-		mdconfig -d -u $no
-	done
-done
+i=1
+dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
+for_each_geli_config_nointegrity do_test
 
+rm -f $rnd
 rm -f $keyfile
diff --git a/tests/sys/geom/class/eli/integrity_copy_test.sh b/tests/sys/geom/class/eli/integrity_copy_test.sh
index 4c8efd32a..ae345d74c 100644
--- a/tests/sys/geom/class/eli/integrity_copy_test.sh
+++ b/tests/sys/geom/class/eli/integrity_copy_test.sh
@@ -4,96 +4,85 @@
 . $(dirname $0)/conf.sh
 
 base=`basename $0`
-sectors=100
 keyfile=`mktemp $base.XXXXXX` || exit 1
 sector=`mktemp $base.XXXXXX` || exit 1
 
-echo "1..5520"
+echo "1..2400"
 
-i=1
-for cipher in aes:0 aes:128 aes:256 \
-    aes-xts:0 aes-xts:128 aes-xts:256 \
-    aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \
-    3des:0 3des:192 \
-    3des-cbc:0 3des-cbc:192 \
-    blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \
-    blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \
-    blowfish:416 blowfish:448 \
-    blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \
-    blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \
-    blowfish-cbc:416 blowfish-cbc:448 \
-    camellia:0 camellia:128 camellia:192 camellia:256 \
-    camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do
+do_test() {
+	cipher=$1
+	aalgo=$2
+	secsize=$3
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
-	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
-		for secsize in 512 1024 2048 4096 8192; do
-			#mdconfig -a -t malloc -s `expr $secsize \* 2 + 512`b -u $no || exit 1
-			mdconfig -a -t malloc -s $sectors -u $no || exit 1
-
-			dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
-
-			geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null
-			geli attach -p -k $keyfile md${no}
-
-			dd if=/dev/random of=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1
-
-			dd if=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1
-			if [ $? -eq 0 ]; then
-				echo "ok $i - small 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			else
-				echo "not ok $i - small 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			fi
-			i=$((i+1))
-
-			geli detach md${no}
-			# Copy first small sector to the second small sector.
-			# This should be detected as corruption.
-			dd if=/dev/md${no} of=${sector} bs=512 count=1 >/dev/null 2>&1
-			dd if=${sector} of=/dev/md${no} bs=512 count=1 seek=1 >/dev/null 2>&1
-			geli attach -p -k $keyfile md${no}
-
-			dd if=/dev/md${no}.eli of=/dev/null bs=${secsize} count=1 >/dev/null 2>&1
-			if [ $? -ne 0 ]; then
-				echo "ok $i - small 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			else
-				echo "not ok $i - small 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			fi
-			i=$((i+1))
-
-			ms=`diskinfo /dev/md${no} | awk '{print $3 - 512}'`
-			ns=`diskinfo /dev/md${no}.eli | awk '{print $4}'`
-			usecsize=`echo "($ms / $ns) - (($ms / $ns) % 512)" | bc`
-
-			dd if=/dev/random of=/dev/md${no}.eli bs=${secsize} count=2 >/dev/null 2>&1
-
-			dd if=/dev/md${no}.eli bs=${secsize} count=2 >/dev/null 2>&1
-			if [ $? -eq 0 ]; then
-				echo "ok $i - big 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			else
-				echo "not ok $i - big 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			fi
-			i=$((i+1))
-
-			geli detach md${no}
-			# Copy first big sector to the second big sector.
-			# This should be detected as corruption.
-			dd if=/dev/md${no} of=${sector} bs=${usecsize} count=1 >/dev/null 2>&1
-			dd if=${sector} of=/dev/md${no} bs=${usecsize} count=1 seek=1 >/dev/null 2>&1
-			geli attach -p -k $keyfile md${no}
-
-			dd if=/dev/md${no}.eli of=/dev/null bs=${secsize} count=2 >/dev/null 2>&1
-			if [ $? -ne 0 ]; then
-				echo "ok $i - big 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			else
-				echo "not ok $i - big 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			fi
-			i=$((i+1))
-
-			geli detach md${no}
-			mdconfig -d -u $no
-		done
-	done
-done
+
+	mdconfig -a -t malloc -s `expr $secsize \* 2 + 512`b -u $no || exit 1
+	geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null
+	geli attach -p -k $keyfile md${no}
+
+	dd if=/dev/random of=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1
+
+	dd if=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1
+	if [ $? -eq 0 ]; then
+		echo "ok $i - small 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	else
+		echo "not ok $i - small 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	fi
+	i=$((i+1))
+
+	geli detach md${no}
+	# Copy first small sector to the second small sector.
+	# This should be detected as corruption.
+	dd if=/dev/md${no} of=${sector} bs=512 count=1 >/dev/null 2>&1
+	dd if=${sector} of=/dev/md${no} bs=512 count=1 seek=1 >/dev/null 2>&1
+	geli attach -p -k $keyfile md${no}
+
+	dd if=/dev/md${no}.eli of=/dev/null bs=${secsize} count=1 >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "ok $i - small 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	else
+		echo "not ok $i - small 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	fi
+	i=$((i+1))
+
+	ms=`diskinfo /dev/md${no} | awk '{print $3 - 512}'`
+	ns=`diskinfo /dev/md${no}.eli | awk '{print $4}'`
+	usecsize=`echo "($ms / $ns) - (($ms / $ns) % 512)" | bc`
+
+	# Fix the corruption
+	dd if=/dev/random of=/dev/md${no}.eli bs=${secsize} count=2 >/dev/null 2>&1
+
+	dd if=/dev/md${no}.eli bs=${secsize} count=2 >/dev/null 2>&1
+	if [ $? -eq 0 ]; then
+		echo "ok $i - big 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	else
+		echo "not ok $i - big 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	fi
+	i=$((i+1))
+
+	geli detach md${no}
+	# Copy first big sector to the second big sector.
+	# This should be detected as corruption.
+	dd if=/dev/md${no} of=${sector} bs=${usecsize} count=1 >/dev/null 2>&1
+	dd if=${sector} of=/dev/md${no} bs=${usecsize} count=1 seek=1 >/dev/null 2>&1
+	geli attach -p -k $keyfile md${no}
+
+	dd if=/dev/md${no}.eli of=/dev/null bs=${secsize} count=2 >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "ok $i - big 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	else
+		echo "not ok $i - big 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	fi
+	i=$((i+1))
+
+	geli detach md${no}
+	mdconfig -d -u $no
+}
+
+
+i=1
+dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
+
+for_each_geli_config do_test
 
 rm -f $keyfile $sector
diff --git a/tests/sys/geom/class/eli/integrity_data_test.sh b/tests/sys/geom/class/eli/integrity_data_test.sh
index 7ea7c96b8..73b950a58 100644
--- a/tests/sys/geom/class/eli/integrity_data_test.sh
+++ b/tests/sys/geom/class/eli/integrity_data_test.sh
@@ -4,66 +4,42 @@
 . $(dirname $0)/conf.sh
 
 base=`basename $0`
-sectors=100
 keyfile=`mktemp $base.XXXXXX` || exit 1
 sector=`mktemp $base.XXXXXX` || exit 1
 
-echo "1..2760"
+echo "1..600"
 
-i=1
-for cipher in aes:0 aes:128 aes:256 \
-    aes-xts:0 aes-xts:128 aes-xts:256 \
-    aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \
-    3des:0 3des:192 \
-    3des-cbc:0 3des-cbc:192 \
-    blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \
-    blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \
-    blowfish:416 blowfish:448 \
-    blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \
-    blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \
-    blowfish-cbc:416 blowfish-cbc:448 \
-    camellia:0 camellia:128 camellia:192 camellia:256 \
-    camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do
+do_test() {
+	cipher=$1
+	aalgo=$2
+	secsize=$3
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
-	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
-		for secsize in 512 1024 2048 4096 8192; do
-			mdconfig -a -t malloc -s `expr $secsize \* 2 + 512`b -u $no || exit 1
-
-			dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
 
-			geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null
-			geli attach -p -k $keyfile md${no}
+	mdconfig -a -t malloc -s `expr $secsize \* 2 + 512`b -u $no || exit 1
+	geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null
 
-			dd if=/dev/random of=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1
+	# Corrupt 8 bytes of data.
+	dd if=/dev/md${no} of=${sector} bs=512 count=1 >/dev/null 2>&1
+	dd if=/dev/random of=${sector} bs=1 count=8 seek=64 conv=notrunc >/dev/null 2>&1
+	dd if=${sector} of=/dev/md${no} bs=512 count=1 >/dev/null 2>&1
+	geli attach -p -k $keyfile md${no}
 
-			dd if=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1
-			if [ $? -eq 0 ]; then
-				echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			else
-				echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			fi
-			i=$((i+1))
+	dd if=/dev/md${no}.eli of=/dev/null bs=${secsize} count=1 >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	else
+		echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	fi
+	i=$((i+1))
 
-			geli detach md${no}
-			# Corrupt 8 bytes of data.
-			dd if=/dev/md${no} of=${sector} bs=512 count=1 >/dev/null 2>&1
-			dd if=/dev/random of=${sector} bs=1 count=8 seek=64 conv=notrunc >/dev/null 2>&1
-			dd if=${sector} of=/dev/md${no} bs=512 count=1 >/dev/null 2>&1
-			geli attach -p -k $keyfile md${no}
+	geli detach md${no}
+	mdconfig -d -u $no
+}
 
-			dd if=/dev/md${no}.eli of=/dev/null bs=${secsize} count=1 >/dev/null 2>&1
-			if [ $? -ne 0 ]; then
-				echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			else
-				echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			fi
-			i=$((i+1))
+i=1
+dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
 
-			geli detach md${no}
-			mdconfig -d -u $no
-		done
-	done
-done
+for_each_geli_config do_test
 
 rm -f $keyfile $sector
diff --git a/tests/sys/geom/class/eli/integrity_hmac_test.sh b/tests/sys/geom/class/eli/integrity_hmac_test.sh
index 243eac9ec..6e1dfa585 100644
--- a/tests/sys/geom/class/eli/integrity_hmac_test.sh
+++ b/tests/sys/geom/class/eli/integrity_hmac_test.sh
@@ -4,66 +4,43 @@
 . $(dirname $0)/conf.sh
 
 base=`basename $0`
-sectors=100
 keyfile=`mktemp $base.XXXXXX` || exit 1
 sector=`mktemp $base.XXXXXX` || exit 1
 
-echo "1..2760"
+echo "1..600"
 
-i=1
-for cipher in aes:0 aes:128 aes:256 \
-    aes-xts:0 aes-xts:128 aes-xts:256 \
-    aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \
-    3des:0 3des:192 \
-    3des-cbc:0 3des-cbc:192 \
-    blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \
-    blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \
-    blowfish:416 blowfish:448 \
-    blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \
-    blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \
-    blowfish-cbc:416 blowfish-cbc:448 \
-    camellia:0 camellia:128 camellia:192 camellia:256 \
-    camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do
+do_test() {
+	cipher=$1
+	aalgo=$2
+	secsize=$3
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
-	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
-		for secsize in 512 1024 2048 4096 8192; do
-			mdconfig -a -t malloc -s `expr $secsize \* 2 + 512`b -u $no || exit 1
 
-			dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
+	mdconfig -a -t malloc -s `expr $secsize \* 2 + 512`b -u $no || exit 2
+	geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null
 
-			geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null
-			geli attach -p -k $keyfile md${no}
+	# Corrupt 8 bytes of HMAC.
+	dd if=/dev/md${no} of=${sector} bs=512 count=1 >/dev/null 2>&1
+	dd if=/dev/random of=${sector} bs=1 count=16 conv=notrunc >/dev/null 2>&1
+	dd if=${sector} of=/dev/md${no} bs=512 count=1 >/dev/null 2>&1
+	geli attach -p -k $keyfile md${no}
 
-			dd if=/dev/random of=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1
+	dd if=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	else
+		echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	fi
+	i=$((i+1))
 
-			dd if=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1
-			if [ $? -eq 0 ]; then
-				echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			else
-				echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			fi
-			i=$((i+1))
+	geli detach md${no}
+	mdconfig -d -u $no
+}
 
-			geli detach md${no}
-			# Corrupt 8 bytes of HMAC.
-			dd if=/dev/md${no} of=${sector} bs=512 count=1 >/dev/null 2>&1
-			dd if=/dev/random of=${sector} bs=1 count=16 conv=notrunc >/dev/null 2>&1
-			dd if=${sector} of=/dev/md${no} bs=512 count=1 >/dev/null 2>&1
-			geli attach -p -k $keyfile md${no}
 
-			dd if=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1
-			if [ $? -ne 0 ]; then
-				echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			else
-				echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			fi
-			i=$((i+1))
+i=1
+dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
 
-			geli detach md${no}
-			mdconfig -d -u $no
-		done
-	done
-done
+for_each_geli_config do_test
 
 rm -f $keyfile $sector
diff --git a/tests/sys/geom/class/eli/onetime_a_test.sh b/tests/sys/geom/class/eli/onetime_a_test.sh
index 4e26dfbc6..0cccf3031 100644
--- a/tests/sys/geom/class/eli/onetime_a_test.sh
+++ b/tests/sys/geom/class/eli/onetime_a_test.sh
@@ -4,51 +4,42 @@
 . $(dirname $0)/conf.sh
 
 base=`basename $0`
-sectors=100
+sectors=8
+rnd=`mktemp $base.XXXXXX` || exit 1
 
-echo "1..1380"
+echo "1..600"
 
-i=1
-for cipher in aes:0 aes:128 aes:256 \
-    aes-xts:0 aes-xts:128 aes-xts:256 \
-    aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \
-    3des:0 3des:192 \
-    3des-cbc:0 3des-cbc:192 \
-    blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \
-    blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \
-    blowfish:416 blowfish:448 \
-    blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \
-    blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \
-    blowfish-cbc:416 blowfish-cbc:448 \
-    camellia:0 camellia:128 camellia:192 camellia:256 \
-    camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do
+do_test() {
+	cipher=$1
+	aalgo=$2
+	secsize=$3
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
-	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
-		for secsize in 512 1024 2048 4096 8192; do
-			rnd=`mktemp $base.XXXXXX` || exit 1
-			mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1
-
-			geli onetime -a $aalgo -e $ealgo -l $keylen -s $secsize md${no} 2>/dev/null
-
-			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`
-
-			if [ ${md_rnd} = ${md_ddev} ]; then
-				echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			else
-				echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
-			fi
-			i=$((i+1))
-
-			geli detach md${no}
-			rm -f $rnd
-			mdconfig -d -u $no
-		done
-	done
-done
+
+	mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1
+	geli onetime -a $aalgo -e $ealgo -l $keylen -s $secsize md${no} 2>/dev/null
+
+	secs=`diskinfo /dev/md${no}.eli | awk '{print $4}'`
+
+	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`
+
+	if [ ${md_rnd} = ${md_ddev} ]; then
+		echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	else
+		echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}"
+	fi
+	i=$((i+1))
+
+	geli detach md${no}
+	mdconfig -d -u $no
+}
+
+i=1
+dd if=/dev/random of=${rnd} bs=1024 count=1024 >/dev/null 2>&1
+
+for_each_geli_config do_test
+
+rm -f $rnd
diff --git a/tests/sys/geom/class/eli/onetime_test.sh b/tests/sys/geom/class/eli/onetime_test.sh
index 17061d058..3cade1528 100644
--- a/tests/sys/geom/class/eli/onetime_test.sh
+++ b/tests/sys/geom/class/eli/onetime_test.sh
@@ -6,54 +6,45 @@
 base=`basename $0`
 sectors=100
 
-echo "1..460"
+echo "1..200"
 
-i=1
-for cipher in aes:0 aes:128 aes:256 \
-    aes-xts:0 aes-xts:128 aes-xts:256 \
-    aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \
-    3des:0 3des:192 \
-    3des-cbc:0 3des-cbc:192 \
-    blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \
-    blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \
-    blowfish:416 blowfish:448 \
-    blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \
-    blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \
-    blowfish-cbc:416 blowfish-cbc:448 \
-    camellia:0 camellia:128 camellia:192 camellia:256 \
-    camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do
+do_test() {
+	cipher=$1
+	secsize=$2
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
-	for secsize in 512 1024 2048 4096 8192; do
-		rnd=`mktemp $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} 2>/dev/null
-
-		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
+
+	rnd=`mktemp $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} 2>/dev/null
+
+	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
+}
+
+i=1
+for_each_geli_config_nointegrity do_test
diff --git a/tests/sys/geom/class/nop/1_test.sh b/tests/sys/geom/class/nop/1_test.sh
deleted file mode 100644
index 4d6b65d5f..000000000
--- a/tests/sys/geom/class/nop/1_test.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-. `dirname $0`/conf.sh
-
-echo "1..1"
-
-us=$(attach_md -t malloc -s 1M) || exit 1
-
-gnop create /dev/${us} || exit 1
-
-# Size of created device should be 1MB.
-
-size=`diskinfo /dev/${us}.nop | awk '{print $3}'`
-
-if [ $size -eq 1048576 ]; then
-	echo "ok 1"
-else
-	echo "not ok 1"
-fi
diff --git a/tests/sys/geom/class/nop/2_test.sh b/tests/sys/geom/class/nop/2_test.sh
deleted file mode 100644
index 742234591..000000000
--- a/tests/sys/geom/class/nop/2_test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-. `dirname $0`/conf.sh
-
-src=`mktemp $base.XXXXXX` || exit 1
-dst=`mktemp $base.XXXXXX` || exit 1
-
-echo "1..1"
-
-dd if=/dev/random of=${src} bs=1m count=1 >/dev/null 2>&1
-
-us=$(attach_md -t malloc -s 1M) || exit 1
-
-gnop create /dev/${us} || exit 1
-
-dd if=${src} of=/dev/${us}.nop bs=1m count=1 >/dev/null 2>&1
-dd if=/dev/${us}.nop of=${dst} bs=1m count=1 >/dev/null 2>&1
-
-if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
-	echo "not ok 1"
-else
-	echo "ok 1"
-fi
-
-rm -f ${src} ${dst}
diff --git a/tests/sys/geom/class/nop/Makefile b/tests/sys/geom/class/nop/Makefile
index 5659b5d38..40b295e84 100644
--- a/tests/sys/geom/class/nop/Makefile
+++ b/tests/sys/geom/class/nop/Makefile
@@ -2,15 +2,6 @@
 
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
 
-TAP_TESTS_SH+=	1_test
-TAP_TESTS_SH+=	2_test
-
-FILES+=		conf.sh
-FILESNAME_conf.sh=	conf.sh
-FILESDIR=	${TESTSDIR}
-
-.for t in ${TAP_TESTS_SH}
-TEST_METADATA.$t+=	required_user="root"
-.endfor
+ATF_TESTS_SH+=	nop_test
 
 .include <bsd.test.mk>
diff --git a/tests/sys/geom/class/nop/conf.sh b/tests/sys/geom/class/nop/conf.sh
deleted file mode 100644
index e38e10c9a..000000000
--- a/tests/sys/geom/class/nop/conf.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-class="nop"
-base=`basename $0`
-
-gnop_test_cleanup()
-{
-	[ -c /dev/${us}.nop ] && gnop destroy ${us}.nop
-	geom_test_cleanup
-}
-trap gnop_test_cleanup ABRT EXIT INT TERM
-
-. `dirname $0`/../geom_subr.sh
diff --git a/tests/sys/geom/class/nop/nop_test.sh b/tests/sys/geom/class/nop/nop_test.sh
new file mode 100755
index 000000000..35cc191de
--- /dev/null
+++ b/tests/sys/geom/class/nop/nop_test.sh
@@ -0,0 +1,166 @@
+# Copyright (c) 2016 Alan Somers
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+MD_DEVS="md.devs"
+PLAINFILES=plainfiles
+
+atf_test_case diskinfo cleanup
+diskinfo_head()
+{
+	atf_set "descr" "gnop should preserve diskinfo's basic properties"
+	atf_set "require.user" "root"
+	atf_set "timeout" 15
+}
+diskinfo_body()
+{
+	us=$(alloc_md)
+	atf_check gnop create /dev/${us}
+	md_secsize=$(diskinfo ${us} | cut -wf 2)
+	md_mediasize=$(diskinfo ${us} | cut -wf 3)
+	md_stripesize=$(diskinfo ${us} | cut -wf 5)
+	nop_secsize=$(diskinfo ${us}.nop | cut -wf 2)
+	nop_mediasize=$(diskinfo ${us}.nop | cut -wf 3)
+	nop_stripesize=$(diskinfo ${us}.nop | cut -wf 5)
+	atf_check_equal "$md_secsize" "$nop_secsize"
+	atf_check_equal "$md_mediasize" "$nop_mediasize"
+	atf_check_equal "$md_stripesize" "$nop_stripesize"
+}
+diskinfo_cleanup()
+{
+	common_cleanup
+}
+
+atf_test_case io cleanup
+io_head()
+{
+	atf_set "descr" "I/O works on gnop devices"
+	atf_set "require.user" "root"
+	atf_set "timeout" 15
+}
+io_body()
+{
+	us=$(alloc_md)
+	atf_check gnop create /dev/${us}
+
+	echo src >> $PLAINFILES
+	echo dst >> $PLAINFILES
+	dd if=/dev/random of=src bs=1m count=1 >/dev/null 2>&1
+	dd if=src of=/dev/${us}.nop bs=1m count=1 > /dev/null 2>&1
+	dd if=/dev/${us}.nop of=dst bs=1m count=1 > /dev/null 2>&1
+
+	atf_check_equal `md5 -q src` `md5 -q dst`
+}
+io_cleanup()
+{
+	common_cleanup
+}
+
+atf_test_case size cleanup
+size_head()
+{
+	atf_set "descr" "Test gnop's -s option"
+	atf_set "require.user" "root"
+	atf_set "timeout" 15
+}
+size_body()
+{
+	us=$(alloc_md)
+	for mediasize in 65536 524288 1048576; do
+		atf_check gnop create -s ${mediasize} /dev/${us}
+		gnop_mediasize=`diskinfo /dev/${us}.nop | cut -wf 3`
+		atf_check_equal "${mediasize}" "${gnop_mediasize}"
+		atf_check gnop destroy /dev/${us}.nop
+	done
+	# We shouldn't be able to extend the provider's size
+	atf_check -s not-exit:0 -e ignore gnop create -s 2097152 /dev/${us}
+}
+size_cleanup()
+{
+	common_cleanup
+}
+
+atf_test_case stripesize cleanup
+stripesize_head()
+{
+	atf_set "descr" "Test gnop's -p and -P options"
+	atf_set "require.user" "root"
+	atf_set "timeout" 15
+}
+stripesize_body()
+{
+	us=$(alloc_md)
+	for ss in 512 1024 2048 4096 8192; do
+		for sofs in `seq 0 512 ${ss}`; do
+			[ "$sofs" -eq "$ss" ] && continue
+			atf_check gnop create -p ${ss} -P ${sofs} /dev/${us}
+			gnop_ss=`diskinfo /dev/${us}.nop | cut -wf 5`
+			gnop_sofs=`diskinfo /dev/${us}.nop | cut -wf 6`
+			atf_check_equal "${ss}" "${gnop_ss}"
+			atf_check_equal "${sofs}" "${gnop_sofs}"
+			atf_check gnop destroy /dev/${us}.nop
+		done
+	done
+}
+stripesize_cleanup()
+{
+	common_cleanup
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case io
+	atf_add_test_case diskinfo
+	atf_add_test_case stripesize
+	atf_add_test_case size
+}
+
+alloc_md()
+{
+	local md
+
+	md=$(mdconfig -a -t swap -s 1M) || atf_fail "mdconfig -a failed"
+	echo ${md} >> $MD_DEVS
+	echo ${md}
+}
+
+common_cleanup()
+{
+	if [ -f "$MD_DEVS" ]; then
+		while read test_md; do
+			gnop destroy -f ${test_md}.nop 2>/dev/null
+			mdconfig -d -u $test_md 2>/dev/null
+		done < $MD_DEVS
+		rm $MD_DEVS
+	fi
+
+	if [ -f "$PLAINFILES" ]; then
+		while read f; do
+			rm -f ${f}
+		done < ${PLAINFILES}
+		rm ${PLAINFILES}
+	fi
+	true
+}
-- 
2.45.0