From owner-FreeBSD-users-jp@jp.FreeBSD.org Sat Jun 16 16:15:13 2007
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id l5G7FDE87583;
	Sat, 16 Jun 2007 16:15:13 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from mail.csg.is.titech.ac.jp (mail.csg.is.titech.ac.jp [131.112.40.132])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id l5G7FCM87578
	for <FreeBSD-users-jp@jp.FreeBSD.org>; Sat, 16 Jun 2007 16:15:12 +0900 (JST)
	(envelope-from yanagisawa@csg.is.titech.ac.jp)
Received: from mail.csg.is.titech.ac.jp (mail.csg.is.titech.ac.jp [127.0.0.1])
	by mail.csg.is.titech.ac.jp (Postfix) with ESMTP id 9964B10003B1
	for <FreeBSD-users-jp@jp.FreeBSD.org>; Sat, 16 Jun 2007 16:15:07 +0900 (JST)
Received: from mana.csg.is.titech.ac.jp (mana.csg.is.titech.ac.jp [131.112.40.170])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.csg.is.titech.ac.jp (Postfix) with ESMTP id 85D7310003F3
	for <FreeBSD-users-jp@jp.FreeBSD.org>; Sat, 16 Jun 2007 16:15:07 +0900 (JST)
From: Yoshisato YANAGISAWA <yanagisawa@csg.is.titech.ac.jp>
To: FreeBSD-users-jp@jp.FreeBSD.org
Message-Id: <20070616161503.910b0d84.yanagisawa@csg.is.titech.ac.jp>
Organization: Tokyo Institute of Technology.
X-Mailer: Sylpheed 2.4.2 (GTK+ 2.10.13; i386-portbld-freebsd6.2)
Mime-Version: 1.0
Content-Type: multipart/mixed;
 boundary="Multipart=_Sat__16_Jun_2007_16_15_03_+0900_eZgcIUfo4+c0S6ud"
X-Virus-Scanned: ClamAV using ClamSMTP
Reply-To: FreeBSD-users-jp@jp.FreeBSD.org
Precedence: list
Date: Sat, 16 Jun 2007 16:15:03 +0900
X-Sequence: FreeBSD-users-jp 90755
Subject: [FreeBSD-users-jp 90755] =?ISO-2022-JP?B?GyRCJSshPCVNJWsbKEI=?=
 =?ISO-2022-JP?B?GyRCJEskQSRnJEMkSCQ3JD8yfkIkJHIkOSRrGyhC?= patch
 =?ISO-2022-JP?B?GyRCJE5EczYhQGgkTyRJJDMhKRsoQg==?= 
Sender: owner-FreeBSD-users-jp@jp.FreeBSD.org
X-Originator: yanagisawa@csg.is.titech.ac.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+060209

This is a multi-part message in MIME format.

--Multipart=_Sat__16_Jun_2007_16_15_03_+0900_eZgcIUfo4+c0S6ud
Content-Type: text/plain; charset=ISO-2022-JP
Content-Transfer-Encoding: 7bit


$BLx_7$G$9!#(B

