From 89699b766092cf6c5fce80d34f611201e98b5713 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 15 May 2009 21:08:43 +0200
Subject: [PATCH] added OAKLEY_CAMELLIA

---
 src/pluto/constants.c | 5 +++--
 src/pluto/constants.h | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pluto/constants.c b/src/pluto/constants.c
index 810d76bcb..d02772507 100644
--- a/src/pluto/constants.c
+++ b/src/pluto/constants.c
@@ -804,11 +804,12 @@ static const char *const oakley_enc_name[] = {
 	"OAKLEY_3DES_CBC",
 	"OAKLEY_CAST_CBC",
 	"OAKLEY_AES_CBC",
+	"OAKLEY_CAMELLIA_CBC"
 };
 
 #ifdef NO_EXTRA_IKE
 enum_names oakley_enc_names =
-	{ OAKLEY_DES_CBC, OAKLEY_AES_CBC, oakley_enc_name, NULL };
+	{ OAKLEY_DES_CBC, OAKLEY_CAMELLIA_CBC, oakley_enc_name, NULL };
 #else
 static const char *const oakley_enc_name_draft_aes_cbc_02[] = {
 	"OAKLEY_MARS_CBC"       /*      65001   */,
@@ -831,7 +832,7 @@ enum_names oakley_enc_names_draft_aes_cbc_02 =
 		, &oakley_enc_names_ssh };
 
 enum_names oakley_enc_names =
-	{ OAKLEY_DES_CBC, OAKLEY_AES_CBC, oakley_enc_name
+	{ OAKLEY_DES_CBC, OAKLEY_CAMELLIA_CBC, oakley_enc_name
 		, &oakley_enc_names_draft_aes_cbc_02 };
 #endif
 
diff --git a/src/pluto/constants.h b/src/pluto/constants.h
index 56e9321e8..63ec6be29 100644
--- a/src/pluto/constants.h
+++ b/src/pluto/constants.h
@@ -1018,6 +1018,7 @@ extern enum_names oakley_enc_names;
 #define OAKLEY_3DES_CBC                 5
 #define OAKLEY_CAST_CBC                 6
 #define OAKLEY_AES_CBC                  7
+#define OAKLEY_CAMELLIA_CBC             8
 
 #define OAKLEY_MARS_CBC                 65001
 #define OAKLEY_RC6_CBC                  65002