From c755645032c9c3586f8bac9644863bec1835eb57 Mon Sep 17 00:00:00 2001
From: Reto Buerki <reet@codelabs.ch>
Date: Thu, 30 Aug 2012 15:07:21 +0200
Subject: [PATCH] Add TKM_CTX_AE (Authenticated Endpoint context)

---
 src/charon-tkm/src/tkm/tkm.c            | 2 +-
 src/charon-tkm/src/tkm/tkm_id_manager.c | 7 ++++---
 src/charon-tkm/src/tkm/tkm_id_manager.h | 2 ++
 src/charon-tkm/tests/id_manager_tests.c | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c
index 31e01c6b9..f2ffd2838 100644
--- a/src/charon-tkm/src/tkm/tkm.c
+++ b/src/charon-tkm/src/tkm/tkm.c
@@ -75,7 +75,7 @@ bool tkm_init()
 		return FALSE;
 	}
 
-	const tkm_limits_t limits = {nc, dh, isa};
+	const tkm_limits_t limits = {nc, dh, isa, ae};
 
 	INIT(this,
 		.public = {
diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.c b/src/charon-tkm/src/tkm/tkm_id_manager.c
index 486a91225..6120c32a7 100644
--- a/src/charon-tkm/src/tkm/tkm_id_manager.c
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.c
@@ -22,11 +22,12 @@
 
 #define TKM_LIMIT 100
 
-ENUM_BEGIN(tkm_context_kind_names, TKM_CTX_NONCE, TKM_CTX_ISA,
+ENUM_BEGIN(tkm_context_kind_names, TKM_CTX_NONCE, TKM_CTX_AE,
 	"NONCE_CONTEXT",
 	"DH_CONTEXT",
-	"ISA_CONTEXT");
-ENUM_END(tkm_context_kind_names, TKM_CTX_ISA);
+	"ISA_CONTEXT",
+	"AE_CONTEXT");
+ENUM_END(tkm_context_kind_names, TKM_CTX_AE);
 
 typedef struct private_tkm_id_manager_t private_tkm_id_manager_t;
 
diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.h b/src/charon-tkm/src/tkm/tkm_id_manager.h
index 8a9b6d498..17ca01720 100644
--- a/src/charon-tkm/src/tkm/tkm_id_manager.h
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.h
@@ -32,6 +32,8 @@ enum tkm_context_kind_t {
 	TKM_CTX_DH,
 	/** IKE SA context */
 	TKM_CTX_ISA,
+	/** Authenticated Endpoint context */
+	TKM_CTX_AE,
 
 	/** helper to determine the number of elements in this enum */
 	TKM_CTX_MAX,
diff --git a/src/charon-tkm/tests/id_manager_tests.c b/src/charon-tkm/tests/id_manager_tests.c
index 59c82fe71..c4d53661f 100644
--- a/src/charon-tkm/tests/id_manager_tests.c
+++ b/src/charon-tkm/tests/id_manager_tests.c
@@ -18,7 +18,7 @@
 
 #include "tkm_id_manager.h"
 
-static const tkm_limits_t limits = {125, 100, 30};
+static const tkm_limits_t limits = {125, 100, 30, 200};
 
 START_TEST(test_id_mgr_creation)
 {