From 38b76f06232a188e2b053370458b6901b745948b Mon Sep 17 00:00:00 2001
From: gnn <gnn@FreeBSD.org>
Date: Wed, 9 May 2007 19:37:02 +0000
Subject: 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
---
 sbin/setkey/setkey.8 | 1 +
 sbin/setkey/token.l  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'sbin/setkey')

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); }
-- 
cgit v1.1