summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2007-09-01 06:33:02 +0000
committerpjd <pjd@FreeBSD.org>2007-09-01 06:33:02 +0000
commit9afb74d04914b9d6ab998cb5c47f761f326e9961 (patch)
treed9ebf6d71be9eb475dfffdb174dd1a4ef169db01 /sbin
parent3ee1ed30a1cb2db54f874866c48d04aba457b560 (diff)
downloadFreeBSD-src-9afb74d04914b9d6ab998cb5c47f761f326e9961.zip
FreeBSD-src-9afb74d04914b9d6ab998cb5c47f761f326e9961.tar.gz
Add support for Camellia encryption algorithm.
PR: kern/113790 Submitted by: Yoshisato YANAGISAWA <yanagisawa@csg.is.titech.ac.jp> Approved by: re (bmah)
Diffstat (limited to 'sbin')
-rw-r--r--sbin/geom/class/eli/geli.814
1 files changed, 11 insertions, 3 deletions
diff --git a/sbin/geom/class/eli/geli.8 b/sbin/geom/class/eli/geli.8
index 3f1da72..d087e64 100644
--- a/sbin/geom/class/eli/geli.8
+++ b/sbin/geom/class/eli/geli.8
@@ -146,7 +146,8 @@ will make use of it automatically.
.It
Supports many cryptographic algorithms (currently
.Nm AES ,
-.Nm Blowfish
+.Nm Blowfish ,
+.Nm Camellia
and
.Nm 3DES ) .
.It
@@ -227,7 +228,8 @@ If the option is not given, there will be no authentication, only encryption.
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 @@ If not given, the default key length for the given algorithm is used, which is:
128 for
.Nm AES ,
128 for
-.Nm Blowfish
+.Nm Blowfish ,
+128 for
+.Nm Camellia
and 192 for
.Nm 3DES .
.It Fl s Ar sectorsize
@@ -652,5 +656,9 @@ The
.Nm
utility appeared in
.Fx 6.0 .
+Support for
+.Nm Camellia
+block cipher is implemented by Yoshisato Yanagisawa in
+.Fx 7.0 .
.Sh AUTHORS
.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
OpenPOWER on IntegriCloud