Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 May 2019 04:29:29 +0000 (UTC)
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r348454 - head/tests/sys/geom/class/eli
Message-ID:  <201905310429.x4V4TTcf041402@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lwhsu
Date: Fri May 31 04:29:29 2019
New Revision: 348454
URL: https://svnweb.freebsd.org/changeset/base/348454

Log:
  Remove tests for the deprecated algorithms in r348206
  
  The tests are failing because the return value and output have changed, but
  before test code structure adjusted, removing these test cases help people
  be able to focus on more important cases.
  
  Discussed with:	emaste
  MFC with:	r348206
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/tests/sys/geom/class/eli/conf.sh
  head/tests/sys/geom/class/eli/init_test.sh

Modified: head/tests/sys/geom/class/eli/conf.sh
==============================================================================
--- head/tests/sys/geom/class/eli/conf.sh	Fri May 31 03:13:09 2019	(r348453)
+++ head/tests/sys/geom/class/eli/conf.sh	Fri May 31 04:29:29 2019	(r348454)
@@ -37,15 +37,10 @@ for_each_geli_config() {
 
 	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 \
+		for aalgo in hmac/sha1 hmac/ripemd160 hmac/sha256 \
 		    hmac/sha384 hmac/sha512; do
 			for secsize in 512 1024 2048 4096 $MAX_SECSIZE; do
 				${func} $cipher $aalgo $secsize
@@ -66,11 +61,6 @@ for_each_geli_config_nointegrity() {
 	md=$(attach_md -t malloc -s $bytes)
 	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##*:}

Modified: head/tests/sys/geom/class/eli/init_test.sh
==============================================================================
--- head/tests/sys/geom/class/eli/init_test.sh	Fri May 31 03:13:09 2019	(r348453)
+++ head/tests/sys/geom/class/eli/init_test.sh	Fri May 31 04:29:29 2019	(r348454)
@@ -308,13 +308,6 @@ init_alias_body()
 	atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none
 
 	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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905310429.x4V4TTcf041402>