Add support for Camellia encryption algorithm.

PR:		kern/113790
Submitted by:	Yoshisato YANAGISAWA <yanagisawa@csg.is.titech.ac.jp>
Approved by:	re (bmah)

7 files changed, 21 insertions, 14 deletions

diff --git a/tools/regression/geom_eli/init-a.t b/tools/regression/geom_eli/init-a.t
index fb0a1c4..e06881e 100644
--- a/tools/regression/geom_eli/init-a.t
+++ b/tools/regression/geom_eli/init-a.t
@@ -6,14 +6,15 @@ no=45
 sectors=100
 keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
 
-echo "1..540"
+echo "1..660"
 
 i=1
 for cipher in aes:0 aes:128 aes:192 aes:256 \
     3des:0 3des: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; do
+    blowfish:416 blowfish:448 \
+    camellia:0 camellia:128 camellia:192 camellia:256; do
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
 	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
diff --git a/tools/regression/geom_eli/init.t b/tools/regression/geom_eli/init.t
index 10fd7f7..13a5e2d 100644
--- a/tools/regression/geom_eli/init.t
+++ b/tools/regression/geom_eli/init.t
@@ -6,14 +6,15 @@ no=45
 sectors=100
 keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
 
-echo "1..180"
+echo "1..220"
 
 i=1
 for cipher in aes:0 aes:128 aes:192 aes:256 \
     3des:0 3des: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; do
+    blowfish:416 blowfish:448 \
+    camellia:0 camellia:128 camellia:192 camellia:256; do
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
 	for secsize in 512 1024 2048 4096 8192; do
diff --git a/tools/regression/geom_eli/integrity-copy.t b/tools/regression/geom_eli/integrity-copy.t
index eb4ce6c..97014e0 100644
--- a/tools/regression/geom_eli/integrity-copy.t
+++ b/tools/regression/geom_eli/integrity-copy.t
@@ -7,14 +7,15 @@ sectors=100
 keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
 sector=`mktemp /tmp/$base.XXXXXX` || exit 1
 
-echo "1..2160"
+echo "1..2640"
 
 i=1
 for cipher in aes:0 aes:128 aes:192 aes:256 \
     3des:0 3des: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; do
+    blowfish:416 blowfish:448 \
+    camellia:0 camellia:128 camellia:192 camellia:256; do
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
 	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
diff --git a/tools/regression/geom_eli/integrity-data.t b/tools/regression/geom_eli/integrity-data.t
index 3b11084..ea86039 100644
--- a/tools/regression/geom_eli/integrity-data.t
+++ b/tools/regression/geom_eli/integrity-data.t
@@ -7,14 +7,15 @@ sectors=100
 keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
 sector=`mktemp /tmp/$base.XXXXXX` || exit 1
 
-echo "1..1080"
+echo "1..1320"
 
 i=1
 for cipher in aes:0 aes:128 aes:192 aes:256 \
     3des:0 3des: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; do
+    blowfish:416 blowfish:448 \
+    camellia:0 camellia:128 camellia:192 camellia:256; do
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
 	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
diff --git a/tools/regression/geom_eli/integrity-hmac.t b/tools/regression/geom_eli/integrity-hmac.t
index 50dcb8a..bc8e3c1 100644
--- a/tools/regression/geom_eli/integrity-hmac.t
+++ b/tools/regression/geom_eli/integrity-hmac.t
@@ -7,14 +7,15 @@ sectors=100
 keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
 sector=`mktemp /tmp/$base.XXXXXX` || exit 1
 
-echo "1..1080"
+echo "1..1320"
 
 i=1
 for cipher in aes:0 aes:128 aes:192 aes:256 \
     3des:0 3des: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; do
+    blowfish:416 blowfish:448 \
+    camellia:0 camellia:128 camellia:192 camellia:256; do
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
 	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
diff --git a/tools/regression/geom_eli/onetime-a.t b/tools/regression/geom_eli/onetime-a.t
index 13681cf..bb69f7b 100644
--- a/tools/regression/geom_eli/onetime-a.t
+++ b/tools/regression/geom_eli/onetime-a.t
@@ -5,14 +5,15 @@ base=`basename $0`
 no=45
 sectors=100
 
-echo "1..540"
+echo "1..660"
 
 i=1
 for cipher in aes:0 aes:128 aes:192 aes:256 \
     3des:0 3des: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; do
+    blowfish:416 blowfish:448 \
+    camellia:0 camellia:128 camellia:192 camellia:256; do
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
 	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
diff --git a/tools/regression/geom_eli/onetime.t b/tools/regression/geom_eli/onetime.t
index 70b5479..b0ecbf3 100644
--- a/tools/regression/geom_eli/onetime.t
+++ b/tools/regression/geom_eli/onetime.t
@@ -5,14 +5,15 @@ base=`basename $0`
 no=45
 sectors=100
 
-echo "1..180"
+echo "1..220"
 
 i=1
 for cipher in aes:0 aes:128 aes:192 aes:256 \
     3des:0 3des: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; do
+    blowfish:416 blowfish:448 \
+    camellia:0 camellia:128 camellia:192 camellia:256; do
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
 	for secsize in 512 1024 2048 4096 8192; do