summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorgnn <gnn@FreeBSD.org>2007-05-09 19:37:02 +0000
committergnn <gnn@FreeBSD.org>2007-05-09 19:37:02 +0000
commit38b76f06232a188e2b053370458b6901b745948b (patch)
treeab6a97da261f87bb2e97c008d467da3311010b9e /sbin
parent4941ee4a2accc1d1a5d38148ec1378487b9e1cf0 (diff)
downloadFreeBSD-src-38b76f06232a188e2b053370458b6901b745948b.zip
FreeBSD-src-38b76f06232a188e2b053370458b6901b745948b.tar.gz
Integrate the Camellia Block Cipher. For more information see RFC 4132
and its bibliography. Submitted by: Tomoyuki Okazaki <okazaki at kick dot gr dot jp> MFC after: 1 month
Diffstat (limited to 'sbin')
-rw-r--r--sbin/setkey/setkey.81
-rw-r--r--sbin/setkey/token.l1
2 files changed, 2 insertions, 0 deletions
diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8
index 4ea7d39..12ef325 100644
--- a/sbin/setkey/setkey.8
+++ b/sbin/setkey/setkey.8
@@ -628,6 +628,7 @@ des-deriv 64 ipsec-ciph-des-derived-01
3des-deriv 192 no document
rijndael-cbc 128/192/256 rfc3602
aes-ctr 160/224/288 draft-ietf-ipsec-ciph-aes-ctr-03
+camllia-cbc 128/192/256 rfc4312
.Ed
.Pp
Note that the first 128/192/256 bits of a key for
diff --git a/sbin/setkey/token.l b/sbin/setkey/token.l
index 74c1e17..13db9be 100644
--- a/sbin/setkey/token.l
+++ b/sbin/setkey/token.l
@@ -167,6 +167,7 @@ tcp { yylval.num = 0; return(PR_TCP); }
<S_ENCALG>des-32iv { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC_DES32IV); }
<S_ENCALG>rijndael-cbc { yylval.num = SADB_X_EALG_RIJNDAELCBC; BEGIN INITIAL; return(ALG_ENC); }
<S_ENCALG>aes-ctr { yylval.num = SADB_X_EALG_AESCTR; BEGIN INITIAL; return(ALG_ENC); }
+<S_ENCALG>camellia-cbc { yylval.num = SADB_X_EALG_CAMELLIACBC; BEGIN INITIAL; return(ALG_ENC); }
/* compression algorithms */
{hyphen}C { return(F_COMP); }
OpenPOWER on IntegriCloud