From: Adrian-Ken Rueegsegger <ken@codelabs.ch>
Date: Tue, 25 Sep 2012 15:13:19 +0000 (+0200)
Subject: Add TKM_CTX_CC (Certificate chain context id)
X-Git-Tag: 5.0.3rc1~39^2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=464eb54ba4c425ff6aa61fb5944583a2e1f12c3a;p=thirdparty%2Fstrongswan.git

Add TKM_CTX_CC (Certificate chain context id)
---

diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c
index 6e27586ed0..ce4cedcbce 100644
--- a/src/charon-tkm/src/tkm/tkm.c
+++ b/src/charon-tkm/src/tkm/tkm.c
@@ -91,7 +91,7 @@ bool tkm_init()
 		return FALSE;
 	}
 
-	const tkm_limits_t limits = {nc, dh, isa, ae, esa};
+	const tkm_limits_t limits = {nc, dh, cc, isa, ae, esa};
 
 	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 24513ebf1b..63377e65d2 100644
--- a/src/charon-tkm/src/tkm/tkm_id_manager.c
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.c
@@ -25,6 +25,7 @@
 ENUM_BEGIN(tkm_context_kind_names, TKM_CTX_NONCE, TKM_CTX_ESA,
 	"NONCE_CONTEXT",
 	"DH_CONTEXT",
+	"CC_CONTEXT"
 	"ISA_CONTEXT",
 	"AE_CONTEXT",
 	"ESA_CONTEXT");
diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.h b/src/charon-tkm/src/tkm/tkm_id_manager.h
index 716e91d79a..b1c1160a09 100644
--- a/src/charon-tkm/src/tkm/tkm_id_manager.h
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.h
@@ -30,6 +30,8 @@ enum tkm_context_kind_t {
 	TKM_CTX_NONCE,
 	/** Diffie-Hellman context */
 	TKM_CTX_DH,
+	/** Certificate chain context */
+	TKM_CTX_CC,
 	/** IKE SA context */
 	TKM_CTX_ISA,
 	/** Authenticated Endpoint context */
diff --git a/src/charon-tkm/tests/id_manager_tests.c b/src/charon-tkm/tests/id_manager_tests.c
index fd34bf91f9..15522f1189 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, 200, 42};
+static const tkm_limits_t limits = {125, 100, 55, 30, 200, 42};
 
 START_TEST(test_id_mgr_creation)
 {