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 6e27586ed00da9a205157889c0e51e942dc0321f..ce4cedcbcef248fb92584d23fc29390ea1a414f6 100644 (file)
--- 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 24513ebf1b20dc254bf9b9d895b5a4f6ebda63e9..63377e65d2c2f03a52383969c7b0a8283ee39111 100644 (file)
--- 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 716e91d79ac1fdf8bb8d67d5afc5c38d1070d75e..b1c1160a09a9676027050655549f96d17b75a1a9 100644 (file)
--- 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 fd34bf91f941be3923551c5ccfe482ca7238c32e..15522f1189ded1232eb52b081afda007a239f5d2 100644 (file)
--- 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)
 {