Add TKM_CTX_AE (Authenticated Endpoint context)

diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c
index 31e01c6b908c7d2b40f044a8ad1dd7a358d9386e..f2ffd2838bc107dc40bfd32f6a5509a69fe89afb 100644 (file)
--- 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 486a91225d77d9edd767ee658ccdcd3e43384861..6120c32a7f99c235544fcdf4f66ffd5284bddba2 100644 (file)
--- 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 8a9b6d49887839c9864ec02a143b625b3a0ff5e8..17ca017202d7b08914a0369431fc2f0c22bdd0ed 100644 (file)
--- 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 59c82fe717b868fd2a4c61c980508163bfe9664c..c4d53661fd8d83dc52f34de17cfcfcfc22610392 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};
+static const tkm_limits_t limits = {125, 100, 30, 200};
 
 START_TEST(test_id_mgr_creation)
 {