NTT$B$H;0I)EE5!$,:n$C$?9q;:%V%m%C%/0E9f$G$"$k(BCamellia$B$,(B
current$B$N%+!<%M%k$G;H$($k$h$&$K$J$C$F$$$?$N$K?(H/$5$l$F(B
geli(8)$B$G(BCamellia$B$r;H$($k$h$&$K$9$k(Bpatch$B$r=q$$$F$_$^$7$?!#(B
$B$=$3$G<ALd$J$N$G$9$,!"$3$s$J$A$g$C$H$7$?(Bpatch$B$r:n$C$F(B
FreeBSD$BK\BN$KF~$l$FM_$7$$>l9g$OC/$KMj$a$PNI$$$N$G$7$g$&$+!#(B
$B65$($FD:$1$l$P9,$$$G$9!#(B

$B$3$N%Q%C%A$O:#F|$N(B0$B;~:"$N(Bcurrent$B$KBP$7$F:n$j$^$7$?!#(B
$B;H$&$K$O(Bpatch$B$rEv$F$?8e$K(Bgeli$B$N%+!<%M%k%b%8%e!<%k$H(B
sbin/geon$B$N:F%3%s%Q%$%k$,I,MW$K$J$j$^$9!#(B
$B;H$C$F$_$?46A[$b4?7^$7$^$9!#(B

$B!t(B $BMeGO$O(B1$BF|$K$7$F$J$i$:$H8@$$$^$9$,!"(B
$B!t(B 1$BF|$b$+$1$:$G$-$A$c$$$^$7$?!#(B (^^;
$B!t(B $B0$Jr$_$?$$$K4JC1$J$N$G$b$&C/$+:n$C$F$$$k$+$bCN$l$J$$$G$9$M!#(B
$B!t(B random(4)$B$N(Byarrow$B%"%k%4%j%:%`$G(BCamellia$B$r;H$*$&$H$b$7$^$7$?$,!"(B
$B!t(B $B$3$A$i$O(BAES$B$Y$C$?$j$J$N$G$d$j$K$/$$$G$9!#(B

-- 
-------------------------------------------------------
Yoshisato YANAGISAWA <yanagisawa@csg.is.titech.ac.jp>
Dept. of Mathematical and Computing Sciences,
Graduate School of Information Science and Engineering,
Tokyo Institute of Technology.
/* If you are an *BSD user, let's join http://bsdstats.org/ */

--Multipart=_Sat__16_Jun_2007_16_15_03_+0900_eZgcIUfo4+c0S6ud
Content-Type: text/x-diff;
 name="geli_camellia.diff"
Content-Disposition: attachment;
 filename="geli_camellia.diff"
Content-Transfer-Encoding: 7bit

diff -ruN src.bak/sbin/geom/class/eli/geli.8 src/sbin/geom/class/eli/geli.8
--- src.bak/sbin/geom/class/eli/geli.8	2007-03-05 21:39:49.000000000 +0900
+++ src/sbin/geom/class/eli/geli.8	2007-06-16 13:48:37.000000000 +0900
@@ -146,7 +146,8 @@
 .It
 Supports many cryptographic algorithms (currently
 .Nm AES ,
-.Nm Blowfish
+.Nm Blowfish ,
+.Nm Camellia
 and
 .Nm 3DES ) .
 .It
@@ -227,7 +228,8 @@
 Encryption algorithm to use.
 Currently supported algorithms are:
 .Nm AES ,
-.Nm Blowfish
+.Nm Blowfish ,
+.Nm Camellia
 and
 .Nm 3DES .
 The default is
@@ -260,7 +262,9 @@
 128 for
 .Nm AES ,
 128 for
-.Nm Blowfish
+.Nm Blowfish ,
+128 for
+.Nm Camellia
 and 192 for
 .Nm 3DES .
 .It Fl s Ar sectorsize
diff -ruN src.bak/sys/geom/eli/g_eli.h src/sys/geom/eli/g_eli.h
--- src.bak/sys/geom/eli/g_eli.h	2006-09-16 19:43:17.000000000 +0900
+++ src/sys/geom/eli/g_eli.h	2007-06-16 13:50:23.000000000 +0900
@@ -286,6 +286,8 @@
 		return (CRYPTO_AES_CBC);
 	else if (strcasecmp("blowfish", name) == 0)
 		return (CRYPTO_BLF_CBC);
+	else if (strcasecmp("camellia", name) == 0)
+		return (CRYPTO_CAMELLIA_CBC);
 	else if (strcasecmp("3des", name) == 0)
 		return (CRYPTO_3DES_CBC);
 	return (CRYPTO_ALGORITHM_MIN - 1);
@@ -321,6 +323,8 @@
 		return ("AES-CBC");
 	case CRYPTO_BLF_CBC:
 		return ("Blowfish-CBC");
+	case CRYPTO_CAMELLIA_CBC:
+		return ("CAMELLIA-CBC");
 	case CRYPTO_3DES_CBC:
 		return ("3DES-CBC");
 	case CRYPTO_MD5_HMAC:
@@ -390,7 +394,8 @@
 				keylen = 0;
 		}
 		return (keylen);
-	case CRYPTO_AES_CBC:
+	case CRYPTO_AES_CBC: /* FALLTHROUGH */
+	case CRYPTO_CAMELLIA_CBC:
 		switch (keylen) {
 		case 0:
 			return (128);
diff -ruN src.bak/sys/geom/eli/g_eli_crypto.c src/sys/geom/eli/g_eli_crypto.c
--- src.bak/sys/geom/eli/g_eli_crypto.c	2007-03-21 12:42:50.000000000 +0900
+++ src/sys/geom/eli/g_eli_crypto.c	2007-06-16 13:51:23.000000000 +0900
@@ -158,6 +158,21 @@
 	case CRYPTO_BLF_CBC:
 		type = EVP_bf_cbc();
 		break;
+	case CRYPTO_CAMELLIA_CBC:
+		switch (keysize) {
+		case 128:
+			type = EVP_camellia_128_cbc();
+			break;
+		case 192:
+			type = EVP_camellia_192_cbc();
+			break;
+		case 256:
+			type = EVP_camellia_256_cbc();
+			break;
+		default:
+			return (EINVAL);
+		}
+		break;
 	case CRYPTO_3DES_CBC:
 		type = EVP_des_ede3_cbc();
 		break;

--Multipart=_Sat__16_Jun_2007_16_15_03_+0900_eZgcIUfo4+c0S6ud--
