f92ce0224a
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
46 lines
1.0 KiB
Bash
46 lines
1.0 KiB
Bash
#!/bin/sh
|
|
# $FreeBSD$
|
|
|
|
. $(dirname $0)/conf.sh
|
|
|
|
base=`basename $0`
|
|
sectors=8
|
|
rnd=`mktemp $base.XXXXXX` || exit 1
|
|
|
|
echo "1..600"
|
|
|
|
do_test() {
|
|
cipher=$1
|
|
aalgo=$2
|
|
secsize=$3
|
|
ealgo=${cipher%%:*}
|
|
keylen=${cipher##*:}
|
|
|
|
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
|