Add TKM_CTX_ISA (IKE SA context)

diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c
index e9862e0269e28339791539f8a645681fef953e17..31e01c6b908c7d2b40f044a8ad1dd7a358d9386e 100644 (file)
--- a/src/charon-tkm/src/tkm/tkm.c
+++ b/src/charon-tkm/src/tkm/tkm.c
@@ -75,8 +75,7 @@ bool tkm_init()
                return FALSE;
        }
 
-       /* only nonce and DH context limits are currently needed */
-       const tkm_limits_t limits = {nc, dh};
+       const tkm_limits_t limits = {nc, dh, isa};
 
        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 8cafa419349d67e7e92674fea50521b940fec9ad..486a91225d77d9edd767ee658ccdcd3e43384861 100644 (file)
--- a/src/charon-tkm/src/tkm/tkm_id_manager.c
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.c
@@ -22,10 +22,11 @@
 
 #define TKM_LIMIT 100
 
-ENUM_BEGIN(tkm_context_kind_names, TKM_CTX_NONCE, TKM_CTX_DH,
+ENUM_BEGIN(tkm_context_kind_names, TKM_CTX_NONCE, TKM_CTX_ISA,
        "NONCE_CONTEXT",
-       "DH_CONTEXT");
-ENUM_END(tkm_context_kind_names, TKM_CTX_DH);
+       "DH_CONTEXT",
+       "ISA_CONTEXT");
+ENUM_END(tkm_context_kind_names, TKM_CTX_ISA);
 
 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 9fbdb2d722765670ff764f97235e90093a0a970b..8a9b6d49887839c9864ec02a143b625b3a0ff5e8 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,
+       /** IKE SA context */
+       TKM_CTX_ISA,
 
        /** 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 86e80aee0f256d72a9e9e75ae0c36249466b0ce5..59c82fe717b868fd2a4c61c980508163bfe9664c 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};
+static const tkm_limits_t limits = {125, 100, 30};
 
 START_TEST(test_id_mgr_creation)
 {