From owner-svn-src-head@FreeBSD.ORG Sat Sep 25 10:34:43 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12FE0106566C; Sat, 25 Sep 2010 10:34:43 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 019CF8FC0C; Sat, 25 Sep 2010 10:34:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8PAYg7E060192; Sat, 25 Sep 2010 10:34:42 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8PAYgd1060184; Sat, 25 Sep 2010 10:34:42 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201009251034.o8PAYgd1060184@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sat, 25 Sep 2010 10:34:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213168 - head/tools/regression/geom_eli X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Sep 2010 10:34:43 -0000 Author: pjd Date: Sat Sep 25 10:34:42 2010 New Revision: 213168 URL: http://svn.freebsd.org/changeset/base/213168 Log: Update regression tests after AES-XTS addition. MFC after: 2 weeks Modified: head/tools/regression/geom_eli/init-a.t head/tools/regression/geom_eli/init.t head/tools/regression/geom_eli/integrity-copy.t head/tools/regression/geom_eli/integrity-data.t head/tools/regression/geom_eli/integrity-hmac.t head/tools/regression/geom_eli/onetime-a.t head/tools/regression/geom_eli/onetime.t Modified: head/tools/regression/geom_eli/init-a.t ============================================================================== --- head/tools/regression/geom_eli/init-a.t Sat Sep 25 10:34:11 2010 (r213167) +++ head/tools/regression/geom_eli/init-a.t Sat Sep 25 10:34:42 2010 (r213168) @@ -6,15 +6,22 @@ no=45 sectors=100 keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -echo "1..660" +echo "1..1380" i=1 -for cipher in aes:0 aes:128 aes:192 aes:256 \ +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 \ - camellia:0 camellia:128 camellia:192 camellia:256; do + 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 ealgo=${cipher%%:*} keylen=${cipher##*:} for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do Modified: head/tools/regression/geom_eli/init.t ============================================================================== --- head/tools/regression/geom_eli/init.t Sat Sep 25 10:34:11 2010 (r213167) +++ head/tools/regression/geom_eli/init.t Sat Sep 25 10:34:42 2010 (r213168) @@ -6,15 +6,22 @@ no=45 sectors=100 keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -echo "1..220" +echo "1..460" i=1 -for cipher in aes:0 aes:128 aes:192 aes:256 \ +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 \ - camellia:0 camellia:128 camellia:192 camellia:256; do + 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 ealgo=${cipher%%:*} keylen=${cipher##*:} for secsize in 512 1024 2048 4096 8192; do Modified: head/tools/regression/geom_eli/integrity-copy.t ============================================================================== --- head/tools/regression/geom_eli/integrity-copy.t Sat Sep 25 10:34:11 2010 (r213167) +++ head/tools/regression/geom_eli/integrity-copy.t Sat Sep 25 10:34:42 2010 (r213168) @@ -7,15 +7,22 @@ sectors=100 keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 sector=`mktemp /tmp/$base.XXXXXX` || exit 1 -echo "1..2640" +echo "1..5520" i=1 -for cipher in aes:0 aes:128 aes:192 aes:256 \ +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 \ - camellia:0 camellia:128 camellia:192 camellia:256; do + 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 ealgo=${cipher%%:*} keylen=${cipher##*:} for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do Modified: head/tools/regression/geom_eli/integrity-data.t ============================================================================== --- head/tools/regression/geom_eli/integrity-data.t Sat Sep 25 10:34:11 2010 (r213167) +++ head/tools/regression/geom_eli/integrity-data.t Sat Sep 25 10:34:42 2010 (r213168) @@ -7,15 +7,22 @@ sectors=100 keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 sector=`mktemp /tmp/$base.XXXXXX` || exit 1 -echo "1..1320" +echo "1..2760" i=1 -for cipher in aes:0 aes:128 aes:192 aes:256 \ +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 \ - camellia:0 camellia:128 camellia:192 camellia:256; do + 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 ealgo=${cipher%%:*} keylen=${cipher##*:} for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do Modified: head/tools/regression/geom_eli/integrity-hmac.t ============================================================================== --- head/tools/regression/geom_eli/integrity-hmac.t Sat Sep 25 10:34:11 2010 (r213167) +++ head/tools/regression/geom_eli/integrity-hmac.t Sat Sep 25 10:34:42 2010 (r213168) @@ -7,15 +7,22 @@ sectors=100 keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 sector=`mktemp /tmp/$base.XXXXXX` || exit 1 -echo "1..1320" +echo "1..2760" i=1 -for cipher in aes:0 aes:128 aes:192 aes:256 \ +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 \ - camellia:0 camellia:128 camellia:192 camellia:256; do + 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 ealgo=${cipher%%:*} keylen=${cipher##*:} for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do Modified: head/tools/regression/geom_eli/onetime-a.t ============================================================================== --- head/tools/regression/geom_eli/onetime-a.t Sat Sep 25 10:34:11 2010 (r213167) +++ head/tools/regression/geom_eli/onetime-a.t Sat Sep 25 10:34:42 2010 (r213168) @@ -5,15 +5,22 @@ base=`basename $0` no=45 sectors=100 -echo "1..660" +echo "1..1380" i=1 -for cipher in aes:0 aes:128 aes:192 aes:256 \ +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 \ - camellia:0 camellia:128 camellia:192 camellia:256; do + 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 ealgo=${cipher%%:*} keylen=${cipher##*:} for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do Modified: head/tools/regression/geom_eli/onetime.t ============================================================================== --- head/tools/regression/geom_eli/onetime.t Sat Sep 25 10:34:11 2010 (r213167) +++ head/tools/regression/geom_eli/onetime.t Sat Sep 25 10:34:42 2010 (r213168) @@ -5,15 +5,22 @@ base=`basename $0` no=45 sectors=100 -echo "1..220" +echo "1..460" i=1 -for cipher in aes:0 aes:128 aes:192 aes:256 \ +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 \ - camellia:0 camellia:128 camellia:192 camellia:256; do + 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 ealgo=${cipher%%:*} keylen=${cipher##*:} for secsize in 512 1024 2048 4096 8192; do